vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5258 commits 50 branches 7 tags 75 MiB
Commit graph

4415 commits

Author SHA1 Message Date
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
fickleheart 4213a9cbb6 i,m gowonna update my name in the cwedits uwu 2019-01-11 18:11:52 -06: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
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
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
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
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
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
fickleheart bc429ad4f8 Determine latency with leveltime BS instead of nettics 2019-01-05 01:13:16 -06: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
fickleheart 656de08b96 test stuff 2019-01-04 23:09:29 -06:00
fickleheart bd36a0f0a1 Don't turn players more than they're allowed to 
This should account for latency properly.
 2019-01-04 23:09:27 -06:00
fickleheart 12b0e7d5da Send latency in players' ticcmds 2019-01-04 23:09:26 -06: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
SeventhSentinel 2db9fa1b96 Update SOC version, make base SRB2 SOC throw a warning 2019-01-03 16:30:50 -05:00
mazmazz 788c75ecdf Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2019-01-03 12:31:26 -05:00
Sal e52d5fd2fd 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 5f632d9b3c Updated Kart icons to higher res 2019-01-03 12:26:25 -05:00
Sal 0b0cbcabb7 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 220ef1a490 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
mazmazz e7ffd86c6e Fixx GCC 4.4 array-bounds compile errors 2019-01-02 20:58:52 -05:00
mazmazz 3a0217c8c8 Dummy out unused functions (OSX xcode errors) 2019-01-02 20:10:53 -05:00
mazmazz b08e522aca Better rewrite for addons draw adjustment [Kart] 2019-01-02 20:03:53 -05:00
mazmazz 4ea7c53d8e Remove FIXUPO0 GCC pragma 2019-01-02 20:03:52 -05:00
mazmazz 6166b78c87 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2019-01-02 19:23:59 -05:00
mazmazz 963819c81d Initialize skinnum for MD2 star colors (fix CLANG error) 2019-01-02 19:23:57 -05:00
mazmazz c338115ebc Fix strncpy nodenum length overflow 2019-01-02 19:23:56 -05:00
wolfy852 15b0e3ab51 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852 80390fdfa7 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852 69a760c923 Fix a duped line 2019-01-02 15:03:13 -06:00
wolfy852 4da56398ca Rebind the talk key by default, but move it to D-Pad Down 2019-01-02 14:50:36 -06:00
wolfy852 e4830b1a3a Turns out we don't need this 2019-01-02 14:47:24 -06:00
Latapostrophe 9a030bfd40 More cleanups and WANTED stuff 2019-01-02 20:36:13 +01:00
Steel Titanium 3273924743 Remove double brackets 2019-01-02 13:04:56 -05:00
Alam Ed Arias 819e4ef2ae Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Digiku 393c64b8bc Merge branch 'expanded-nmuslist' into 'next' 
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
 2019-01-01 15:06:04 -05:00
Digiku 5278d1ca20 Merge branch 'caps-lock-consistency-fix' into 'master' 
Update capslock state on window re-focus

See merge request STJr/SRB2!436
 2019-01-01 15:05:20 -05:00
Digiku bbd878e520 Merge branch 'mingw-64bit-cpu-target-revise' into 'master' 
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
 2019-01-01 11:15:34 -05:00
Steel Titanium d6178a3a40 Comment this out again. 
How did this even get reverted...
 2018-12-31 18:34:04 -05:00
mazmazz 97295bb285 Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2018-12-31 18:20:04 -05:00
Steel Titanium 6ad2c145d7 Better attempt at fixing this 2018-12-31 18:19:18 -05:00
SeventhSentinel 1987dec652 This would probably be fine, but lets make it consistent like every other instance of this. 2018-12-31 17:59:42 -05:00
SeventhSentinel 5cd6b58c44 Remove accidental DEVELOP commit 2018-12-31 17:55:27 -05:00