thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5184 commits 1 branch 12 tags 205 MiB
Commit graph

5184 commits

This branch
This branch
All branches
Author SHA1 Message Date
TehRealSalt
15174b0f02 Missed this 2019-01-14 18:24:25 -05:00
TehRealSalt
19329f9a4a bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00
TehRealSalt
e2b3cd181e Gag spacing was not updated 2019-01-13 20:47:57 -05:00
Sal
327a11721c Merge branch 'gamepad-tweaks' into 'next' 
Gamepad Improvements: Round 2

See merge request KartKrew/Kart-Public!24
 2019-01-13 20:32:17 -05:00
wolfy852
4d8cf39320 Allow any key to abort network connection, ignore non-keyboard keys in chat 2019-01-13 19:22:54 -06:00
Sal
e30d65213c Merge branch 'polyobj_fix_public' into 'next' 
Fix rendering gaps on polys with upper/lower textures

See merge request KartKrew/Kart-Public!26
 2019-01-13 18:00:58 -05:00
wolfy852
077c151a0b Revert "Enable d-pad on the vote screen" 
Partial revert of commit d9b30a10e3.
 2019-01-12 05:37:07 -06:00
TehRealSalt
0351f6285e Turn the "Music" section of the credits into only the people on Krew who contributes music 
Meant to do this in song-credits, since individual songs are now properly credited there.
 2019-01-12 04:13:49 -05:00
TehRealSalt
dff273d990 Minor misc fixes 2019-01-12 02:53:14 -05:00
fickleheart
3249851c3e Fix rendering gaps on polys with upper/lower textures 2019-01-11 21:21:56 -06:00
Sal
b136d17f89 Merge branch 'dehacked-versioning' into 'next' 
Update SOC version, make base SRB2 SOC throw a warning

See merge request KartKrew/Kart-Public!11
 2019-01-11 20:25:00 -05:00
Sal
8cfe6434f7 Merge branch 'disable-xinput' into 'next' 
-noxinput command line parameter

See merge request KartKrew/Kart-Public!21
 2019-01-11 20:23:39 -05:00
wolfy852
ba9a6853d2 Fix the chat being incorrectly placed in splitscreen 2019-01-11 16:04:12 -06:00
wolfy852
93908a5610 Fix chat toggle not working 2019-01-11 02:38:49 -06:00
wolfy852
65a3b9f765 Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 2019-01-11 00:18:45 -06:00
wolfy852
1c8c6387fc -nohidapi parameter 
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
 2019-01-10 23:12:06 -06:00
wolfy852
268a6d17f0 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:38:57 -06:00
wolfy852
6faae305e3 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:35:32 -06:00
Sal
dc7eae87db Merge branch 'fix-chat' into 'next' 
Fix splitscreen being forced into oldchat

See merge request KartKrew/Kart-Public!25
 2019-01-10 18:43:14 -05:00
Sal
d7303b1b2d Merge branch 'music-credits' into 'next' 
In-game music credits

See merge request KartKrew/Kart-Public!23
 2019-01-10 18:42:44 -05:00
wolfy852
5838c6cae8 Don't check splitscreen in OLDCHAT 2019-01-10 13:52:58 -06:00
wolfy852
d9b30a10e3 Enable d-pad on the vote screen, allow aborting connection with more joy buttons 2019-01-10 06:10:16 -06:00
wolfy852
d1bbebcbea Fix player 2 not being able to play while the chat is open 
Also attempts to fix the d-pad typing characters into the chat box.
 2019-01-10 06:08:12 -06:00
TehRealSalt
dbc22fd87d Merge branch 'next' into music-credits 2019-01-10 01:14:02 -05:00
Sal
69bd4dccf7 Merge branch 'kmd2-fallback' into 'next' 
KMD2 Fallback

See merge request KartKrew/Kart-Public!22
 2019-01-10 01:04:04 -05:00
TehRealSalt
a1daaf339b Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way 2019-01-10 01:03:53 -05:00
TehRealSalt
6ac7e50d70 Remove this, doesn't work 2019-01-10 00:35:11 -05:00
TehRealSalt
66bb728363 Expose S_ShowMusicCredit to Lua 2019-01-09 21:17:24 -05:00
TehRealSalt
3491a22a94 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
171faa4ab4 Fix Music toggle trying to play a non-existent song in Kart 2019-01-09 21:13:06 -05:00
TehRealSalt
e05e543396 Accidental unselected change 2019-01-09 21:12:33 -05:00
TehRealSalt
6c5cc453a8 Show song credits if joining mid-game 
Dunno if this works or not yet!
 2019-01-09 21:01:56 -05:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
wolfy852
8f1617a4dc Missed a few spots 2019-01-09 15:53:59 -06:00
wolfy852
6943f59e79 If kmd2.dat isn't found in srb2home, search the game's directory for it 2019-01-09 15:38:37 -06:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
wolfy852
fd99eb4f13 -noxinput command line parameter 2019-01-09 01:38:28 -06:00
Sal
641ebaa5c6 Merge branch 'kart-public-travis-deployer' into 'next' 
Implement OSX and Debian installer building for Travis

See merge request KartKrew/Kart-Public!8
 2019-01-09 01:42:44 -05:00
Sal
569338a3a1 Merge branch 'drift-spark-adjustment' into 'next' 
Minimum speed to get drift sparks

See merge request KartKrew/Kart-Public!20
 2019-01-09 01:18:30 -05:00
Sal
2d81bcf0ba Merge branch 'kart-public-appveyor-improvements' into 'next' 
Add Windows installer building and 64-bit builds to AppVeyor

See merge request KartKrew/Kart-Public!7
 2019-01-08 21:20:51 -05:00
TehRealSalt
301477f212 Misc level init fixes 2019-01-08 20:14:58 -05:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05:00
Marco Z
6ed52d9c42 Kart Public Next merge 2019-01-08 18:39:11 -05:00
Sal
88c6150f7b Merge branch 'gamepad-tweaks' into 'next' 
Gamepad Improvements

See merge request KartKrew/Kart-Public!5
 2019-01-08 18:08:00 -05:00
wolfy852
2794833f8d Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
 2019-01-08 16:32:24 -06:00
Sal
900c6df765 Merge branch 'mobjscale-global' into 'next' 
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
 2019-01-08 17:00:34 -05:00
TehRealSalt
ab76725038 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
875f5eb28a Merge branch 'merge-srb2' into 'next' 
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
 2019-01-08 15:56:41 -05:00
Sal
85bdeb344e Merge branch 'animtimer-fix' into 'next' 
Cast animtimer to int before negating

See merge request KartKrew/Kart-Public!17
 2019-01-08 15:47:14 -05:00