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
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
wolfy852
6c4decfef3
Don't check splitscreen in OLDCHAT
2019-01-10 13:52:58 -06:00
TehRealSalt
5b05eff41f
Merge branch 'next' into music-credits
2019-01-10 01:14:02 -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
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
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
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
wolfy852
e115dbf34f
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
Sal
7176490d5e
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
e545a8ab7d
Merge remote-tracking branch 'next' into merge-srb2
2019-01-06 02:02:33 -05:00
SeventhSentinel
8736952aad
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
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
wolfy852
aa3c058321
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
daec4f9f7e
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
a10ac14462
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
SeventhSentinel
4de91cfea5
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
Steel Titanium
888b5056d7
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
Digiku
d5870e6f8a
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
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
SeventhSentinel
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
SeventhSentinel
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
Steel Titanium
a69239bfa8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
SeventhSentinel
b513b8a11b
Actually, let's just do "1"
2019-01-03 16:43:01 -05:00
