Commit graph

4580 commits

Author SHA1 Message Date
toaster
aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
2018-11-18 18:26:50 +00:00
Monster Iestyn
8c71cd0b90 Merge branch 'master' into next 2018-11-18 17:11:57 +00:00
Sryder
4ee48194c4 Fix the Memory Leak
The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.
2018-11-18 14:43:31 +00:00
toaster
0720264bc2 Negate (netgame || multiplayer) condition for countdown to use defaultvalue instead of value per the specifics of the previous implementation 2018-11-18 09:10:26 -05:00
Monster Iestyn
a400bb9ef6 Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix

See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
Sryder
24a551238d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-11-18 12:33:27 +00:00
Sryder
dac8a4ab93 Move the player 3 and 4 CMD defines to the correct place. 2018-11-18 12:32:59 +00:00
TehRealSalt
9acd0ffe8b Fix for waiting player screen animation 2018-11-18 06:34:29 -05:00
TehRealSalt
12ee59bdfa Finish countdown only starts when all winners are declared
Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:
2018-11-18 06:17:42 -05:00
Sryder
9ffcc79288 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-11-18 11:05:20 +00:00
Sryder
5a96a0d0a4 Fix potential warning from string truncation
Also the MS seems to just throw the entire char array into the website and ignore null terminators, so I'm memsetting maptitle all to 0 before we do anything with it.
2018-11-18 11:05:05 +00:00
TehRealSalt
7b142dbad1 Updated the one important modified game print that most people see to be more descriptive
(I could've SWORN there were more...)
2018-11-18 05:48:10 -05:00
TehRealSalt
fb3d0da38f v1.0.1 prep
Enable patch.kart, up version number
2018-11-18 04:00:05 -05:00
TehRealSalt
0e3b225011 Remove duplicate/removed objects
As well as other compile errors
2018-11-18 03:43:33 -05:00
Sal
b20d76719b Merge branch 'fix-opengl-screentexture-hack' into 'master'
Fix textures in GL being wacky with the screen.

See merge request KartKrew/Kart!91
2018-11-17 20:58:52 -05:00
TehRealSalt
516cda90ec Default gr_md2 to on 2018-11-17 20:55:12 -05:00
TehRealSalt
bd3f398a04 Fix cvar bugs
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
2018-11-17 20:47:11 -05:00
Sal
c419d973a3 Merge branch 'chat-changes' into 'master'
Fix capslock wonkyness

See merge request KartKrew/Kart!98
2018-11-17 16:54:56 -05:00
Sal
52e0379398 Merge branch 'introfadefix' into 'master'
Make level white fade use timeinmap instead of leveltime

See merge request KartKrew/Kart!93
2018-11-17 16:54:19 -05:00
Sal
b27a44e79b Merge branch 'serverinfo_fix' into 'master'
Serverinfo Fixes

Closes #33 and #31

See merge request KartKrew/Kart!92
2018-11-17 16:54:08 -05:00
Sal
37596d445c Merge branch 'savedata_fixes' into 'master'
Gamedata fixes

Closes #35

See merge request KartKrew/Kart!97
2018-11-17 16:53:56 -05:00
Sal
f17f5d08f5 Merge branch 'fix-splitscreen-join' into 'master'
Prevent more local players than the server maxplayers limit joining

Closes #30

See merge request KartKrew/Kart!90
2018-11-17 16:29:11 -05:00
Sal
8981093c85 Merge branch 'dedicated-battle-fix' into 'master'
Fix Battle Causing the game to crash in dedicated servers

Closes #36

See merge request KartKrew/Kart!88
2018-11-17 16:27:15 -05:00
Sal
e4cb1bc430 Merge branch 'shrinkegg_fix' into 'master'
Fix Eggman shrink bug

Closes #38

See merge request KartKrew/Kart!89
2018-11-17 16:24:40 -05:00
Sal
bc33cb78a6 Merge branch 'positionnum_fix' into 'master'
Position Num Fix

See merge request KartKrew/Kart!94
2018-11-17 16:24:14 -05:00
Latapostrophe
477400020d forgot whitespaces.... 2018-11-17 22:23:23 +01:00
Latapostrophe
e9767df4ff Fix capslock not working outside of chat/console and shifting non letter characters 2018-11-17 22:21:10 +01:00
toaster
4abb03a231 Two tweaks to gamedata saving:
* Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends.
* Always save your matchesplayed/totalplaytime increase at the successful completion of a level.
2018-11-17 20:16:27 +00:00
toaster
176dc6e5ca Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow. 2018-11-17 18:02:04 +00:00
toaster
69228715fe Make level white fade use timeinmap instead of leveltime 2018-11-17 16:54:56 +00:00
toaster
56ed67397d * Fix the in-game MS browser thinking gametypes are unknown.
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
2018-11-17 15:48:10 +00:00
Sryder
c46efa7c41 Set the screen textures to use max higher texture IDs
This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now.
THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.
2018-11-17 15:23:12 +00:00
Sryder
5d991b6f2a Prevent more local players than the server maxplayers limit joining 2018-11-17 15:00:15 +00:00
toaster
8735dcd24b Fix Eggman shrink bug.
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
2018-11-17 14:41:08 +00:00
Sryder
8845043d31 Fix Battle Causing the game to crash in dedicated servers
Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow
2018-11-16 23:07:27 +00:00
Sryder
7f639cc941 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into next 2018-11-16 17:19:19 +00:00
Sryder
df90530eba Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-11-16 17:19:08 +00:00
TehRealSalt
e85e621d2c Minor credits issues 2018-11-16 12:05:57 -05:00
TehRealSalt
0de2d52bfd add TOL_TV to dehacked 2018-11-16 12:04:24 -05:00
TehRealSalt
cb8bbf8e4c Ensure MS packets are sent correctly 2018-11-16 12:01:57 -05:00
TehRealSalt
0a1c4ef88d Basic readme for public repo 2018-11-16 02:46:59 -05:00
TehRealSalt
692ea23a42 Final credits 2018-11-15 22:55:01 -05:00
TehRealSalt
879267a709 Don't allow kart files to be downloaded 2018-11-15 19:18:04 -05:00
TehRealSalt
6b772aab59 Add Kart files to Makefile 2018-11-15 19:17:49 -05:00
TehRealSalt
82f353be61 Remove music.dta from loading
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
Steel Titanium
7cdb0441dd Add example sql file 2018-11-15 17:31:42 -05:00
Steel Titanium
c26c850f5d Add missing 64-bit libgme dll 2018-11-15 13:30:59 -05:00
toaster
5d6e15f8af More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner). 2018-11-15 14:30:11 +00:00
Steel Titanium
02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00