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

381 commits

Author SHA1 Message Date
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04: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
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Sally Coolatta
3e36e15628 Merge master 2020-06-08 00:52:37 -04:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
Sally Coolatta
8be2d12b99 Merge remote-tracking branch 'public/master' 2020-05-16 00:08:53 -04:00
Sal
a20a89f5c7 Merge branch 'now-we-spin-in-spinout-only' into 'master' 
No more first person hyper spin

See merge request KartKrew/Kart-Public!160
 2020-05-15 19:28:38 -04:00
Jaime Passos
668b9bc684 Fix missing sprite column 2020-05-15 16:17:31 -03:00
Jaime Passos
c69a4f9ced Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
Hannu Hanhi
1350b89a06 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Hannu Hanhi
1a741f8883 Move some render stats variables to better locations, add I_FinishUpdate timing 2020-05-02 23:13:32 +03:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
lachwright
6905cfb064 Revert camtilt splitscreen hacks 2020-04-21 03:32:06 +08:00
colette
d04a244cad FOV fixes 
# Conflicts:
#	src/r_main.c
 2020-04-18 23:13:54 -05: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
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00
Sal
0cb5e5893c Merge branch 'objscalefixes' into 'master' 
Minor map object scale fixes

See merge request KartKrew/Kart!206
 2020-03-21 18:48:36 -04:00
James R
fd1cb69a87 Merge remote-tracking branch 'origin/master' into parties 2020-03-21 12:45:23 -07:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +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
lachwright
49f9d830ed Attempt to make splitscreen's camtilt better 2020-03-12 01:23:09 +08:00
Sally Cochenour
7174b707a1 Draw distance uses object scale 2020-03-08 00:39:21 -05:00
Jaime Passos
81a57d5fac Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -05:00
James R
8619ec4d0f Fix first person camera angle in parties 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -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
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
Jaime Passos
622bf09908 i'm not paying too much attention, am i. 2020-02-08 18:08:56 -03:00
Jaime Passos
fd60b171f6 split r_isviewpointfirstperson 2020-02-08 17:49:27 -03:00
Jaime Passos
fa5957f785 add "third person only" option to gr_shearing. 2020-02-08 17:42:26 -03:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
Louis-Antoine
f07b432df4 Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil 
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
 2020-01-22 16:58:57 +01:00
Jaime Passos
2b9b3d1561 Remove W_FlushCachedPatches 2020-01-20 17:03:38 -03:00
fickleheart
52b60d90b0 Fix loss of aimingtody precision at high FOV 2020-01-18 11:19:59 -06:00
fickleheart
dcc66de65d Use generally higher zooms and fix fuzzy edges 2020-01-18 11:15:36 -06:00
fickleheart
b5b902e064 Reduce the number of distinct roll angles 2020-01-18 10:53:45 -06:00