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

1230 commits

Author SHA1 Message Date
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Wolfy
98183fef6f Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
 2020-04-24 18:10:25 -05:00
Louis-Antoine
71d445a59e Fix mouse being grabbed in intermission and cutscenes 2020-04-24 18:33:35 +02:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
wolfs
fb0e699aec Merge branch 'fixsignalhandler-resurrection' into 'awful-mix' 
2.2 signal handler

See merge request SinnamonLat/Kart-Public!11
 2020-04-20 22:42:59 -04:00
James R
a4ef8dd401 Multithreading in my SRB2??? 2020-04-17 20:05:29 -07:00
wolfs
4a264ffba9 Merge branch 'http-downloads' into 'awful-mix' 
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
 2020-04-12 21:38:33 -04:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05:00
Hannu Hanhi
6bf90fc441 Batching! 2020-04-12 03:09:07 +03:00
Zachary McAlpin
b6a2c21db7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-04-09 20:12:11 -05: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
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
Sally Cochenour
896f752d94 Fix the compile errors I got 
- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
 2020-03-29 08:39:15 -04:00
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
Zachary McAlpin
61447c20be Screw merge conflicts 2020-03-24 20:38:46 -05:00
Jaime Passos
21a3067936 Fix M_PathParts instead 
(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
 2020-03-24 15:49:29 -07:00
Jaime Passos
f74adb0ad9 Fix logfiles crashing Windoze 
(cherry picked from commit 3bb7fd4cbf2bb92f5548cafad00b80cb366395a4)
 2020-03-24 15:49:29 -07:00
James R
7ef8e81713 Correct usage of logdir 
(cherry picked from commit b7b4945c36fb95f406a365d64f109cfc83ad4d63)
 2020-03-24 15:49:09 -07:00
James R
d1de8cc2eb Overwrite an already existing symlink 
(cherry picked from commit f2c2836301d4dc59242d09f08a5473341c4d692c)
 2020-03-24 15:49:08 -07:00
James R
10a9a05cd8 symlink latest-log.txt on nix, copy to the real log file everywhere else 
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
 2020-03-24 15:49:08 -07:00
James R
294dfbacc5 Create directories from -logfile too 
(cherry picked from commit 98cb238d36e0f85d9d4b4d2cff59c720e1630bdd)
 2020-03-24 15:49:08 -07:00
James R
b4f93fea8e Let an asbolute path work with -logfile 
(cherry picked from commit 5fbe77cdda7ec52bc2ca10ab9253df8dc56d2317)
 2020-03-24 15:49:08 -07:00
James R
45a2e22abc -logdir lets the user change the log directory 
(cherry picked from commit 457e986b7514c0e9fa921c1961344012443ac164)
 2020-03-24 15:49:07 -07:00
James R
599452af7b Change default log filename to not use a space 
bleh

(cherry picked from commit c285000c5668ab82545ec9ee4989aabf65e2585e)
 2020-03-24 15:49:07 -07:00
James R
ccde660cdf -logfile to let the user change the log file name 
(cherry picked from commit d9d13764e6840e036c095c6d87838a4dfede80f4)
 2020-03-24 15:49:07 -07:00
toaster
5653a72141 * 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..?)

(cherry picked from commit 113568095a609c662e33e67f311c94e28be127d9)
 2020-03-24 15:43:07 -07:00
Steel Titanium
e9110b660c Better directory structure 
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)

# Conflicts:
#	src/m_menu.c
#	src/m_menu.h
#	src/m_misc.h
 2020-03-24 15:36:44 -07:00
Jaime Passos
1a759a4904 GIF recording 
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
 2020-03-23 17:10:33 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
e9c0e65e0e Only resync music if in a level 2020-03-21 22:28:54 -07:00
James R
d1dce97d15 Don't resync if it's disabled 2020-03-21 22:28:54 -07:00
James R
530cac8673 Hey it's audio- ....resynching... 2020-03-21 22:28:54 -07:00
Monster Iestyn
ffb2674a6e Merge branch 'next' into demos-refactor 
# Conflicts:
#	src/g_game.c

(also update g_demo.c)
 2020-03-20 17:48:31 +00:00
Monster Iestyn
8ae098a1e3 update Makefile, CMakeLists.txt and MSVC project files 2020-03-19 20:13:39 +00:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Zachary McAlpin
72b9fc014b Call LUAh_GameQuit in I_GetEvent in if the event is SDL_Quit and if you are in a playing session 
Time for the ultimate testing to see if I get any undefined reference compiling errors
 2020-03-15 10:47:55 -05:00
Zachary McAlpin
2959e3d299 Revert "Let's just call LUAh_GameQuit in I_Quit anyways" 
This reverts commit c76dfdf3c2.
 2020-03-15 10:33:24 -05:00
Zachary McAlpin
c76dfdf3c2 Let's just call LUAh_GameQuit in I_Quit anyways 2020-03-15 00:39:46 -05:00
Zachary McAlpin
e5a5b4af42 Revert "Call `LUAh_GameQuit` in 2 places." 
This reverts commit 917ba7e505.
 2020-03-15 00:08:57 -05:00
Zachary McAlpin
917ba7e505 Call `LUAh_GameQuit` in 2 places. 2020-03-15 00:53:05 -04:00
fickleheart
33a9e5aa83 Merge remote-tracking branch 'upstream/master' into shaders-222 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
 2020-03-14 12:52:15 -05:00
Monster Iestyn
12468abff5 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Jaime Passos
81a57d5fac Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03: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
James R
a511d9358a Terrible code to show the ping counter for honest servers 2020-02-23 23:07:57 -08:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
Steel Titanium
c7778af7d6 Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00