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
Monster Iestyn
e39c6b47e7
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
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
Digiku
98e46f5b1c
Merge branch 'large-room-msvc-fix' into 'next'
...
Fix -ANGLE_180 because MSVC complains
See merge request STJr/SRB2!432
2018-12-25 01:15:02 -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
Digiku
26f956acea
Merge branch '2122-version' into 'next'
...
Update code versions to 2.1.22
See merge request STJr/SRB2!402
2018-12-25 00:45:14 -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
Digiku
a5b3f0397f
Merge branch 'undo-old-side-discolor-fix' into 'master'
...
Undo old side discolor fix
See merge request STJr/SRB2!431
2018-12-25 00:14:41 -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
Digiku
1d474626f4
Merge branch 'nights-pgup-control' into 'next'
...
Support Look Up/Down keys for NiGHTS movement
See merge request STJr/SRB2!430
2018-12-24 23:53:35 -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 e721a3d8824656a0d02c
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
Alam Ed Arias
89133160ec
TravisCI: GCC 8.x needs to pass
2018-12-24 19:10:29 -05:00
mazmazz
32697ddf61
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
Digiku
e721a3d882
Merge branch 'side-discolor-fix' into 'master'
...
Fix colormap bleeding onto sides [by Jimita]
See merge request STJr/SRB2!427
2018-12-24 17:33:34 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
