thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-09 09:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11106 commits 2 branches 14 tags 206 MiB
Commit graph

873 commits

Author SHA1 Message Date
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
Zachary McAlpin
61447c20be Screw merge conflicts 2020-03-24 20:38:46 -05: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
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
Jaime Passos
b0ce2e088f Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
Jaime Passos
0813f59bd7 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-19 00:55:46 -03:00
Jaime Passos
f8f812be34 Set the palette :) 2020-02-17 22:31:34 -03:00
Jaime Passos
43abd53c55 Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
Jaime Passos
fd23294cc4 Rename stuff around 2020-02-17 21:11:56 -03:00
Jaime Passos
043057532c Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
Jaime Passos
f189e0425f add -nogl parm 2020-02-17 12:14:51 -03:00
Jaime Passos
abd7c3e503 Don't center the window when changing renderers 2020-02-17 01:15:18 -03:00
Jaime Passos
21cdca5d6d Don't call HWR_Switch twice 2020-02-17 01:15:11 -03:00
Jaime Passos
df19b64edd Remove redundant check 2020-02-17 01:15:04 -03:00
Jaime Passos
e16173a82d Always load the GL library! 2020-02-17 01:13:13 -03:00
Jaime Passos
88e99fed57 Only initialise OpenGL if you actually intend to use it. 2020-02-17 01:12:53 -03:00
Jaime Passos
edb7d20290 Missing comment 2020-02-17 01:08:55 -03:00
Jaime Passos
1d92fa38f6 Fallback to Software if the renderer version doesn't match 2020-02-17 01:08:41 -03:00
Jaime Passos
5c1b3baf18 Fix -OGLlib 2020-02-17 01:08:15 -03:00
Jaime Passos
1c48480944 Clear setrenderneeded after calling VID_CheckRenderer 2020-02-17 00:36:10 -03:00
Monster Iestyn
0a4a879b96 Updated version number to 2.2.1, increment MODVERSION. 
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
 2020-02-05 19:55:40 +00:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
Jaime Passos
85f016e4d8 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
444d50c5f8 Fix -OGLlib 2020-01-27 01:57:55 -03:00
Jaime Passos
5d3d031db3 Fix the gl_leveltime problem, I guess. 
This is probably superfluous.
 2020-01-23 21:25:54 -03:00
Louis-Antoine
4777829d45 Fix mouse in controls setup menu 2020-01-18 20:18:20 +01:00
Sally Cochenour
f1207ab4fe Fix errors 2020-01-07 19:30:09 -05:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03:00
Louis-Antoine
059a09d00e Fix mouse being grabbed even when not used 
The other way around this time.
 2020-01-06 00:40:28 +01:00
Louis-Antoine
93e878b8f0 Revert "Fix mouse being grabbed even when not used" 
This reverts commit 7d67be582b.
 2020-01-06 00:38:40 +01:00
Louis-Antoine
7d67be582b Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Louis-Antoine
54b4a53f92 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00