Jaime Passos
|
31eeb90056
|
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
|
2019-12-24 17:55:46 -03:00 |
|
James R
|
ddae69f672
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-24 11:53:49 -08:00 |
|
James R
|
248e452d7d
|
Merge branch 'titlecard2' into 'next'
More customisable title card
See merge request STJr/SRB2!552
|
2019-12-24 14:47:55 -05:00 |
|
James R
|
27e251e7fc
|
Merge branch 'wipes2' into 'master'
Wipe styles cleanup
See merge request STJr/SRB2!525
|
2019-12-24 14:47:14 -05:00 |
|
James R
|
d5fdbfda6b
|
Merge branch 'soc-srb2-fix' into 'master'
The "SRB2" directive, for warning if a SOC isn't compatible
See merge request STJr/SRB2!551
|
2019-12-24 14:44:55 -05:00 |
|
James R
|
cb9db74044
|
Merge branch 'gl_gifs' into 'master'
OpenGL GIF movie recording
See merge request STJr/SRB2!549
|
2019-12-24 14:44:44 -05:00 |
|
James R
|
d2239f5ea1
|
Merge branch 'hwrtexfix' into 'master'
Fix model texture blending
See merge request STJr/SRB2!546
|
2019-12-24 14:44:19 -05:00 |
|
James R
|
975f1e5f83
|
Merge branch 'soundtest-fix' into 'master'
Init MUSICDEFs regardless of music state
See merge request STJr/SRB2!532
|
2019-12-24 14:44:08 -05:00 |
|
James R
|
469e5a7c9b
|
Fix NOPNG compiling
|
2019-12-24 11:37:37 -08:00 |
|
Jaime Passos
|
debacf34bb
|
Turn the babysitting deterrent into its own rule.
|
2019-12-24 16:30:18 -03:00 |
|
Jaime Passos
|
c6dd9f016e
|
Title card fixes.
|
2019-12-24 16:22:25 -03:00 |
|
James R
|
699407dbb0
|
I'm an idiot
|
2019-12-24 11:14:21 -08:00 |
|
Jaime Passos
|
c76154d3a1
|
Don't warn about missing CTF starts if the gametype doesn't have team flags.
|
2019-12-24 16:12:05 -03:00 |
|
Jaime Passos
|
4f54da125d
|
GTR_HURTMESSAGES
|
2019-12-24 16:09:00 -03:00 |
|
MascaraSnake
|
604a1c654d
|
Merge branch 'horizontalspring-oops' into 'next'
Fixed missing break in offset handling for horizontal springs
See merge request STJr/SRB2!571
|
2019-12-24 07:02:34 -05:00 |
|
MascaraSnake
|
418cc50bbc
|
Fixed missing break in offset handling for horizontal springs
|
2019-12-24 13:01:17 +01:00 |
|
James R
|
7db16e230b
|
Merge branch 'fixsignalhandler' into 'master'
Handle signals correctly on linux
See merge request STJr/SRB2!530
|
2019-12-24 02:54:44 -05:00 |
|
MascaraSnake
|
21e23c4307
|
Merge branch 'spawnmapthing-refactor' into 'next'
Hack P_SpawnMapThing into tiny little pieces
See merge request STJr/SRB2!564
|
2019-12-24 01:59:36 -05:00 |
|
Jaime Passos
|
d146594895
|
Fix Lua HUD library crashes.
|
2019-12-24 00:14:25 -03:00 |
|
Jaime Passos
|
b1add48063
|
Add IDENTIFIER to gametype DeHackEd.
|
2019-12-23 23:19:48 -03:00 |
|
Jaime Passos
|
8405dc4c07
|
Merge remote-tracking branch 'origin/next' into gametype-clownery
|
2019-12-23 23:08:16 -03:00 |
|
Jaime Passos
|
c832d26ee9
|
ViewpointSwitch improvements.
|
2019-12-23 20:22:57 -03:00 |
|
Jaime Passos
|
73bb0567cc
|
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
|
2019-12-23 19:24:06 -03:00 |
|
Jaime Passos
|
ba5516b99f
|
Add gametyperules to LUA_CheckGlobals.
|
2019-12-23 19:16:10 -03:00 |
|
Jaime Passos
|
62f2fcc57e
|
Add sstimer to LUA_PushGlobals.
|
2019-12-23 19:08:57 -03:00 |
|
Jaime Passos
|
60cf1e1837
|
Bail out earlier.
|
2019-12-23 19:00:46 -03:00 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|