wolfy852
5fe81afeaa
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
...
# Conflicts:
# src/d_clisrv.c
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hu_stuff.c
# src/lua_baselib.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/sdlmain.h
2018-12-06 13:07:39 -06:00
mazmazz
6694b7d679
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
TehRealSalt
116b10c29d
Comment out M_DrawSaveLoadBorder
2018-12-05 21:27:51 -05:00
TehRealSalt
d53e4af93a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
TehRealSalt
7ab098636b
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
TehRealSalt
df191639bd
Merge remote-tracking branch 'srb2public/master' into merge-next
2018-12-05 19:21:13 -05:00
Monster Iestyn
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Digiku
42cb597731
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Steel Titanium
168647275c
One small change
2018-12-03 13:32:24 -05:00
mazmazz
7ce092128b
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 9de31cf2e7
.
2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
mazmazz
9de31cf2e7
Make pause key bring up the menu if it's a joy button
...
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
mazmazz
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
mazmazz
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
mazmazz
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
mazmazz
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
Monster Iestyn
978a28004d
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
Monster Iestyn
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Steel Titanium
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
TehRealSalt
6bdbc45ffe
Enable pk3 in addons menu
2018-11-29 10:07:53 -05:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Wolfy
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Sal
28488cc0dc
Merge branch 'netcode-vars-strict' into 'master'
...
Make netcode var defaults stricter, add Advanced Server Options
See merge request KartKrew/Kart!110
2018-11-27 12:27:47 -05:00
Sal
cc8af2acdb
Merge branch 'better-buffering' into 'master'
...
Better vote level buffering
See merge request KartKrew/Kart!109
2018-11-27 12:25:02 -05:00
TehRealSalt
f0b042a4b6
Advanced Server Options menu
...
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 12:10:46 -05:00
Monster Iestyn
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
Digiku
fd891aa21d
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
TehRealSalt
478f895ea0
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
...
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V
(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
TehRealSalt
ba28f1c65f
Add confirmation to reset controls
2018-11-26 03:12:22 -05:00
Steel Titanium
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
00fc67ba36
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
mazmazz
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
TehRealSalt
5c67e22c22
Random map buffer only gets added to when
...
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
Monster Iestyn
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
TehRealSalt
7b142dbad1
Updated the one important modified game print that most people see to be more descriptive
...
(I could've SWORN there were more...)
2018-11-18 05:48:10 -05:00
Sryder
b8477b4067
Squash various warnings
...
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
TehRealSalt
1201acce4b
Slightly less duplication
2018-11-14 14:39:37 -05:00
TehRealSalt
887f4150c1
Hide unlockables with ???s
2018-11-14 14:15:24 -05:00
toaster
d9b1d33d89
Bugfixes:
...
* Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything).
* Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits).
* Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
2018-11-14 15:28:17 +00:00
toaster
6fb45fa2a9
replacement quit sounds per sal
2018-11-14 01:30:26 +00:00