Commit graph

8693 commits

Author SHA1 Message Date
Jaime Passos
d3d91726f5 GTR_EMERALDHUNT and GTR_SPAWNENEMIES 2019-12-18 14:57:42 -03:00
Jaime Passos
0577cec01b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos
1e2331d672 SOC stuff 2019-12-18 14:37:48 -03:00
Jaime Passos
79d5192b7c TOL/Level platter stuff 2019-12-18 13:24:10 -03:00
Jaime Passos
b759ebf622 Death of TOL_CUSTOM 2019-12-18 12:40:46 -03:00
Jaime Passos
45580ce557 Make NUMGAMETYPEFREESLOTS lower because netcode 2019-12-18 12:36:54 -03:00
Jaime Passos
aa619e1b34 Rankings tweaks 2019-12-18 12:36:02 -03:00
Jaime Passos
7807424633 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos
86ac94817a Spectator HUD tweaks 2019-12-18 12:28:01 -03:00
Jaime Passos
15862ed02c G_NewGametype 2019-12-18 12:23:42 -03:00
Jaime Passos
6660d63028 There are only so many bits 2019-12-18 12:14:18 -03:00
Jaime Passos
da4e759a73 GTR_DEATHPENALTY 2019-12-18 12:13:24 -03:00
Jaime Passos
83732f38a9 GTR_PITYSHIELD 2019-12-18 12:09:44 -03:00
Jaime Passos
1b81232d32 sike 2019-12-18 11:47:26 -03:00
Jaime Passos
299f2bd8cd GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
185fa2799d Update comments 2019-12-18 11:33:56 -03:00
Jaime Passos
ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
James R
23951cf938 bleh 2019-12-17 20:54:44 -08:00
Jaime Passos
7bfdc2caa0 Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos
317191ec7c Freeslot moment! 2019-12-18 00:52:50 -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
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
Jaime Passos
0af71fafc5 Don't use the local palette, because OpenGL mixes it into the textures themselves 2019-12-17 15:20:22 -03:00
Jaime Passos
3d08664de4 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-17 15:14:22 -03:00
Jaime Passos
141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos
e3ab21c85f opengl 2019-12-17 13:48:48 -03:00
Jaime Passos
aff5b52eba change ROTANGLES to 72 2019-12-17 13:39:26 -03:00
Jaime Passos
8422c88063 optimise R_CacheRotSprite 2019-12-17 13:25:55 -03:00
Jaime Passos
c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Jaime Passos
6a5ea548e6 make ROTANGLES be 360 2019-12-17 13:00:50 -03:00
Jaime Passos
7e55dd31f5 fix menu spacing 2019-12-17 12:53:26 -03:00
Jaime Passos
369563ad92 allow models to change colors more than once. 2019-12-17 12:50:41 -03:00
James R
4da57653eb Merge branch 'spawn_z_refactor' into 'next'
(UDMF prereq.) Spawn Z refactor

See merge request STJr/SRB2!536
2019-12-16 23:21:07 -05:00
James R
4f33476fc0 Merge branch 'fix-sector-lines' into 'next'
Fix sector.lines in Lua

See merge request STJr/SRB2!542
2019-12-16 23:05:52 -05:00
Steel Titanium
0e371774c8 Fix crash on mapload when removing Dragonbomber with Lua 2019-12-16 21:25:41 -05:00
James R
c0b9671c5b Merge branch 'lua-maincfg-vars' into 'next'
Lua MainCfg vars

See merge request STJr/SRB2!543
2019-12-16 17:54:01 -05:00
Tatsuru
0ab31b3de0 Let Lua toggle Match/CTF team scores HUD element 2019-12-16 17:58:00 -03:00
Monster Iestyn
46f431616c Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean 2019-12-16 20:26:19 +00:00
Monster Iestyn
f028bb0219 Fix numoflines calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it.
And yes, this time I tested it to make sure it works :)
2019-12-16 17:46:27 +00:00
Monster Iestyn
130794cc4d Merge branch 'master' into next 2019-12-16 15:41:47 +00:00
MascaraSnake
79350992df Some more cleanup of map loading code 2019-12-16 00:17:20 +01:00
MascaraSnake
bb3440d021 Minor cleanup of virtual resources code 2019-12-16 00:04:48 +01:00
James R
53c7df4818 Merge branch 'map-command-no-mapheaderinfo' into 'master'
Let the map command warp to maps without a level header

See merge request STJr/SRB2!528
2019-12-15 16:59:03 -05:00
James R
adc87640d9 Merge branch 'cmake-fixes' into 'master'
Various cmake adjustments

See merge request STJr/SRB2!538
2019-12-15 16:58:45 -05:00
James R
00e2c420f6 Merge branch 'dont-be-mean-to-tails-plz' into 'master'
Don't be mean to Tails plz (Pandora's Box Super cheat fix)

See merge request STJr/SRB2!540
2019-12-15 16:58:24 -05:00
MascaraSnake
230006553d Set mapthing z in OP_CreateNewMapThing 2019-12-15 21:43:50 +01:00