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

124 commits

Author SHA1 Message Date
toaster
4052e01f4a Introduce a sequence of macros to reduce the reliance of Colormap-related code (especially but not limited to Encore mode) on magic numbers. 2021-02-16 14:34:00 +00:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Jaime Passos
9ad15fd556 Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
Sally Coolatta
19016db338 Got through OGL 2020-08-15 06:20:22 -04:00
Sryder
7f9850644b A few opengl file build fixes 
Also ogl_win.c had a merge conflict remaining apparently.
 2020-08-12 00:12:42 +01:00
Sally Coolatta
a30d20590c Merge hw_main.c 2020-08-10 16:23:48 -04:00
Sryder
67486dc0b6 Fix Simple opengl merge conflicts 
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
 2020-08-10 17:39:34 +01:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -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
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Jaime Passos
a9da775dd9 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03: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
Jaime Passos
ff7b9a5b5c Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos
d283cc1d2a Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88 Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Sryder
5cccff08aa Basic merge some of the easier HW files. 
hw_main and hw_md2 still need merge.
hw_cache needs evaluating for encore mode.
 2020-05-29 20:43:34 +01: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
Jaime Passos
1b81e81c56 Attempt to properly match Software texture blending 
without messing with the original ASTBlendPixel function
 2020-05-16 13:51:10 -03:00
Sally Coolatta
95a077b4dd C'mon git merge everything, not just most of it |:V 2020-05-12 03:16:35 -04:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Steel Titanium
71f21dd81b Fix compile errors 2020-04-13 23:07:38 -04:00
James R
79d93b86ca Fix nonpacked to packed cast for OpenGL 
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
 2020-04-11 22:10:05 -07: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
fickleheart
6b4a054973 Use po2 patches to fix mipmaps 2020-03-14 15:52:25 -05:00
Jaime Passos
875afea599 Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF 2020-02-28 17:31:41 -03:00
Jaime Passos
830583d973 why does this still exist? 2020-02-08 18:19:27 -03:00
Jaime Passos
e5ca7039cf no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
2d4945d558 Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos
2b9b3d1561 Remove W_FlushCachedPatches 2020-01-20 17:03:38 -03:00
Jaime Passos
a6472c2ffb Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-10 04:11:26 -03:00
Jaime Passos
058ad19433 Fix patch generation 2020-01-07 20:05:33 -03:00
Jaime Passos
f39368dfb0 use enum for bpp 2020-01-07 20:04:18 -03:00
Jaime Passos
9c66740e2b AA trees are not needed at all for rotated patches 2020-01-07 16:10:38 -03:00
Jaime Passos
769c1a4e38 Fix OpenGL 2020-01-07 14:07:14 -03:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Jaime Passos
385a6cf3c3 Cleanup, NOW 2020-01-06 20:16:48 -03:00
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
Jaime Passos
71f7130abe AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos
11dc6801dc Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
da81238610 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos
3c9cc53185 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00