vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,095 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

5095 Commits

Author SHA1 Message Date
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
mazmazz f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
SeventhSentinel 23d54095d9 Merge remote-tracking branch 'kartinternal/mobj-scale-global' into mobjscale-global 2018-12-31 16:18:33 -05:00
SeventhSentinel 5b4faa4ddb Merge remote-tracking branch 'kartinternal/master' into next 2018-12-31 15:16:39 -05:00
SeventhSentinel 7be6dab8a6 Merge branch 'master' into revert-master 2018-12-31 15:08:43 -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 d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
Steel Titanium 1bb6ff27c8 Fix per-map palette not being reset properly on title 2018-12-30 23:38:38 -05:00
mazmazz 07abd30183 Dummy out ERRORMODE=1 from circleci 2018-12-30 13:50:41 -05:00
mazmazz 7f3549256b Correct asset links 2018-12-30 13:40:21 -05:00
mazmazz 1154ac16b9 Dummy out DD builds 2018-12-30 13:34:43 -05:00
mazmazz c4d5317ae3 Update Kart asset paths to 1.0.2 2018-12-30 12:42:58 -05:00
mazmazz 2f743f722a Dummy out ERRORMODE from appveyor; update to Kart version 1.0.2 2018-12-30 12:38:55 -05:00
mazmazz 9272557241 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 12:36:50 -05:00
mazmazz db6e21a8ac Implement install building for appveyor (deployer) 2018-12-30 12:36:49 -05:00
mazmazz 07dc638096 Add 64-bit DD buildbot 2018-12-30 12:36:13 -05:00
mazmazz ee4fc62109 Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-30 12:36:11 -05:00
mazmazz 5d06e6d054 Disable UPX by default in appveyor 2018-12-30 12:36:10 -05:00
mazmazz cdcb13c257 Add 64-bit SDL builds to appveyor config 2018-12-30 12:36:08 -05:00
mazmazz 353fd2409d Rename M5 to ARCHOPTS; allow override by command line 2018-12-30 12:35:29 -05:00
mazmazz 9a186243de Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-30 12:35:27 -05:00
Steel Titanium aeca8f9967 Don't set if LINUX64 is defined 2018-12-30 12:35:26 -05:00
Steel Titanium 8964fa35c1 Stupid restrictions 2018-12-30 12:35:24 -05:00
Steel Titanium cc7cff9686 More explict check 2018-12-30 12:35:23 -05:00
Steel Titanium 2dd6bbcc1d Target nocona for 64-bit builds 2018-12-30 12:35:20 -05:00
mazmazz e1300d5173 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz 941e29780c Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz bef0bc82e4 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz e7165444b4 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz 0fc07ebaae Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
mazmazz 2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz 34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -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
wolfy852 7091cb1cca JoyInfo1 -> JoyInfo 
Don't you love it when typos ruin everything? :P
 2018-12-29 13:55:58 -06: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