Commit graph

5289 commits

Author SHA1 Message Date
mazmazz
0056ff7a65 Dummy out DD builds 2018-12-30 13:34:43 -05:00
mazmazz
5ec958fcc3 Update Kart asset paths to 1.0.2 2018-12-30 12:42:58 -05:00
mazmazz
bda09035e3 Dummy out ERRORMODE from appveyor; update to Kart version 1.0.2 2018-12-30 12:38:55 -05:00
mazmazz
1db0ba29cf Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 12:36:50 -05:00
mazmazz
dab907ff6f Implement install building for appveyor (deployer) 2018-12-30 12:36:49 -05:00
mazmazz
3b581bdcce Add 64-bit DD buildbot 2018-12-30 12:36:13 -05:00
mazmazz
ca0ca0f75c Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-30 12:36:11 -05:00
mazmazz
e93896ebeb Disable UPX by default in appveyor 2018-12-30 12:36:10 -05:00
mazmazz
6b02af97f2 Add 64-bit SDL builds to appveyor config 2018-12-30 12:36:08 -05:00
mazmazz
b24cded68e Rename M5 to ARCHOPTS; allow override by command line 2018-12-30 12:35:29 -05:00
mazmazz
16f1dd420f 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
41cbd83498 Don't set if LINUX64 is defined 2018-12-30 12:35:26 -05:00
Steel Titanium
0fb3a622ef Stupid restrictions 2018-12-30 12:35:24 -05:00
Steel Titanium
f0d6711ce1 More explict check 2018-12-30 12:35:23 -05:00
Steel Titanium
8254ed4237 Target nocona for 64-bit builds 2018-12-30 12:35:20 -05:00
mazmazz
262dc5dac6 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
8591455701 Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
d36fc9f854 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz
657f6c75c8 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
555be9c76f Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
mazmazz
0ae3e51c7a Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
13b143614e Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz
deec4550d3 Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b 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
473b4ff5a4 Cleaner code because I was a huge idiot 2018-12-29 21:46:40 +01:00
wolfy852
f5cd56004c JoyInfo1 -> JoyInfo
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
Latapostrophe
9a9b13bf51 Alignment mistakes for nongreen 2018-12-29 11:17:51 +01:00
Latapostrophe
55d79622fa Clean up splitscreen huds to allow minimap 2018-12-29 10:59:34 +01:00
wolfy852
f2e5de3043 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
650df71cfc Reorganize some of the code for SDL_JOYDEVICEADDED events 2018-12-28 14:20:28 -06:00
Digiku
1517c16c4d 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
4dc7c6459c Disable DEVELOP, since this is ready to merge 2018-12-27 21:23:32 -06:00
Steel Titanium
f61c8fa279 Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
wolfy852
b5b9703b8b Make I_GetJoystickDeviceIndex account for controllers 3 and 4 2018-12-27 18:28:09 -06:00
wolfy852
6fc90ada95 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
46d3e06576 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
3ca95acc56 More explict check 2018-12-27 18:54:10 -05:00
fickleheart
e5f2f39b46 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
f4d6a108d5 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
68525de00a Merge branch 'master' into mobj-scale-global 2018-12-27 13:58:42 -05:00
Steel Titanium
faaf298c4f Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
james
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku
1358a8dd8f 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
7e923333b9 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
a25c755a6b Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
7deac7e603 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
fickleheart
55e0dcb2e3 oops forgot this 2018-12-26 15:31:19 -06:00
mazmazz
bd4874aa53 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Monster Iestyn
c181ac84ba Merge branch 'vanilia-savegame-fix' into 'master'
Fix saving game progress on a unmodified game

See merge request STJr/SRB2!433
2018-12-26 16:05:16 -05:00
fickleheart
9485bbfe10 Clean up stuff I did while debugging 2018-12-26 14:51:06 -06:00