Commit graph

4711 commits

Author SHA1 Message Date
TehRealSalt
ebc1fce3a8 Merge remote-tracking branch 'kartinternal/master' into next 2018-12-03 17:32:20 -05:00
TehRealSalt
2ff31a7b72 Buff item hitbox size
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -05:00
Steel Titanium
2797b1e428 Make this be consistent with non-CMake builds 2018-12-03 15:42:37 -05:00
Steel Titanium
b4a9c48011 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup 2018-12-03 15:38:30 -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
Steel Titanium
6d412950ec Merge branch 'controller-names' into 'controller-menu-touchup'
Controller name fix

See merge request SteelTitanium/SRB2!2
2018-12-03 12:41:55 -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
Digiku
d6db188768 Merge branch 'new-install' into 'master'
Add new Windows installer scripts

See merge request STJr/SRB2!356
2018-12-03 07:45:05 -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
mazmazz
2295a9853a Adjustments 2018-12-03 04:55:25 -05:00
mazmazz
42a35ee7f5 A README line 2018-12-03 01:43:27 -05:00
mazmazz
bddb9c10bd Finishing touches 2 2018-12-03 01:06:25 -05:00
TehRealSalt
47e465dd8f Merge branch 'master' into next 2018-12-03 01:00:17 -05:00
mazmazz
ed84070241 Add new Windows installer scripts 2018-12-03 00:53:29 -05:00
TehRealSalt
1f125100d5 Just do MapChange hook on G_InitNew
Everything that's supposed to call it also calls this...
2018-12-03 00:33:35 -05:00
TehRealSalt
a1bdfb1272 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
TehRealSalt
bd85b2d550 Update the patch.kart hash. Again. 2018-12-03 00:21:11 -05:00
Sal
c9dc935a5c Merge branch 'unfuck-gamepads' into 'master'
Fix spectators floating when right analog is held

See merge request KartKrew/Kart!118
2018-12-02 23:35:58 -05:00
wolfy852
4c14e26f94 AXISBRAKE, take out GameController stuff for now 2018-12-02 19:33:09 -06:00
Alam Arias
3a23d9c4a8 Merge pull request #353 from monster-psychic-cat/lua_mapchange
Change MapChange so Lua returns the map number you change
2018-12-02 17:27: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
bff7fceb27 Merge branch 'searchblockmap-backport' into 'next'
Lua: Blockmap search library backport

See merge request STJr/SRB2!353
2018-12-02 09:49:42 -05:00
wolfy852
10523216e0 Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads 2018-12-02 02:01:51 -06:00
wolfy852
969164cfd1 Potentially fix spectators floating when inputting right on the analog stick. 2018-12-02 02:01:06 -06:00