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

134 commits

Author SHA1 Message Date
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
James R
d78befc713 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
7cbc9add07 Kill NOHS 
(cherry picked from commit a79316b375)
 2020-08-31 16:06:40 -07:00
James R
f013b73dd5 Merge remote-tracking branch 'origin/master' into next 2020-08-28 19:52:25 -07:00
James R
f52b66fdf5 Merge branch 'makefile-detect-system' into 'master' 
Detect which system the Makefile is running on to compile for

See merge request STJr/SRB2!1123
 2020-08-28 22:49:34 -04:00
James R
ec3dffbb94 Makefile: add WINDOWSHELL=1 for the Windows detect 2020-08-20 20:19:50 -07:00
James R
fd4ab28a84 Makefile: automatically detect system to compile for, if no system was specified 
This should work for mingw and linux so far.
 2020-08-18 18:01:59 -07:00
James R
ce98fc16bd Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS 2020-08-18 16:45:00 -07:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next' 
Kill CD support

See merge request STJr/SRB2!1102
 2020-08-09 20:48:25 -04:00
James R
42dbdd8c4a Merge branch 'http-mserv' into 'next' 
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
 2020-08-09 20:24:26 -04:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
Steel Titanium
62c85ea4a5 WIP: Remove support for DOS 
WIP because I don't know if this wording is right for the error.
 2020-07-25 18:55:51 -04:00
Jaime Passos
10189ecdc0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
Jaime Passos
c385eca5d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
abc4f22a3e Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Jaime Passos
c69a4f9ced Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
James R
94e77ba652 Rename hms123311.c to http-mserv.c 
HMS lives on in our hearts!

(cherry picked from commit 8a006fef18)
 2020-05-14 17:28:55 -07:00
Steel Titanium
97ba63424f Support for http downloads 
(cherry picked from commit 5e0eca9fe9)

(cherry picked just the libcurl stuff)
 2020-05-13 17:25:52 -07:00
James R
65ff8e2f00 The big bad HTTP master server 
Cvars:

http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
 2020-05-13 17:18:26 -07:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -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
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
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
a37a028e81 Delete USE_PALETTED_TEXTURE again 2020-01-23 20:21:13 -03:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -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
Jaime Passos
1c46be78af add r_patch.c 2019-10-28 15:28:42 -03:00
sphere
a225970360 Use zones.pk3 instead of zones.dta. 2019-09-29 05:31:50 +02:00
mazmazz
4ac4034eb9 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
 2019-08-04 11:32:55 +01:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
Steel Titanium
8839b4ce8c Merge branch 'public-notpublic-libopenmpt' into 'master' 
libopenmpt support

See merge request STJr/SRB2Internal!229
 2019-06-21 17:03:53 -04:00
Steel Titanium
8e5593c207 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04:00
Nev3r
7e1bb4a370 Code refactoring to turn portal struct into a more generalized shape. 
Split portal-related code to its own source files.
Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.
 2019-06-01 13:07:23 +02:00
Steel Titanium
2ede6dd29f Merge branch 'master' into public-musicplus-libopenmpt 2019-05-20 21:33:10 -04:00