Commit graph

156 commits

Author SHA1 Message Date
James R
aa0d40212e Merge branch 'ogl-colorbug' into 'master'
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
b20750f88c Merge branch 'grfang' into 'master'
Allow models for skin/sprites with same name

See merge request STJr/SRB2!767
2020-02-16 23:21:07 -05:00
Sally Cochenour
07d355e4d3 FIX COLOR BUG 2020-02-17 01:19:28 -03:00
Jaime Passos
fc81f2dce5 change prefix to "PLAYER" 2020-02-15 12:40:41 -03:00
Jaime Passos
61bbcb02c6 player model prefix 2020-02-11 23:54:39 -03:00
Jaime Passos
6568a57c58 allow models for skin/sprites with same name 2020-02-08 20:44:43 -03:00
MascaraSnake
595537267a Merge branch 'minor-ogl-improvements' into 'next'
Minor OpenGL improvements

See merge request STJr/SRB2!661
2020-01-10 13:32:37 -05:00
James R
f97afe47fa Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
Sally Cochenour
3191c365de More blend image updates
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software

(cherry picked from commit 74d7f256a7849d0c829177614b37089e2446f86b)
2020-01-08 13:12:37 -05:00
Sally Cochenour
e4744f6c34 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
Jaime Passos
c32e481689 Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos
7f178d3bb7 Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
48852f5140 sike 2019-12-18 11:47:26 -03:00
Jaime Passos
a91077278b opengl 2019-12-17 13:48:48 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Jaime Passos
c63c8041ab allow models to change colors more than once. 2019-12-17 12:50:41 -03:00
Jaime Passos
00521d865a FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos
748f08ef3c HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos
aa10c6c733 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos
27873ff7bc Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos
7a753b701f Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos
1bf3c14c16 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos
9560d43063 Texture blending port
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
2019-12-12 21:22:36 -03:00
Jaime Passos
529e5fdc52 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
lachwright
fa52f69c21 Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos
85cde87ae1 Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos
3e759a2b75 rename rollaxis to rotaxis 2019-11-13 12:47:30 -03:00
Jaime Passos
ae630a9a23 Rotation axis (will rename internally later) 2019-11-13 12:36:44 -03:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
MascaraSnake
fae4fb16e9 Merge branch 'internal-md3-vanilla-c' into 'master'
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
MascaraSnake
f984c28dd0 Merge branch 'dashmodecut' into 'master'
Dashmode polish

Closes #266

See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
Jaime Passos
b078b8791a Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
James R
e255c340f0 Also allocate mipmap for MD2 2019-11-07 18:04:53 -08:00
James R
fd74f1848c Fix nonpacked to packed cast for OpenGL 2019-11-07 16:30:29 -08:00
Jaime Passos
5fabd3f165 function renaming 2019-11-05 10:28:19 -03:00
Jaime Passos
f655865200 add gr_modelinterpolation 2019-11-04 12:21:53 -03:00
toaster
31524531a9 Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!) 2019-11-04 13:11:04 +00: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
toaster
8f14902e36 Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise. 2019-11-02 18:25:56 +00:00
toaster
a23e1946c4 Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck.
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.

Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
2019-11-02 17:52:54 +00:00
Jaime Passos
116fb2639e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
toaster
4a7ed2d9ec MD2 crash fix. 2019-10-13 11:59:38 +01:00
Jaime Passos
09c9714daf Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
Jaime Passos
e2ce3988fb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Steel Titanium
8e50a7214c Restore code that somehow got reverted???
How did this even happen??
2019-09-22 20:30:07 -04:00
Alam Arias
296409d93e platersprite_t is not the same as unsigned 2019-09-19 21:42:59 -04:00
Jaime Passos
0d11dd516a Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
Jaime Passos
b28af03b1c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos
134be8dbb8 Interpolation flag support 2019-09-03 22:57:54 -03:00