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
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
James R
eb0ba37dce
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
James R
42dbe3d1a1
Also allocate mipmap for MD2
...
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
2020-04-11 22:10:05 -07: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
Hannu Hanhi
edc87fbed9
Don't repeatedly look for texture files that don't exist. This fixes performance issues with models.
2020-04-11 13:27:17 -05:00
James R
8335a44864
Merge branch 'md2-rollangle' into 'master'
...
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
GoldenTails
e0f6559595
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
...
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
Sally Cochenour
c7daa33bb8
Merge branch 'master' into draw-flags
2020-02-24 00:52:45 -05:00
fickleheart
6734fbc49a
Fix MD2 rollangle in reverse gravity
2020-02-23 18:44:22 -06:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
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
Jaime Passos
043057532c
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03: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
Jaime Passos
7cade749a6
allow models for skin/sprites with same name
2020-02-08 20:29:28 -03:00
Sally Cochenour
a063ffed2e
Remove blend to black
2020-02-02 07:28:31 -05:00
Sally Cochenour
8ee1cc9209
FIX COLOR BUG
2020-02-02 07:28:31 -05: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
Sally Cochenour
889bb09e6c
Merge branch 'namirays' into oglshaderport
2020-01-11 09:32:59 -05: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
Sally Cochenour
c35ac81717
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
2019-12-29 16:36:53 -05:00
Sally Cochenour
31304eda3e
Merge branch 'next' into oglshaderport
2019-12-28 13:58:41 -05:00
Jaime Passos
070adb4191
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
