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
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
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
fickleheart
00f8e8b0e6
Here too
2019-01-09 09:07:41 -06:00
fickleheart
00c658fccd
Make sure cmd.latency is always 0 in mode attack?
2019-01-09 09:05:57 -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
fickleheart
1c79920280
oops
2019-01-09 00:49:32 -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
fickleheart
797c20d603
Don't use netticbuffer for servers
2019-01-08 23:27:51 -06:00
fickleheart
bc3a7ba5cb
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
fickleheart
86bbbfc67b
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 21:11:02 -06:00
fickleheart
029a16125c
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
fickleheart
40ff1e5067
Experimental nettic buffer to stop net-induced frame drops?
2019-01-08 20:55:33 -06:00
fickleheart
92c5a0836b
Remove filthy filthy cheats
2019-01-08 20:36:06 -06:00
fickleheart
955e0ad8c9
Make starting boost timing compensate for latency
2019-01-08 20:27:54 -06: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
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
Latapostrophe
654901a4b5
use PLAY as default player MD2 if avaiable.
2019-01-08 18:57:10 +01:00
wolfy852
934b199705
Compile flag for DEVELOP
2019-01-06 20:47:13 -06:00
SeventhSentinel
9490d225de
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
wolfy852
8baa538d43
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
Sal
02f49b2b8b
Merge branch 'kill-facefreed' into 'next'
...
Remove facefreed/iconfreed
See merge request KartKrew/Kart-Public!15
2019-01-06 02:02:54 -05:00
SeventhSentinel
716ce5c343
Merge remote-tracking branch 'next' into merge-srb2
2019-01-06 02:02:33 -05:00
SeventhSentinel
3fe7856ba3
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
wolfy852
600cf37c88
Remove facefreed/iconfreed
...
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
2019-01-05 20:40:47 -06:00
SeventhSentinel
e70d98d7a6
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
