James R
08348fcd43
Merge remote-tracking branch 'srb2/next'
2021-04-05 01:26:17 -07:00
toaster
690244825b
* Fixed blending in OpenGL.
...
* Caught a UDMF-only crash for Software (where linedef alpha is low but nonzero).
2021-04-03 19:29:06 +01:00
toaster
e27506c660
* Made it possible to perform palette calculations in gamma-corrected space. Now used by:
...
* Blend tables generated by the game.
* The Color Cube accessibility tool.
* Fixed another stupid typo that got in the way of FF_BLENDMASK working.
* Some minor adjustments for code cleanliness.
2021-04-01 19:28:01 +01:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Monster Iestyn
0073f25170
Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE.
...
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
2021-03-21 19:49:32 +00:00
Lach
9a71a1b01e
Merge branch 'opengl-renderflags-fix' into 'next'
...
Fix a few renderflags oversights in OpenGL
See merge request STJr/SRB2!1422
2021-03-14 20:51:57 -04:00
Hannu Hanhi
ff29b6d9b7
Fix wrong color on player models' first frame by updating variable after loading blend texture
2021-03-13 23:07:51 +02:00
Jaime Ita Passos
06bad96b03
Fix a few renderflags oversights in OpenGL
2021-03-02 02:27:14 -03:00
Sally Coolatta
a93acd1958
Make it through OGL
2021-03-01 01:48:31 -05:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Jaime Ita Passos
f928709fa5
Fix animated skincolors in OpenGL
2020-12-06 20:17:14 -03:00
Jaime Ita Passos
688384c79b
Fix sprite textures in models
2020-11-22 17:10:10 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
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
Jaime Passos
ab3f4960cb
Bug fixes
2020-10-27 17:02:35 -03:00
Jaime Passos
cdc4a6d86e
Implement blend modes
2020-10-27 00:03:41 -03: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
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03: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
Jaime Passos
cb3660331a
Refactor renderer switching
2020-08-14 22:27:16 -03: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
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03: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
