Monster Iestyn
|
ca01834d2e
|
Merge branch 'tiny-makefile-fix' into 'master'
Tiny Makefile Fix
See merge request STJr/SRB2!289
|
2018-12-04 08:09:27 -05:00 |
|
mazmazz
|
872227f211
|
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
|
2018-12-03 23:36:36 -05:00 |
|
mazmazz
|
95fff25a7f
|
Update OSX icon
|
2018-12-03 23:09:54 -05:00 |
|
Digiku
|
ffd1f400e1
|
Merge branch 'controller-menu-touchup' into 'master'
Controller select menu improvements.
See merge request STJr/SRB2!354
|
2018-12-03 23:00:36 -05:00 |
|
Digiku
|
d6dd0c8fef
|
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
|
2797b1e428
|
Make this be consistent with non-CMake builds
|
2018-12-03 15:42:37 -05:00 |
|
Steel Titanium
|
c31c80d216
|
One small change
|
2018-12-03 13:32:24 -05:00 |
|
mazmazz
|
22232847e2
|
Hardcode Screenshot, GIF, and Viewpoint to their F keys
|
2018-12-03 13:21:16 -05:00 |
|
mazmazz
|
3bdb738888
|
thisjoyaiming fix for chasefreelook
|
2018-12-03 13:13:01 -05:00 |
|
mazmazz
|
861b35dea4
|
Revert "Make pause key bring up the menu if it's a joy button"
This reverts commit 44bec22793.
|
2018-12-03 13:11:48 -05:00 |
|
mazmazz
|
4ad7cdc684
|
Menu for joy first/third person vertical look
|
2018-12-03 13:10:49 -05:00 |
|
mazmazz
|
0e25ec9309
|
Add Joy2 for network abort
|
2018-12-03 13:10:47 -05:00 |
|
mazmazz
|
44bec22793
|
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
|
098f02fc95
|
Reset vertical look when toggling joyaiming
|
2018-12-03 13:10:24 -05:00 |
|
mazmazz
|
24ff6bc279
|
Add alwaysfreelook to joystick menu
|
2018-12-03 13:10:20 -05:00 |
|
mazmazz
|
faeb2ff430
|
Add joyaiming qualifier for joystick look up/down
|
2018-12-03 13:10:19 -05:00 |
|
mazmazz
|
3a72325355
|
Preserve event ch for other responders
|
2018-12-03 13:10:18 -05:00 |
|
mazmazz
|
a6ce80e9f4
|
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
|
2018-12-03 13:10:16 -05:00 |
|
mazmazz
|
ad9f7853f4
|
Change PC axis defaults to 360-friendly values
|
2018-12-03 13:10:15 -05:00 |
|
mazmazz
|
00fb8d4853
|
Remap menu actions to better joy keys
|
2018-12-03 13:10:12 -05:00 |
|
mazmazz
|
7e6ab56dde
|
Unneeded input header in st_stuff
|
2018-12-03 12:36:42 -05:00 |
|
mazmazz
|
a7b12b3ce5
|
Use static joyname instead of malloc
|
2018-12-03 12:35:12 -05:00 |
|
mazmazz
|
736b5175da
|
Missed (unused?) viewpoint strings
|
2018-12-03 12:20:19 -05:00 |
|
mazmazz
|
fd985d0d51
|
Forgot config strings for menu keys
|
2018-12-03 12:19:41 -05:00 |
|
mazmazz
|
235b80894c
|
Make F12 spectator string constant because of wrapping issues
|
2018-12-03 12:13:36 -05:00 |
|
mazmazz
|
16c7c98ef9
|
Change spectator string for "Press F12 to watch"
|
2018-12-03 12:11:03 -05:00 |
|
mazmazz
|
8aa4575bc1
|
Add gc_viewpoint from Kart
|
2018-12-03 11:50:57 -05:00 |
|
mazmazz
|
ec361ee6ac
|
Add gc_screenshot and gc_recordgif from Kart
|
2018-12-03 11:31:48 -05:00 |
|
mazmazz
|
0e52208384
|
Add gc_systemmenu from Kart
|
2018-12-03 11:21:25 -05:00 |
|
mazmazz
|
8fd8fca5f7
|
Remove console messages for joynames
|
2018-12-03 05:39:10 -05:00 |
|
mazmazz
|
856f826afb
|
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
|
2018-12-03 05:37:07 -05:00 |
|
Monster Iestyn
|
bc35851417
|
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
|
6cdcd8ea0f
|
make menu respond to joystick axis events without joyscale having to be 0
|
2018-12-02 21:18:28 +00:00 |
|
MonsterIestyn
|
c7362be232
|
Merge branch 'next' into lua_mapchange
|
2018-12-02 20:54:32 +00:00 |
|
Monster Iestyn
|
dadaf83e41
|
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
(This is what I should have done in the first place)
|
2018-12-02 17:42:51 +00:00 |
|
Monster Iestyn
|
2d2088fd85
|
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
|
2018-12-02 17:12:05 +00:00 |
|
Monster Iestyn
|
94ad0b880f
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
wolfy852
|
fb8b5fe749
|
s
|
2018-12-02 09:08:05 -06:00 |
|
wolfy852
|
08d3587eac
|
Fix a dumb mistake
|
2018-12-02 08:57:35 -06:00 |
|
Steel Titanium
|
058dedb2ab
|
Fix up controller menu support
|
2018-12-01 20:13:14 -05:00 |
|
Monster Iestyn
|
2e12cf411d
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00:00 |
|
Jimita
|
a32fb94e09
|
Merge branch 'next' into lua_mapchange
|
2018-11-30 15:10:59 -02:00 |
|
MPC
|
e745cb60fc
|
Change MapChange so Lua returns the map number you change
|
2018-11-30 14:01:40 -03:00 |
|
Monster Iestyn
|
5f946f0f85
|
Free lump names *before* either lumpinfo or the WAD itself!
|
2018-11-30 14:19:47 +00:00 |
|
Sryder
|
0847d7e29d
|
Fix 2 of the Unsuffixed Float Constant warnings
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
|
2018-11-29 22:12:14 +00:00 |
|
Sryder
|
ac8b4ce598
|
Merge branch 'master' into tiny-makefile-fix
|
2018-11-29 21:57:47 +00:00 |
|
Monster Iestyn
|
4f7daecf65
|
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
|
2018-11-29 14:16:02 +00:00 |
|
wolfy852
|
beb58c55ac
|
I must be some kind of idiot.
|
2018-11-29 07:34:05 -06:00 |
|
wolfy852
|
66dde279b3
|
Fix a quick merge mistake.
|
2018-11-29 07:15:54 -06:00 |
|
TehRealSalt
|
a71644f230
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|