Jaime Passos
|
aa0081f70b
|
Bail out if there are no more free gametype slots.
|
2019-12-23 18:58:33 -03:00 |
|
Jaime Passos
|
1edc72a3b8
|
Custom gametype constant support for Lua.
|
2019-12-23 18:54:25 -03:00 |
|
Jaime Passos
|
4ebbe4e518
|
Move ALL the Lua global variable stuff into lua_script.c.
|
2019-12-23 18:49:23 -03:00 |
|
Jaime Passos
|
6a5d68a979
|
Add pointlimit and timelimit to Lua.
|
2019-12-23 18:37:38 -03:00 |
|
Jaime Passos
|
15a403c39b
|
Turn noglobals into setglobals, move the extra global variable handling to gamestateglobals.
|
2019-12-23 18:33:39 -03:00 |
|
Jaime Passos
|
100144d4db
|
Merge remote-tracking branch 'origin/master' into gametype-clownery
|
2019-12-23 18:21:13 -03:00 |
|
MascaraSnake
|
c52edb6eff
|
Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter
|
2019-12-23 21:35:03 +01:00 |
|
MascaraSnake
|
d822fad788
|
Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.
|
2019-12-23 21:17:12 +01:00 |
|
MascaraSnake
|
4d5cb2ddf8
|
Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore
|
2019-12-23 20:12:45 +01:00 |
|
MascaraSnake
|
3db7d6ad94
|
Merge branch 'netarchive_compare_changes' into 'next'
Netarchive compare changes
See merge request STJr/SRB2!563
|
2019-12-23 13:57:49 -05:00 |
|
MascaraSnake
|
9dc1d87ad9
|
Merge branch 'hoops_and_rings_refactor' into 'next'
Refactor P_SpawnHoopsAndRings
See merge request STJr/SRB2!562
|
2019-12-23 13:57:01 -05:00 |
|
MascaraSnake
|
901cc827ff
|
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
|
2019-12-23 19:08:40 +01:00 |
|
MascaraSnake
|
2cac61dd28
|
P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well
|
2019-12-23 18:59:11 +01:00 |
|
MascaraSnake
|
06bbfb11d8
|
P_MapThingSpawn(): Move early returning/substitution code into their own functions
|
2019-12-23 17:28:21 +01:00 |
|
MascaraSnake
|
d3ac0a305a
|
Move P_GetMobjtype above first use
|
2019-12-23 16:54:26 +01:00 |
|
MascaraSnake
|
a99a307ed4
|
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
|
2019-12-23 16:53:45 +01:00 |
|
Nev3r
|
b1344fd8f0
|
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
|
f80c660cdc
|
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 |
|
Jaime Passos
|
81c9577995
|
Satisfy rollangle table with a 3deg angle
|
2019-12-23 12:19:05 -03:00 |
|
MascaraSnake
|
0fa8936966
|
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
|
2019-12-23 14:45:43 +01:00 |
|
Nev3r
|
63e078286b
|
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
|
befe33e239
|
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
|
26d80c2b12
|
Split up P_SpawnHoopsAndRings() into subfunctions
|
2019-12-23 12:42:09 +01:00 |
|
Nev3r
|
7be95c1999
|
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
|
783b2fbb3c
|
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
|
2019-12-23 12:07:03 +01:00 |
|
James R
|
9fd3088956
|
Whoops I forgot player 2
|
2019-12-22 21:29:41 -08:00 |
|
Steel Titanium
|
75cbfe9e54
|
Spawn Amy's shields for other players
|
2019-12-23 00:28:06 -05:00 |
|
James R
|
2b2d4c139f
|
Merge remote-tracking branch 'origin/master' into turnmultiplier
|
2019-12-22 21:26:36 -08:00 |
|
James R
|
51bcdc2a4b
|
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 |
|
Steel Titanium
|
63a1eb6b2a
|
Merge branch 'next' into char-damage-fix
|
2019-12-22 23:56:16 -05:00 |
|
James R
|
92a4ec84f5
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-22 20:47:15 -08:00 |
|
MascaraSnake
|
387578832d
|
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
|
40033d69c8
|
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
|
1847c5e34f
|
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
|
8e787a6d27
|
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
|
2e802dde5c
|
P_LoadMapData(): Throw an error if resources are not found.
|
2019-12-22 23:22:15 +01:00 |
|
MascaraSnake
|
f91e9bdee5
|
Merge branch 'next' into virtres
# Conflicts:
# src/p_setup.c
|
2019-12-22 23:02:47 +01:00 |
|
MascaraSnake
|
9d33c02367
|
Merge branch 'next' into hoop_refactor
# Conflicts:
# src/p_mobj.c
|
2019-12-22 18:12:58 +01:00 |
|
MascaraSnake
|
0fd9596e3c
|
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
|
5281c44042
|
Fix super theme ending early if invincibility expired
|
2019-12-20 23:45:32 -05:00 |
|
Steel Titanium
|
7b0cffe9f9
|
Merge branch 'next' into char-damage-fix
|
2019-12-20 23:24:29 -05:00 |
|
Steel Titanium
|
14673656c3
|
Fix Amy and Fang being able to attack other players in MP Special Stages
|
2019-12-20 23:22:45 -05:00 |
|
James R
|
1d0b7aca9d
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-20 14:40:10 -08:00 |
|
James R
|
74bd973616
|
Merge branch 'better-deadzone' into 'master'
Better Deadzones
See merge request STJr/SRB2!541
|
2019-12-20 17:33:29 -05:00 |
|
James R
|
30322b338a
|
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
|
982c6362db
|
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 |
|
Jaime Passos
|
644d0d86ad
|
Lua gametyperules
|
2019-12-19 18:27:11 -03:00 |
|
Jaime Passos
|
d80a6e11e7
|
Load SPR_ lumps as SpriteInfo
|
2019-12-19 17:25:19 -03:00 |
|
Jaime Passos
|
ac616a3157
|
Merge remote-tracking branch 'origin/master' into rotsprite2
|
2019-12-19 17:20:21 -03:00 |
|
Jaime Passos
|
2eec0b6a9b
|
Don't spawn End Level Signs without the GTR_ALLOWEXIT rule
|
2019-12-19 17:06:07 -03:00 |
|