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

103 commits

Author SHA1 Message Date
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
Monster Iestyn
12468abff5 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08: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
mazmazz
f9354289ba Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-05-02 17:43:40 -04:00
Monster Iestyn
70d1006800 Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/Srb2SDL-vc10.vcxproj
#	src/sdl12/Srb2SDL-vc9.vcproj
#	src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-03-02 20:51:15 +00:00
wolfs
8a6f4b6405 Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08:00
mazmazz
70f2e9a7ab Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-01-07 04:06:45 -05:00
mazmazz
0efc1b968f Flip HAVE_OPENMPT on by default for non-Windows makefile 2019-01-04 01:48:04 -05:00
mazmazz
c0ca2c8980 Remove dynamic openmpt loading 2019-01-03 20:52:09 -05:00
mazmazz
04fc9a8605 Revised MinGW Makefile logic for OpenMPT 2019-01-02 02:37:48 -05:00
mazmazz
235db51696 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:15:29 -05:00
mazmazz
1dd2899521 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -05:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
deec4550d3 Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Steel Titanium
f61c8fa279 Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
46d3e06576 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
3ca95acc56 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium
faaf298c4f Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
mazmazz
25a8b1ed22 Add MD2/MD3 files to makefile 2018-12-18 17:57:39 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn
eb4eef6104 Merge branch 'public_next' 
# Conflicts:
#	src/Makefile.cfg
#	src/d_clisrv.c
#	src/p_setup.c
#	src/r_segs.c
#	src/r_things.c
 2018-11-20 14:33:10 +00:00
Steel Titanium
a84c49d7d6 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
ae2b331a11 Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium
be3fac2908 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
mazmazz
4b63f20e9d Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-11-13 14:34:40 -05:00
Monster Iestyn
b7dc441e10 Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least 
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
 2018-11-10 16:08:26 +00:00
Monster Iestyn
89d7c55878 Merge branch 'public_next' 
# Conflicts:
#	src/Makefile
#	src/lua_script.c
#	src/p_user.c
#	src/sdl/i_system.c
#	src/v_video.c
#	src/w_wad.c
 2018-10-10 14:51:34 +01:00
Steel Titanium
2eb9bebcd9 Split zlib and libpng 2018-10-04 19:47:19 -04:00
mazmazz
f771c12701 MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms 2018-09-19 23:03:35 -04:00
mazmazz
85c6715188 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz
cd44668e21 Makefile comments 2018-08-26 23:02:57 -04:00
Monster Iestyn
f6b8206660 Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +01:00
Alam Ed Arias
f80b4e18a2 Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00