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
23186 commits 1 branch 12 tags 205 MiB
Commit graph

1296 commits

Author SHA1 Message Date
James R
b701baca6d Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
Jaime Passos
740f095219 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos
042f14236b Speed up level loading 
Don't flush every texture just because the palette MAY have changed
 2019-12-08 22:28:13 -03:00
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
mazmazz
126dbc4a82 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -05:00
Steel Titanium
147960f4db Correct comment 2019-12-06 17:10:14 -05:00
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Alam Ed Arias
f36fa64b57 Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
c1b29fb1a1 Merge branch 'public_next' into private 2019-12-05 11:18:33 -05:00
Alam Ed Arias
2982082dbf Fix building with MSVC 2019-12-05 10:51:55 -05:00
Steel Titanium
25712d9500 No longer allow showhud to toggle FPS counter or ping bar 2019-11-23 16:09:02 -05:00
Jaime Passos
3ed8470b58 remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05:00
Jaime Passos
dc7f8bafd5 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
toaster
f7c5774b7e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 
# Conflicts:
#	src/p_user.c
 2019-11-12 21:56:46 +00:00
Jaime Passos
c2aab97d10 fix conflict 2019-11-12 00:23:26 +01:00
Jaime Passos
e32238f0b5 GIF recording 2019-11-10 00:21:48 -03:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
toaster
91d2beebfa * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... 
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
 2019-10-29 17:38:14 +00:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af add r_patch.c 2019-10-28 15:28:42 -03:00
MascaraSnake
f5f21db2f4 Merge branch 'window-focus-music' into 'master' 
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
 2019-10-25 15:37:06 -04:00
James R
cd1ad44539 Console variables to toggle music/sound playing when the window is unfocused 
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
 2019-10-23 17:21:09 -07:00
James R
57d6baac56 Revert sound and music window focus related toggles 
This partially reverts commit 96a12b6bed.
 2019-10-23 15:24:34 -07:00
James R
30c5b66d64 Toggle ping and FPS counters with HUD 2019-10-22 21:50:51 -07:00
James R
96a12b6bed Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-10-22 21:15:20 -07:00
James R
3970085d5d Grab mouse on window focus 
Window focus does not necessarily imply mouse movement.
 2019-10-22 19:45:43 -07:00
James
d306df81c8 Merge branch 'master' into new-menus 2019-10-19 19:56:34 -04:00
toaster
ce4f322af7 Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier) 2019-10-13 12:17:24 +01:00
MascaraSnake
7e27bcb915 Merge branch 'openglskydome2' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!350
 2019-10-12 11:06:47 -04:00
Jaime Passos
09c9714daf Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
TehRealSalt
2324282569 Merge master 2019-10-03 12:16:24 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
TehRealSalt
217f61897f K_PlayerForfeit on I_Quit 
(I believe these are the only i_systems that matter?)
 2019-10-02 11:47:56 -04:00
TehRealSalt
ca83b06d93 Fuckhuge restructuring 
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
 2019-10-02 11:31:11 -04:00
Steel Titanium
65bc2ef0d6 Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
James R
246280045c Fix crash in TESTERS build if you try to record demo anyway 2019-09-27 19:20:55 -07:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Steel Titanium
cecbf95002 Various of changes 
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
 2019-09-23 22:46:44 -04:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
toaster
9770b8bf22 * Resolve compiling issues with logmessages. 
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
 2019-09-20 17:22:09 +01:00
toaster
931f872467 Merge branch 'betterdirs' into 'master' 
Better directory structure

See merge request STJr/SRB2Internal!321
 2019-09-20 11:36:56 -04:00
Jaime Passos
5e1ebad9d3 sky barreling 2019-09-17 23:38:04 -03:00