Jaime Passos
23f148f32d
Fix overtime not working
2020-02-15 13:07:53 -03:00
Jaime Passos
edf7c16bbe
Merge branch 'gtr-shift' into 'next'
...
1 left shifted by zero is still 1
See merge request STJr/SRB2!766
2020-02-11 23:33:43 -05:00
James R
04d58c56e5
Merge branch 'patch-1' into 'next'
...
Fix title/card hud hooks grabbing the wrong functions
See merge request STJr/SRB2!758
2020-02-11 20:17:50 -05:00
MascaraSnake
2cfe5e3425
Merge branch '2.2.1-prep' into 'next'
...
2.2.1 preparation
See merge request STJr/SRB2!759
2020-02-11 17:37:23 -05:00
MascaraSnake
905d9a5ee6
Merge branch 'signpostfixes' into 'next'
...
Fix CLEAR! signpost showing up in unmodded games (& add proper support for SPR2 animated signpost)
See merge request STJr/SRB2!775
2020-02-11 16:23:06 -05:00
MascaraSnake
b001c6c9db
Merge branch 'defuse-minecarts' into 'next'
...
Defuse minecarts
See merge request STJr/SRB2!776
2020-02-11 13:22:10 -05:00
lachwright
e5b788ed65
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
390511a531
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
2544681658
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
Steel Titanium
e2c1f9cd4b
Update file hashes
2020-02-09 21:29:46 -05:00
Steel Titanium
89916b7a28
Merge branch 'next' into 2.2.1-prep
2020-02-09 20:30:48 -05:00
Monster Iestyn
dc5fd6be11
Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c
...
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
2020-02-09 19:15:04 +00:00
Alam Ed Arias
307f30b6e3
Merge branch 'master' into next
2020-02-09 10:37:10 -05:00
Alam Ed Arias
9983ea49cc
Z_Zone: fixup Valgrind support
2020-02-09 10:35:23 -05:00
Jaime Passos
1e17523c70
Merge branch 'customgametypeswtf' into 'next'
...
Fix broken GT_ constants with custom gametypes
See merge request STJr/SRB2!769
2020-02-08 23:17:35 -05:00
Jaime Passos
c05b613724
Fix broken GT_ constants with custom gametypes
2020-02-08 21:40:30 -03:00
SteelT
d5b4409dbe
Merge branch 'credits-stuff' into 'next'
...
Update credits again
See merge request STJr/SRB2!760
2020-02-08 19:25:46 -05:00
Jaime Passos
0fdd8c3283
1 left shifted by zero is still 1
2020-02-08 18:50:05 -03:00
lachwright
1fdf63cd6e
Add Rob as the game's producer
2020-02-06 23:06:15 +08:00
Steel Titanium
9715a91a59
Update credits again
2020-02-05 15:20:35 -05:00
Monster Iestyn
0a4a879b96
Updated version number to 2.2.1, increment MODVERSION.
...
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
James R
4415fb4c75
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
colette
20aa089c25
Fix title/card hud hooks grabbing the wrong functions
2020-02-03 23:09:18 -05:00
James R
76c38e97dc
Merge branch 'name-stuck' into 'master'
...
Fix game hanging on server creation/splitscreen if your name is whack
See merge request STJr/SRB2!752
2020-02-03 03:49:13 -05:00
James R
4f41da1d16
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
James R
9409e505b0
Merge branch 'bruh2' into 'master'
...
Fix fuckup 2
See merge request STJr/SRB2!744
2020-02-01 21:42:21 -05:00
James R
d2038c820d
Merge branch 'rotsprite-memory-leak' into 'next'
...
Fix memory leak when caching rotsprite
See merge request STJr/SRB2!745
2020-02-01 21:42:12 -05:00
James R
652c580f60
Merge branch 'tnt-is-laggy' into 'next'
...
Make flying TNTs' explosions not so laggy the first time
See merge request STJr/SRB2!746
2020-02-01 21:41:59 -05:00
James R
8c713b3467
Merge branch 'platform-fixes' into 'next'
...
Reset pmomz after applying it to momz
See merge request STJr/SRB2!747
2020-02-01 21:41:49 -05:00
James R
c99b9001ba
Merge branch 'protect-wrists' into 'next'
...
Remove flight cutoff property
See merge request STJr/SRB2!748
2020-02-01 21:41:33 -05:00
James R
3a3718797f
Merge branch 'file-param-error' into 'master'
...
Don't I_Error if non base files fail to load with -file
See merge request STJr/SRB2!678
2020-02-01 21:41:22 -05:00
James R
937f18dee7
Remove Player 0
2020-02-01 18:22:03 -08:00
James R
9192e1eade
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
James R
a65e8ab500
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
LJ Sonic
d7389fbd6d
Merge branch 'fix-splitscreen' into 'next'
...
Fix splitscreen player being unable to move
See merge request STJr/SRB2!749
2020-02-01 16:18:40 -05:00
Louis-Antoine
74b34ef340
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
Jaime Passos
5625c24c56
Merge branch 'am-line' into 'master'
...
Automap fixes
See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
Jaime Passos
49f3b67913
Merge branch 'colorlutfix' into 'master'
...
Fix color LUT using the wrong palette
See merge request STJr/SRB2!739
2020-02-01 03:22:26 -05:00
lachwright
17b6155df9
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
lachwright
693d4b1120
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
lachwright
51fa7c17a5
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
James R
c19fe1419f
Remove code that does effectively nothing
2020-01-31 14:35:19 -08:00
James R
9820a7384f
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
James R
294543037d
Oops
2020-01-30 23:58:35 -08:00
James R
ff2ec925ee
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
James R
020751fdc1
Merge branch 'i-can-see-myself' into 'master'
...
Don't draw yourself in first person!
See merge request STJr/SRB2!697
2020-01-31 02:34:11 -05:00
James R
1d8d20d915
Merge branch 'opengl-skipintro-sigabrt' into 'master'
...
Fix crash when using -skipintro and the renderer is set to OpenGL from config
See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
James R
ee35b1cf3b
Merge branch 'cybrak_flamedmg' into 'next'
...
Fix damagetype for Cybrak flamethrower.
See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00
James R
ebd53ace47
Merge branch 'angle-clamp' into 'master'
...
Fix the minecart angle thing in netgames
Closes #69
See merge request STJr/SRB2!732
2020-01-31 02:33:59 -05:00
James R
510ed5353d
Merge branch 'ttfixes2' into 'next'
...
Fix title card not showing up at all if focus lost
See merge request STJr/SRB2!736
2020-01-31 02:33:57 -05:00