lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8514 commits 1 branch 29 tags 122 MiB
Commit graph

8514 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake e90eb9a5e7 Move P_GetMobjtype above first use 2019-12-23 16:54:26 +01:00
MascaraSnake 6a69aa4ffa Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function 2019-12-23 16:53:45 +01:00
Nev3r 9a9f72f598 Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure. 2019-12-23 16:37:44 +01:00
Nev3r d6a86c37b2 P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData(). 2019-12-23 16:36:26 +01:00
MascaraSnake 112b15cca2 Add P_GetMobjtype for finding the mobjtype for a given mapthingnum 2019-12-23 14:45:43 +01:00
Nev3r 1221c108c6 Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there. 2019-12-23 12:47:40 +01:00
Nev3r bb54597552 Remove redundant netarchive-related sector vars as they're not used anymore. 
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
 2019-12-23 12:42:38 +01:00
MascaraSnake 21dcbc856c Split up P_SpawnHoopsAndRings() into subfunctions 2019-12-23 12:42:09 +01:00
Nev3r eadf953957 Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps. 
Fix print type issue.
 2019-12-23 12:30:32 +01:00
MascaraSnake efb47b3786 Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight() 2019-12-23 12:07:03 +01:00
James R 7e0152f37b Merge branch 'hoop_refactor' into 'next' 
Make both NiGHTS hoop types use the same spawning code.

See merge request STJr/SRB2!560
 2019-12-23 00:16:46 -05:00
James R 64af7badfb Merge remote-tracking branch 'origin/master' into next 2019-12-22 20:47:15 -08:00
Zachary McAlpin 0f895706f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-22 18:55:58 -06:00
MascaraSnake 1e13604007 Merge branch 'flats-in-walls' into 'master' 
Flats in walls

See merge request STJr/SRB2!548
 2019-12-22 17:44:50 -05:00
MascaraSnake 63cf9d61fc Merge branch 'supermusic-state-fix' into 'next' 
Fix super theme ending early if invincibility expired

See merge request STJr/SRB2!559
 2019-12-22 17:37:32 -05:00
MascaraSnake 154d2033b6 Merge branch 'dustdevilfix' into 'next' 
Fix pflags not being properly reset when entering dust devil from top

See merge request STJr/SRB2!556
 2019-12-22 17:35:51 -05:00
MascaraSnake 070d008f54 Merge branch 'virtres' into 'next' 
(UDMF prereq.) Map data lump interface

See merge request STJr/SRB2!535
 2019-12-22 17:22:49 -05:00
MascaraSnake 579362fd3b P_LoadMapData(): Throw an error if resources are not found. 2019-12-22 23:22:15 +01:00
MascaraSnake a4fde93fbb Merge branch 'next' into virtres 
# Conflicts:
#	src/p_setup.c
 2019-12-22 23:02:47 +01:00
MascaraSnake 97adf3e246 Merge branch 'next' into hoop_refactor 
# Conflicts:
#	src/p_mobj.c
 2019-12-22 18:12:58 +01:00
MascaraSnake dacd5614f9 Make both NiGHTS hoop types use the same spawning code. 
As a result, the old generic hoops now use 24 sprites instead of 32.
 2019-12-22 17:37:54 +01:00
Steel Titanium de1d25cf08 Fix super theme ending early if invincibility expired 2019-12-20 23:45:32 -05:00
James R cbb9c7c13a Merge remote-tracking branch 'origin/master' into next 2019-12-20 14:40:10 -08:00
James R 2ed5617c5f Merge branch 'better-deadzone' into 'master' 
Better Deadzones

See merge request STJr/SRB2!541
 2019-12-20 17:33:29 -05:00
James R c50fe1874d Merge branch 'random-port' into 'master' 
Choose a random port as a client

See merge request STJr/SRB2!554
 2019-12-20 17:33:12 -05:00
James R 70336933bd Merge branch 'elemental-tweak' into 'next' 
Don't uncurl from spin if Elemental Stomp is used

See merge request STJr/SRB2!555
 2019-12-20 17:32:59 -05:00
Zachary McAlpin 124a0754a6 Revert "Added CalculateCamera Hook" 
This reverts commit 9f82cdb401.
 2019-12-19 17:21:55 -06:00
Zachary McAlpin f5c2341f59 Revert "Fix CalculateCamera compiling error" 
This reverts commit c1465c5acc.
 2019-12-19 17:21:46 -06:00
Zachary McAlpin 652e53c629 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features 2019-12-19 17:20:31 -06:00
Zachary McAlpin c1465c5acc Fix CalculateCamera compiling error 2019-12-19 17:17:17 -06:00
Zachary McAlpin 9f82cdb401 Added CalculateCamera Hook 2019-12-19 16:41:25 -06:00
Zachary McAlpin e82b317451 Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition" 
This reverts commit 3fc1069082.
 2019-12-19 15:07:34 -06:00
Zachary McAlpin c1815bfe11 Revert "Don't execute LUAh_PlayerThink(player) for respawning bots" 
This reverts commit fc70164f93.
 2019-12-19 15:07:28 -06:00
Alam Ed Arias 1771c7c8ce Revert "Travis yflip error" 
This reverts commit 2a9a2c0f02.
 2019-12-19 10:25:54 -05:00
Alam Ed Arias a66fd274a1 Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer 2019-12-19 10:24:04 -05:00
lachwright d401ba558d Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Steel Titanium 96cf03b716 Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00
James R 843d9b9f0a -clientport (it's back!) and -serverport, which is an alias to -port 
If you ever need to, you can change the client port number.
 2019-12-18 15:47:47 -08:00
James R 4e32101289 Use a pointer for port_name 
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
 2019-12-18 15:43:29 -08:00
James R f584b61c93 Use a random port when connecting 2019-12-18 15:34:55 -08:00
Jaime Passos 1b81232d32 sike 2019-12-18 11:47:26 -03:00
Jaime Passos 254d812901 More customisable title card 
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
 2019-12-18 00:28:58 -03:00
James R 4029167a57 Merge branch 'fix-divby0-spindash-crash' into 'next' 
Fix a divide by zero crash when mindash and maxdash were the same.

See merge request STJr/SRB2!539
 2019-12-17 20:42:56 -05:00
Zachary McAlpin 3fc1069082 Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition 2019-12-17 19:20:46 -06:00
Zachary McAlpin fc70164f93 Don't execute LUAh_PlayerThink(player) for respawning bots 2019-12-17 18:41:26 -06:00
Zachary McAlpin 01f11cdca6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features 2019-12-17 18:21:17 -06:00
James R d1b944121a Fix "SRB2" SOC directive, though its usefulness is debatable 2019-12-17 14:11:45 -08:00
James R e009d62dc3 Merge branch 'hud-toggling' into 'next' 
Let Lua toggle Team Match/CTF team scores HUD element

See merge request STJr/SRB2!544
 2019-12-17 16:17:01 -05:00
James R 184d04e6d5 Merge branch 'rvz1-crashfix' into 'next' 
Fix crash on mapload when removing Dragonbomber with Lua

See merge request STJr/SRB2!545
 2019-12-17 16:16:51 -05:00
Jaime Passos c3f0e6aa44 Avoid recreating the color LUT mid-recording-frame 2019-12-17 15:37:43 -03:00