1d2f6c9581
Merge branch 'master' into next
2020-02-09 10:37:10 -05:00
15c263e9c7
Z_Zone: fixup Valgrind support
2020-02-09 10:35:23 -05:00
2162cbd794
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
2d0e72d756
Fix broken GT_ constants with custom gametypes
2020-02-08 21:40:30 -03:00
69c2dc743b
Merge branch 'credits-stuff' into 'next'
...
Update credits again
See merge request STJr/SRB2!760
2020-02-08 19:25:46 -05:00
7a5d7afb30
Add Rob as the game's producer
2020-02-06 23:06:15 +08:00
d03d09f397
Update credits again
2020-02-05 15:20:35 -05:00
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
700d9426d4
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
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
ce3a79e51a
Merge branch 'bruh2' into 'master'
...
Fix fuckup 2
See merge request STJr/SRB2!744
2020-02-01 21:42:21 -05:00
ec995d620f
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
c069cf94bc
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
52c1e73035
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
5c8406f6d7
Merge branch 'protect-wrists' into 'next'
...
Remove flight cutoff property
See merge request STJr/SRB2!748
2020-02-01 21:41:33 -05:00
c46d9a1b87
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
d5ced42f06
Remove Player 0
2020-02-01 18:22:03 -08:00
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
ab8eed6efb
Add missing conditions to CleanupPlayerName
2020-02-01 18:11:41 -08:00
bd6438dda1
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
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
77f373c903
Merge branch 'am-line' into 'master'
...
Automap fixes
See merge request STJr/SRB2!735
2020-02-01 03:22:53 -05:00
decc381698
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
f5e49ace00
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
ec02a90ebc
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
d67388ece0
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
a46b397659
Remove code that does effectively nothing
2020-01-31 14:35:19 -08:00
71707e6dca
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
3afc766f5e
Oops
2020-01-30 23:58:35 -08:00
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
aad4b6f8a1
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
6528b4a0f8
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
d7fcd3384a
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
d1e954ec9c
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
56839f428d
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
8297dbd373
Merge branch 'ntsatkbgfix' into 'master'
...
Fix M_DrawNightsAttackMountains integer overflow
See merge request STJr/SRB2!737
2020-01-31 02:33:53 -05:00
4e9fb2de7d
Merge branch 'startcontinue' into 'master'
...
Fix F_StartContinue fading out incorrectly in OpenGL
See merge request STJr/SRB2!738
2020-01-31 02:33:51 -05:00
8815b9f326
Merge branch 'chat-memory-leak-fix' into 'master'
...
Fix memory leak while chat is on screen
See merge request STJr/SRB2!743
2020-01-31 02:33:48 -05:00
f4de193809
Fix memory leak while chat is on screen
2020-01-30 22:11:50 -05:00
2e48539251
Merge branch 'next' into platform-fixes
2020-01-30 21:39:01 +08:00
3a6c7e9577
Merge branch 'dehacked-hud-fix' into 'next'
...
Fix missing "RINGSNUMTICS" in dehacked.c's HUD items
See merge request STJr/SRB2!733
2020-01-28 20:25:07 -05:00
48cb5a326d
Merge branch 'fix-keep-body-tag' into 'next'
...
Only call P_CheckSurvivors() in tag gametypes
See merge request STJr/SRB2!740
2020-01-28 08:45:09 -05:00
31ce076411
Only call P_CheckSurvivors() in tag gametypes
2020-01-28 14:02:36 +01:00
636093a59d
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -03:00
28fd2380df
Fix F_StartContinue fading out incorrectly in OpenGL
2020-01-27 13:28:07 -03:00
1548a22ea9
Fix M_DrawNightsAttackMountains being broken for obvious reasons
2020-01-27 00:44:10 -03:00
1774ba22b6
Fix title card not showing up at all if focus lost
2020-01-26 23:50:36 -03:00
cf7b4d826a
Remove redundancy
2020-01-26 23:46:07 -03:00
7f57327ff7
"changes" not "changed"
2020-01-26 23:41:34 -03:00
46cbe63b43
Fix going big
2020-01-26 23:39:31 -03:00
Alam Ed Arias