wolfy852
ac62575896
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 11:50:53 -06:00
mazmazz
f90348ac05
Better I_InitJoystick log message
2018-12-14 06:14:21 -05:00
mazmazz
752fec8270
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 05:57:10 -05:00
mazmazz
f7727fac5a
Don't override an already-active controller
...
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
732956088a
Lots of changes to better support hotplugging and unstable device indexes
...
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
mazmazz
18287c09bb
Properly handle unstable device indexes for hotplug
2018-12-14 01:45:18 -05:00
mazmazz
601535fe41
Attempt to handle unstable device IDs
2018-12-14 00:22:25 -05:00
mazmazz
d2e39c660e
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
651c99c5e3
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
1cdbe75183
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -05:00
mazmazz
85bfe704e2
Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly
2018-12-13 22:26:13 -05:00
wolfy852
aa5ee0ebf3
Restore a change lost in the merge madness, do some SDL_GameController prep
2018-12-10 09:00:15 -06:00
mazmazz
e1c0a7158b
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
71aa97fc22
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
wolfy852
a1fffe5755
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
cc6daa751d
Disable XINPUT before initing the joy subsystem
2018-12-06 14:03:46 -05:00
mazmazz
c4f035dfa9
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
TehRealSalt
bf3a9d1d2e
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
TehRealSalt
26315ccf63
Merge remote-tracking branch 'srb2public/master' into merge-next
2018-12-05 19:21:13 -05:00
Monster Iestyn
b32f5830ed
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
dfdba01591
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
2c557d668a
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
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
95fff25a7f
Update OSX icon
2018-12-03 23:09:54 -05:00
mazmazz
a7b12b3ce5
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
856f826afb
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
TehRealSalt
a1bdfb1272
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05: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
Monster Iestyn
2e12cf411d
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +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
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Monster Iestyn
0897adcf98
Merge branch 'cmake-use-internal-libs' into 'master'
...
CMake: Use internal libs.
See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
0bff44e22b
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
mazmazz
8c845510a4
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Steel Titanium
0c30cd0fa1
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Steel Titanium
6d946c1c84
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
Steel Titanium
e6fa257b42
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
toaster
5fe9cbba3d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
Sryder
67f0b120c7
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
Alam Ed Arias
3bd88acf25
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
45c8920bb1
Clean up warnings
2018-11-14 10:52:16 -05:00
Marco Z
999a03aada
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
Marco Z
f5fe8c46fa
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
Monster Iestyn
3350096b2f
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Steel Titanium
6eec21f49d
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
mazmazz
366aeadac4
Fix x64 build issue
2018-11-13 17:12:18 -05:00
Sryder
9350721d12
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
