thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-01 00:41:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
10008 commits 2 branches 14 tags 206 MiB
Commit graph

328 commits

Author SHA1 Message Date
Monster Iestyn
62a640e282 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
toaster
67e01ad66e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit 
# Conflicts:
#	src/m_menu.c
 2020-05-11 15:00:31 +01:00
Lachlan Wright
7df8c24a9b Merge branch 'patch_music' into 'next' 
patch_music.pk3

See merge request STJr/SRB2!812
 2020-05-10 12:51:49 -04:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
fickleheart
1844aa1445 Make a separate function instead of clogging up IdentifyVersion 2020-04-09 20:56:27 -05:00
fickleheart
8001511b7c Make chdir usage consistent with other source usage 2020-04-09 20:52:23 -05:00
fickleheart
4db9ceca03 Merge remote-tracking branch 'upstream/master' into netgame-urls 2020-04-09 20:48:52 -05:00
James R
0596dbd137 Merge branch 'execcfg-fixes' into 'master' 
ExecCfg fixes

See merge request STJr/SRB2!821
 2020-04-09 21:24:12 -04:00
James R
81a01041e8 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
0b91ef071f Merge branch 'sdlglcontext' into 'master' 
Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796
 2020-04-09 19:51:20 -04:00
fickleheart
ee754b211f Define SERVER_URL_PROTOCOL const for easy reconfiguration 2020-03-21 07:47:29 -05:00
fickleheart
8219268f2e Add support for srb2:// URL handler (server links) 2020-03-21 01:36:39 -05:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Steel Titanium
3d623577fb Merge branch 'master' into next 2020-03-02 15:26:01 -05:00
SteelT
800d277dec Merge branch 'fix-ogllib' into 'master' 
Fix -OGLlib

See merge request STJr/SRB2!794
 2020-03-02 15:21:50 -05:00
LJ Sonic
e0f3a5b8f5 Merge branch 'lua-io' into 'next' 
Support for Lua's I/O library

See merge request STJr/SRB2!727
 2020-03-01 11:12:45 -05:00
fickleheart
782c710246 Fix menu enterwipes being overridden? 2020-02-24 18:00:52 -06:00
fickleheart
d3218a2431 Fix ExecCfg not working on files added via command line 2020-02-24 11:44:45 -06:00
James R
c69ca7381c Merge branch 'console-in-menus-mk-ii' into 'master' 
Console in menus again!

See merge request STJr/SRB2!797
 2020-02-23 18:15:43 -05:00
James R
ac4cb796d0 Add patch_music.pk3 2020-02-22 14:43:41 -08:00
Steel Titanium
4f5694fa14 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
Louis-Antoine
325872de4e Fix weird comment style 2020-02-21 17:17:39 +01:00
James R
168a1325f7 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
Monster Iestyn
8eb80cbf75 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn
7ee6ff2b03 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Steel Titanium
42f141d32f Merge branch 'master' into next 2020-02-18 22:03:08 -05:00
James R
f39785672d Merge branch 'setrenderneeded-fix' into 'master' 
Clear setrenderneeded after calling VID_CheckRenderer

See merge request STJr/SRB2!793
 2020-02-18 21:53:14 -05:00
James R
1bc6f2cd91 Merge branch 'startup-file-not-found' into 'master' 
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
 2020-02-18 21:50:11 -05:00
Jaime Passos
a922194282 setrenderneeded is already cleared earlier 2020-02-17 22:33:36 -03:00
James R
b9c2cab265 Don't let console open with menu keys while the menu is open 2020-02-17 17:10:29 -08:00
James R
c77e444df9 Draw console in the Record/NiGHTS Attack menus 
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
 2020-02-17 16:37:29 -08:00
James R
2d98b3f9eb Revert "Revert "Let the console open in menus"" 
This reverts commit 73368b0c9a.
 2020-02-17 16:37:13 -08:00
Jaime Passos
f189e0425f add -nogl parm 2020-02-17 12:14:51 -03:00
Jaime Passos
1c48480944 Clear setrenderneeded after calling VID_CheckRenderer 2020-02-17 00:36:10 -03:00
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
James R
fe43dd8306 Merge remote-tracking branch 'origin/next' into public_next 2020-02-16 17:38:03 -08:00
James R
39a0e8b3e1 Merge remote-tracking branch 'origin/master' into next 2020-02-16 17:35:59 -08:00
James R
73368b0c9a Revert "Let the console open in menus" 
This reverts commit 3a9cc8db92.
 2020-02-16 17:14:54 -08:00
Steel Titanium
6eff91c4fc Update file hash yet again 2020-02-16 18:54:51 -05:00
Steel Titanium
82cbf88ae5 Update comment 2020-02-16 11:34:02 -05:00
Steel Titanium
e2c1f9cd4b Update file hashes 2020-02-09 21:29:46 -05:00
James R
956ae6b823 Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Monster Iestyn
eca4bc63da Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
Louis-Antoine
6d42930c8e Update Lua I/O support to 2.2 2020-01-22 23:08:57 +01:00
James R
ed6ca997e2 Sonic is dead again 2020-01-21 12:24:24 -08:00
James R
47b0381c99 Reorder Sonic's ass so the OpenGL wipe doesn't see garbage 2020-01-21 12:23:34 -08:00