thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5432 commits 1 branch 12 tags 205 MiB
Commit graph

112 commits

Author SHA1 Message Date
Steel Titanium
db07eddb3a Properly comment out the function 2019-03-07 18:52:27 -05:00
Steel Titanium
4698130321 Fix unused function error 2019-03-07 18:20:57 -05:00
Steel Titanium
a0b06044b1 Don't skip frames in software mode 2019-03-05 22:07:53 -05:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
wolfy852
5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
 2019-01-08 16:32:24 -06:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
wolfy852
f5cd56004c JoyInfo1 -> JoyInfo 
Don't you love it when typos ruin everything? :P
 2018-12-29 13:55:58 -06:00
wolfy852
f2e5de3043 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
650df71cfc Reorganize some of the code for SDL_JOYDEVICEADDED events 2018-12-28 14:20:28 -06:00
wolfy852
f4d6a108d5 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
james
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
mazmazz
fe836e6109 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
Steel Titanium
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
wolfy852
72619a3f71 Extend joystick hotplugging to players 3 and 4 2018-12-19 18:08:38 -06: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
651c99c5e3 Change joystick log messages to DBG_GAMELOGIC 2018-12-13 23:26:07 -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
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
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
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
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
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master' 
Compiling cleanup and fixes

See merge request STJr/SRB2!311
 2018-11-10 13:56:17 -05:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
TehRealSalt
c7b0df8172 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
Steel Titanium
d7a0a3c94b Update copyright info on some files 2018-11-01 14:47:19 -04:00
Sryder
eeb6003595 Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty. 2018-10-04 21:08:47 +01:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
toaster
41b7625fa7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/g_game.c
#	src/v_video.c
 2018-08-26 12:42:55 +01:00
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
toaster
0c03442a69 More menu stuff! 
* Center level selection.
	* Re-work Record Attack screen.
	* Re-order MP Main menu, hide in NONET.
	* Combined yeeeah on vote screen.
	* Colour gametype on tab and tally.
	* (unrelated) Don't show "CHECK" if exiting.
 2018-07-02 01:55:01 +01:00
TehRealSalt
ec23771ef7 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
Monster Iestyn
71fa00e423 Ignore mouse button events if the mouse's focus is not actually on the window at the moment. 
This should hopefully kill the F12 getting stuck issue once and for all.
 2018-05-28 21:29:46 +01:00
TehRealSalt
8fe068ef46 Merge remote-tracking branch 'refs/remotes/srb2public/next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
 2018-04-07 18:43:59 -04:00
Sryder
9c1bf9798a Revert "Fix screenshot functionality in fullscreen in SDL2" 
This reverts commit 83d4f29367.

The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.
 2018-03-18 18:33:53 +00:00
Sryder
83d4f29367 Fix screenshot functionality in fullscreen in SDL2 2018-03-08 22:28:38 +00:00
Sryder
e6dff75aab Optimise the screen texture setup for SDL2, Post-processor, and wipes. 
Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time.
Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.
 2018-03-07 22:55:21 +00:00
TehRealSalt
92831788da some joystick fixes 
Turns out P3/P4 controllers are broken (and still are)
 2017-12-24 08:20:58 -05:00
TehRealSalt
e62a473766 Merge remote-tracking branch 'srb2public/next' into quads 
Update
 2017-12-22 20:55:59 -05:00
Steel Titanium
799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
TehRealSalt
5fe2f4928f Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu 
# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
 2017-10-17 15:53:34 -04:00