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

4555 commits

Author SHA1 Message Date
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
Steel Titanium 749bc65caa Attempt 1 to properly fix 2018-12-31 14:18:00 -05:00
Steel Titanium 18fea4f3b1 Revert "Fix per-map palette not being reset properly on title" 
This reverts commit 1bb6ff27c8.
 2018-12-31 13:35:38 -05:00
mazmazz 91f9168a01 Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:45:03 -05:00
mazmazz d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz 07e7dba730 Also change DEFAULTWADLOCATION to SRB2Kart in SDL2 2018-12-31 00:21:19 -05:00
Steel Titanium 1bb6ff27c8 Fix per-map palette not being reset properly on title 2018-12-30 23:38:38 -05:00
mazmazz 9684dfd6f6 Change DEFAULTWADLOCATION to SRB2Kart 2018-12-30 21:13:02 -05:00
mazmazz 48d3df5c6e Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-30 19:39:44 -05:00
mazmazz fa551a980b Apply srb2home to debugfile 2018-12-30 19:39:42 -05:00
mazmazz 7616e30142 Apply srb2home to SAVECONFIG 2018-12-30 19:39:41 -05:00
mazmazz de0da37691 EXEC: Search for CFG by file path 2018-12-30 19:39:39 -05:00
mazmazz 077469cbab Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-30 19:39:36 -05:00
mazmazz 9b698d24b9 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
mazmazz 346e11d6da Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz e2f5c99217 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
mazmazz 3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz 4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Latapostrophe 629067c5eb Cleaner code because I was a huge idiot 2018-12-29 21:46:40 +01:00
wolfy852 7091cb1cca JoyInfo1 -> JoyInfo 
Don't you love it when typos ruin everything? :P
 2018-12-29 13:55:58 -06:00
Latapostrophe 50808cc48c Alignment mistakes for nongreen 2018-12-29 11:17:51 +01:00
Latapostrophe 0114c2bc22 Clean up splitscreen huds to allow minimap 2018-12-29 10:59:34 +01:00
wolfy852 7a9e6161ae Check joystick IDs against all other players [by Digiku] 
Untested on my end, but conceptually sound.
 2018-12-29 02:33:53 -06:00
wolfy852 266e255bb6 Reorganize some of the code for SDL_JOYDEVICEADDED events 2018-12-28 14:20:28 -06:00
Digiku 80e30c6aaa Merge branch 'MSVC-ARM' into 'master' 
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
 2018-12-28 01:05:40 -05:00
wolfy852 cbc4529039 Disable DEVELOP, since this is ready to merge 2018-12-27 21:23:32 -06:00
Steel Titanium d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
wolfy852 eb729c55e4 Make I_GetJoystickDeviceIndex account for controllers 3 and 4 2018-12-27 18:28:09 -06:00
wolfy852 630552f428 Fix an issue where gamepad options for player 4 ended up binding settings for player 3 instead. 2018-12-27 18:13:13 -06:00
Steel Titanium 5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium 4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
fickleheart 90e553d81a Use waypoint extrainfo to determine lap it works on 
This can be useful to improve waypoint tracking on sprint maps.
 2018-12-27 17:11:16 -06:00
wolfy852 203050dc04 Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks 
# Conflicts:
#	src/command.c
#	src/command.h
#	src/g_game.c
#	src/m_menu.c
#	src/sdl/i_system.c
#	src/sdl/i_video.c
#	src/sdl/sdlmain.h

This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
 2018-12-27 16:21:51 -06:00
SeventhSentinel 7e936d18d2 Merge branch 'master' into mobj-scale-global 2018-12-27 13:58:42 -05:00
Steel Titanium 6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
james 0b857f127f Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku da9447342c Merge branch '2123-version' into 'master' 
Update code versions to 2.1.23

See merge request STJr/SRB2!435
 2018-12-26 17:14:58 -05:00
Digiku ebb4c65d92 Merge branch 'srb2-chat-nonet' into 'master' 
Hide SRB2-CHAT behind #ifndef NONET

See merge request STJr/SRB2!434
 2018-12-26 17:13:23 -05:00
mazmazz 60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz 894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
fickleheart 2b870ef6d4 oops forgot this 2018-12-26 15:31:19 -06:00
mazmazz 814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
fickleheart 6954689b96 Clean up stuff I did while debugging 2018-12-26 14:51:06 -06:00
fickleheart 74f13c0889 Push bouncing players backwards if they get stuck in a wall 2018-12-26 14:51:05 -06:00
Steel Titanium 4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
mazmazz fa6f791ec3 Fix -ANGLE_180 because MSVC complains 
-ANGLE_180 evaluates equal to ANGLE_180.
 2018-12-25 01:14:05 -05:00
mazmazz 73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz 842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
mazmazz 0b81debf94 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
mazmazz 82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
wolfy852 6d028fe8d9 Kill default d-pad bindings aside from "Show Rankings" 2018-12-24 21:30:42 -06:00
mazmazz b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'" 
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
 2018-12-24 20:58:26 -05:00
mazmazz bfc501a271 Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku cb42702e6b Merge branch 'float-compare-colormap-fix' into 'master' 
Fix float comparison for colormap maskamt

See merge request STJr/SRB2!428
 2018-12-24 20:55:06 -05:00
mazmazz 10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz c65f44e805 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias 4651eddc36 Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz 58728ec358 Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
mazmazz 32697ddf61 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
mazmazz 7fc79f0b88 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz c2dc5788bf Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-24 17:30:59 -05:00
Jimita 4c6334f459 cleanup 2018-12-24 17:21:33 -05:00
Digiku f06fd4149d Merge branch 'polyobject-crush-fix-waypoint' into 'next' 
Polyobject crush fix by waypoints [by TehRealSalt]

See merge request STJr/SRB2!426
 2018-12-24 17:01:06 -05:00
Alam Ed Arias c8f4d125b4 Merge branch 'master' into next 2018-12-24 16:56:29 -05:00
Digiku be9a04e489 Merge branch 'disablespeedadjust-fix' into 'next' 
Disablespeedadjust fix

See merge request STJr/SRB2!425
 2018-12-24 16:31:19 -05:00
TehRealSalt 878b1b2d16 Fix move by waypoints not checking for sector changes 
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.

If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
 2018-12-24 14:39:07 -05:00
Monster Iestyn 31c6b6ef77 remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway 2018-12-24 19:37:52 +00:00
Monster Iestyn 936b9ecebc Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean 2018-12-24 19:29:54 +00:00
Monster Iestyn 01588ea967 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
mazmazz ac9cb59de9 Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00
mazmazz 9d1bc3063f Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05:00
Steel Titanium cb13ace77e Merge branch 'master' into sdl-autograb 2018-12-23 22:35:44 -05:00
mazmazz ed410575d6 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium 46d1a866d8 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
mazmazz cb01ebebed Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz 83a6f5d6ae Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
mazmazz c0a0c5ac5d Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Digiku d72e3fe71c Merge branch '2122-patch-dta-update' into '2122-version' 
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
 2018-12-23 18:08:38 -05:00
Digiku 8d56c2f486 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku fa36b8f5a2 Merge branch 'menu-mpjoy-fix' into '2122-version' 
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]

See merge request STJr/SRB2!420
 2018-12-23 18:06:27 -05:00
mazmazz 2b8cdc0381 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" 
This reverts commit c0c05043e6.
 2018-12-23 18:04:01 -05:00
mazmazz c0c05043e6 Revert "Merge branch 'menu-mpjoy-fix' into 'next'" 
This reverts commit b5d4bb3530, reversing
changes made to 2d675750cf.
 2018-12-23 17:57:50 -05:00
Digiku b5d4bb3530 Merge branch 'menu-mpjoy-fix' into 'next' 
Menu: Fix joystick events causing the player to move during multiplayer system menu

See merge request STJr/SRB2!414
 2018-12-23 17:55:02 -05:00
Digiku 7a64e3d1a8 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
Digiku 402860dc06 Merge branch 'loadconfig-defaultcontrols' into 'master' 
Reset default controls for LOADCONFIG command

See merge request STJr/SRB2!403
 2018-12-23 17:14:34 -05:00
Latapostrophe b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Monster Iestyn 2d675750cf fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c 2018-12-23 21:52:49 +00:00
mazmazz f55623ef9c Clear all control keys before loading defaults in LoadConfig 2018-12-23 14:59:26 -05:00
Steel Titanium 40a037f603 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz f600c5fee0 Credits update 2018-12-23 14:41:41 -05:00
mazmazz 8f596376a9 Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
mazmazz 3277cf6976 Add JOY10 default to gc_centerview 2018-12-23 14:29:54 -05:00
mazmazz dd4c7b539f Fix joy button default override when filling keynum2 with default 2018-12-23 14:29:10 -05:00
Latapostrophe db8e1c0393 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
Latapostrophe 11f44f7ce9 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-23 10:30:37 +01:00
Latapostrophe 1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
mazmazz 3703a032f0 Buildbot fixes 2018-12-23 03:39:27 -05:00
mazmazz 7fb73cf2da New patch.dta hash for 2.1.22 2018-12-23 03:22:32 -05:00
mazmazz aa77038dfc Add chat_on to non-key move event checks 2018-12-23 03:21:32 -05:00
mazmazz 6ebc41a554 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -05:00
mazmazz ec53032310 Fix mainwads check in d_main 2018-12-23 00:29:59 -05:00
mazmazz 31cfa255f2 Merge branch '2122-version' into 2122-patch-dta-update 2018-12-22 23:50:31 -05:00
mazmazz e3d106d527 Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-22 23:42:25 -05:00
mazmazz b49cf11fb6 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-22 23:41:55 -05:00
mazmazz 33434395f7 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz 8723eb9aa2 Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update 2018-12-22 23:34:24 -05:00
Steel Titanium 66e13cf1cc SDL:Auto grab input 2018-12-22 23:28:59 -05:00
mazmazz 94858aedfe Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 23:20:01 -05:00
mazmazz a9fb17dab1 Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)" 
This reverts commit 6400729034.
 2018-12-22 22:40:58 -05:00
mazmazz 56320a35ce Use TinyFont for chat arrows 2018-12-22 22:40:04 -05:00
mazmazz 6400729034 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 21:48:24 -05:00
mazmazz e0176670f4 Correct splitscreen check in OLDCHAT 2018-12-22 21:30:39 -05:00
mazmazz 7e9411f320 Minor code cleanup, CHAT 2018-12-22 21:17:01 -05:00
Alam Ed Arias 7285f9ff1d Netcode: handle NULL in addrinfo lookup 2018-12-22 21:06:13 -05:00
mazmazz a66a2021ba Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz fb3722a6f3 Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
Alam Ed Arias 0ed9665a79 Added static library of SDL2 and SDL2_mixer for ARM systems 2018-12-22 20:48:15 -05:00
mazmazz 0f0e30924f One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz 5badc11159 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Alam Ed Arias 102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix 
Large room fix
 2018-12-22 19:48:08 -05:00
Alam Ed Arias 4265be776c Merge branch 'master' into next 2018-12-22 19:36:32 -05:00
Alam Arias 194f9ea8c0
Merge branch 'next' into sw_largeroomfix 2018-12-22 19:34:22 -05:00
Latapostrophe c7060aa5ad Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Latapostrophe 619dd9d08a Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
mazmazz 8707b2f40a Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz cb619e0353 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
TehRealSalt 1291d35e08 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -05:00
Steel Titanium 10521d161c Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
Steel Titanium e42bcd5b68 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Alam Arias b6a917cda1 Added ARM/ARM64 to whole vc10 sln 
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
 2018-12-21 16:47:10 -05:00
Monster Iestyn a72d79da54 Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
mazmazz 90832938c9 Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz 06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
mazmazz e20c70d5fb Skip setting control if keynum is -1 (for KEY_PAUSE) handling 2018-12-20 18:27:44 -05:00
Digiku 41a25a68c9 Merge branch '2122-credits-update' into 'next' 
Add sirjuddington and CodeImp to Special Thanks credits

See merge request STJr/SRB2!409
 2018-12-20 18:06:08 -05:00
mazmazz f1fea30045 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz f66ee8c4cd Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
mazmazz 9be1ee4ac7 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz 6affe807e8 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
Digiku 58a2cec70f Merge branch 'float_equal' into 'master' 
Clear Float equal warnings

See merge request STJr/SRB2!383
 2018-12-20 16:58:37 -05:00
Jimita 2b59cfa63f
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:58:16 -02:00
Jimita b68e01cb2b
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:57:38 -02:00
Digiku 9525de2d83 Merge branch 'camera-backport' into 'next' 
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
 2018-12-20 16:57:23 -05:00
Digiku 28c8ad3dbb Merge branch 'jump-spin-axes' into 'next' 
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
 2018-12-20 16:57:05 -05:00
Digiku 75e570f2b4 Merge branch 'joy-jump-defaults' into 'next' 
Assign joy button defaults for 1 and 2 player

See merge request STJr/SRB2!400
 2018-12-20 16:56:09 -05:00
Digiku 50221c47e9 Merge branch 'menu-2pcontrols-fix' into 'master' 
Fix 2p control menu graying out

See merge request STJr/SRB2!407
 2018-12-20 16:54:52 -05:00
Jimita 2bdf56804c
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:53:24 -02:00
Digiku f405f1ae30 Merge branch 'cmake-dllpath-fix' into 'master' 
Update CMake paths for Windows DLLs

See merge request STJr/SRB2!406
 2018-12-20 16:53:06 -05:00
MPC 9d93f54b67 bland 2018-12-20 18:52:51 -03:00
mazmazz 0519d8c52d Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz fe5001a38a Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz b57204fc12 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz 6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
MPC fcb65951b8 change implementation of square root 2018-12-20 17:37:06 -03:00
Jimita 5b285a60a2
Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita ffd5061531
Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn 76fe78571e fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn dfbbab35f4 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00