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 |
|
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 |
|
TehRealSalt
|
09da50000e
|
Merge branch 'next' into music-credits
|
2019-01-09 03:08:20 -05: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 |
|
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 |
|
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 |
|
SeventhSentinel
|
1d58c6b8c2
|
merge srb2 next
|
2019-01-05 15:59:23 -05:00 |
|
SeventhSentinel
|
b9ea18c030
|
turn these signed before abs-ing em
|
2019-01-05 00:42:36 -05:00 |
|
SeventhSentinel
|
a595d0ba00
|
Load sounds.kart after patch.kart
|
2019-01-05 00:33:24 -05:00 |
|
Steel Titanium
|
a57626f828
|
Clean up the comments a bit
|
2019-01-04 19:55:05 -05:00 |
|
Digiku
|
031e234d86
|
Merge branch 'changecontrol-text-overflow-fix' into 'master'
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
|
2019-01-04 19:39:17 -05:00 |
|
Digiku
|
e42e1178ed
|
Increase M_ChangecontrolResponse message buffer by 25 chars
|
2019-01-04 19:38:36 -05:00 |
|
SeventhSentinel
|
9365f7f235
|
Minor touchups/cleanup
|
2019-01-04 16:47:03 -05:00 |
|
SeventhSentinel
|
74aba46823
|
In-game music credits
|
2019-01-04 04:44:55 -05:00 |
|
Steel Titanium
|
d2da1db6c8
|
Don't increment mainwads for sounds or music.kart
|
2019-01-04 00:32:01 -05:00 |
|
mazmazz
|
34b415bdac
|
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
|
2019-01-03 12:31:26 -05:00 |
|
Sal
|
b69013a4f1
|
Merge branch 'bump-fixes' into 'next'
Push bouncing players backwards if they get stuck in a wall
See merge request KartKrew/Kart-Public!3
|
2019-01-03 12:27:14 -05:00 |
|
mazmazz
|
f0715d7af3
|
Updated Kart icons to higher res
|
2019-01-03 12:26:25 -05:00 |
|
Sal
|
1b02805445
|
Merge branch 'map-palette-titlefix' into 'next'
Fix per-map palette not being reset properly when it should.
See merge request KartKrew/Kart-Public!9
|
2019-01-03 01:08:42 -05:00 |
|
Sal
|
5c1267d2e6
|
Merge branch 'waypoint-lap-option' into 'next'
Add waypoint lap field via Parameter field
See merge request KartKrew/Kart-Public!4
|
2019-01-03 00:58:09 -05:00 |
|