stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 09:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
5183 commits 59 branches 11 tags 93 MiB
Commit graph

5183 commits

This branch
This branch
All branches
Author SHA1 Message Date
TehRealSalt
e63d7537e0 bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00
TehRealSalt
b560a90890 Gag spacing was not updated 2019-01-13 20:47:57 -05:00
Sal
9fb290577a 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
dead0475ce Allow any key to abort network connection, ignore non-keyboard keys in chat 2019-01-13 19:22:54 -06:00
Sal
75fa18b084 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
31ccae60c9 Revert "Enable d-pad on the vote screen" 
Partial revert of commit 92a60b32de.
 2019-01-12 05:37:07 -06:00
TehRealSalt
761aada745 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
89f12599c6 Minor misc fixes 2019-01-12 02:53:14 -05:00
fickleheart
87ede1e934 Fix rendering gaps on polys with upper/lower textures 2019-01-11 21:21:56 -06:00
Sal
e443285801 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
2bd88fd6f8 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
88b5a056c8 Fix the chat being incorrectly placed in splitscreen 2019-01-11 16:04:12 -06:00
wolfy852
622509682a Fix chat toggle not working 2019-01-11 02:38:49 -06:00
wolfy852
d5e16dca63 Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 2019-01-11 00:18:45 -06:00
wolfy852
a8e0805261 -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
d72fcaecc6 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:38:57 -06:00
wolfy852
7a50ea2554 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:35:32 -06:00
Sal
45a1508f0a 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
d726185f8e 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
6c4decfef3 Don't check splitscreen in OLDCHAT 2019-01-10 13:52:58 -06:00
wolfy852
92a60b32de Enable d-pad on the vote screen, allow aborting connection with more joy buttons 2019-01-10 06:10:16 -06:00
wolfy852
73369679f5 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
5b05eff41f Merge branch 'next' into music-credits 2019-01-10 01:14:02 -05:00
Sal
41c32be673 Merge branch 'kmd2-fallback' into 'next' 
KMD2 Fallback

See merge request KartKrew/Kart-Public!22
 2019-01-10 01:04:04 -05:00
TehRealSalt
37e79ebfbd 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
9975497a68 Remove this, doesn't work 2019-01-10 00:35:11 -05:00
TehRealSalt
cff7d2795d Expose S_ShowMusicCredit to Lua 2019-01-09 21:17:24 -05:00
TehRealSalt
d3a38a4375 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
2ccdd3e4b7 Fix Music toggle trying to play a non-existent song in Kart 2019-01-09 21:13:06 -05:00
TehRealSalt
ed36f5ac16 Accidental unselected change 2019-01-09 21:12:33 -05:00
TehRealSalt
565b8f87fb Show song credits if joining mid-game 
Dunno if this works or not yet!
 2019-01-09 21:01:56 -05:00
TehRealSalt
de72403fb9 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
dbb7267f22 Missed a few spots 2019-01-09 15:53:59 -06:00
wolfy852
90148f79eb If kmd2.dat isn't found in srb2home, search the game's directory for it 2019-01-09 15:38:37 -06:00
TehRealSalt
72bc1b48f6 Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
wolfy852
5e682d612f -noxinput command line parameter 2019-01-09 01:38:28 -06:00
Sal
0a34d4bafa 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
2f30625c82 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
94ff7c33fd 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
5e8e08ad95 Misc level init fixes 2019-01-08 20:14:58 -05:00
Marco Z
7806c43ecf Kart Public Next merge 2019-01-08 18:43:49 -05:00
Marco Z
20a117cfc7 Kart Public Next merge 2019-01-08 18:39:11 -05:00
Sal
e0f18f6d03 Merge branch 'gamepad-tweaks' into 'next' 
Gamepad Improvements

See merge request KartKrew/Kart-Public!5
 2019-01-08 18:08:00 -05:00
wolfy852
e528750444 Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
ad01dcc5ac 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
78ac038864 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
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
7f8609d335 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
6916667c41 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
Sal
82246f6c25 Merge branch 'makefile-develop' into 'master' 
Compile flag for DEVELOP

See merge request KartKrew/Kart-Public!18
 2019-01-08 15:45:04 -05:00