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

297 commits

Author SHA1 Message Date
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master' 
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
 2020-11-17 20:03:48 -05:00
Sally Coolatta
f4e763ed72 Use additive/subtractive on models 2020-11-17 18:49:14 -05:00
Sally Coolatta
da59009ba1 More extreme hitlag vibration 2020-11-10 23:12:17 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
Sally Coolatta
875493d778 Remove the need for setting rotation axis in spriteinfo for models 
Now it just does it like Software
 2020-10-30 02:15:49 -04:00
Sally Coolatta
64c321fbed Fix incorrect tilts 2020-10-28 21:05:58 -04:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead 
Broken currently, about half of the slopes you can go into have the wrong tilt
 2020-10-28 18:36:26 -04:00
Sally Coolatta
01d5c9a95b Put back in the improvements to HWR_CreateBlendedTexture 
Fixes colors being darker, and creates blend textures faster
 2020-10-28 16:20:11 -04:00
Sally Coolatta
a253a6cedd Remove rogue line making this function do nothing 2020-10-28 15:41:32 -04:00
Sally Coolatta
646fd15b02 Remove these 2 calls to HWR_UnlockCachedPatch 
From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this.
 2020-10-28 15:16:05 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
James R
b84c45acaa Merge branch 'model-fallback' into 'next' 
Model fallback

See merge request STJr/SRB2!1167
 2020-10-18 16:52:42 -04:00
Jaime Passos
70cd48c9a2 Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
Steel Titanium
3cd14bc863 Model fallback 2020-10-02 15:45:43 -04:00
SteelT
5bfebef1e9 Fix models texture PNG path when attempting to load fallback models 2020-10-02 15:25:12 -04:00
Hannu Hanhi
9473de18c5 Convince the compiler that I know what I'm doing, I think 2020-08-18 23:21:26 +03:00
Sally Coolatta
19016db338 Got through OGL 2020-08-15 06:20:22 -04:00
Sally Coolatta
c665393bd0 actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -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
Sally Coolatta
aeeedac1ea Merge hw_md2.c 2020-08-09 19:35:13 -04:00
Jaime Passos
368e550ab1 Shader code cleanup 2020-08-07 18:17:05 -03:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
Hannu Hanhi
edc479fd13 More work on sprite-texture model uv adjustment 2020-07-16 22:11:36 +03:00
Hannu Hanhi
73b8f9f131 Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust 2020-07-14 20:30:56 +03:00
James R
16ce826caf A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Hannu Hanhi
1f89e1cf42 Adjust model uvs when used sprite texture changes 2020-07-12 18:04:56 +03:00
Hannu Hanhi
2ae0980d62 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -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
LJ Sonic
080a5acd0f Merge branch 'ff_horizontalflip' into 'next' 
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
 2020-07-03 16:56:32 -04:00
kaysrishaq
6f859fd44d FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
Hannu Hanhi
20447c68a5 Don't repeatedly look for model texture files 2020-06-19 16:18:04 +03: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
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Sal
843721cc8f Merge branch 'sprite-offsets' into 'master' 
Sprite offsets for horizontal springs

See merge request KartKrew/Kart!265
 2020-05-18 14:39:09 -04:00
Sally Coolatta
6839a8cb69 OGL model support for runtime sprite offsets 2020-05-15 23:58:22 -04:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
James R
2e42865655 Fucking shadowed declarations in hw_md2.c 2020-05-11 18:57:38 -07:00
Wolfy
61a4e1e762 HWR_CreateBlendedTexture optimizations 
By Hannu_Hanhi
 2020-05-11 17:47:24 -05:00