Alam Ed Arias
13e3a975d8
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Digiku
764e6e7659
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
4560b4cb41
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
80dc98624b
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
b63f4a66e8
Comment this out again.
...
How did this even get reverted...
2018-12-31 18:34:04 -05:00
mazmazz
c520447f77
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
Steel Titanium
26a257eda7
Better attempt at fixing this
2018-12-31 18:19:18 -05:00
SeventhSentinel
998374d603
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
c24f53f2f8
Remove accidental DEVELOP commit
2018-12-31 17:55:27 -05:00
Steel Titanium
de6c2a84f3
Attempt 1 to properly fix
2018-12-31 14:18:00 -05:00
Steel Titanium
fddd6fb0d5
Revert "Fix per-map palette not being reset properly on title"
...
This reverts commit b63e6ab325
2018-12-31 13:35:38 -05:00
mazmazz
f395aeda96
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:45:03 -05:00
mazmazz
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
mazmazz
af519d3c07
Also change DEFAULTWADLOCATION to SRB2Kart in SDL2
2018-12-31 00:21:19 -05:00
Steel Titanium
b63e6ab325
Fix per-map palette not being reset properly on title
2018-12-30 23:38:38 -05:00
mazmazz
937ac47650
Change DEFAULTWADLOCATION to SRB2Kart
2018-12-30 21:13:02 -05:00
mazmazz
e510804b4b
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-30 19:39:44 -05:00
mazmazz
b77f290e02
Apply srb2home to debugfile
2018-12-30 19:39:42 -05:00
mazmazz
b42c265707
Apply srb2home to SAVECONFIG
2018-12-30 19:39:41 -05:00
mazmazz
9be802f304
EXEC: Search for CFG by file path
2018-12-30 19:39:39 -05:00
mazmazz
08176eda18
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-30 19:39:36 -05:00
mazmazz
c31ef0c821
Set srb2home name to srb2kart
2018-12-30 18:57:33 -05:00
mazmazz
c698eed16c
Update SDL mac icon to Kart
2018-12-30 15:59:42 -05:00
mazmazz
337e0da8e4
Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge]
2018-12-30 15:41:58 -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
