Commit Graph

5293 Commits

Author SHA1 Message Date
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
fickleheart a444a214d0 Here too 2019-01-09 09:07:41 -06:00
fickleheart d20122327f Make sure cmd.latency is always 0 in mode attack? 2019-01-09 09:05:57 -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
fickleheart 81a7cdf6e8 oops 2019-01-09 00:49:32 -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
fickleheart acfe6c4616 Don't use netticbuffer for servers 2019-01-08 23:27:51 -06:00
fickleheart 26af4e8561 Save stored turn ranges in NetArchivePlayers 2019-01-08 23:27:39 -06:00
fickleheart 100ce5958b Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 21:11:02 -06:00
fickleheart 01d7dc35ff Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 20:56:14 -06:00
fickleheart 6792fd92aa Experimental nettic buffer to stop net-induced frame drops? 2019-01-08 20:55:33 -06:00
fickleheart cd71e94785 Remove filthy filthy cheats 2019-01-08 20:36:06 -06:00
fickleheart 1bacc4e395 Make starting boost timing compensate for latency 2019-01-08 20:27:54 -06: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
Latapostrophe a4641e1010 use PLAY as default player MD2 if avaiable. 2019-01-08 18:57:10 +01:00
wolfy852 bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
SeventhSentinel eebdda0833 Minimum speed to get drift sparks 2019-01-06 17:17:52 -05:00