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
bac7de9b0f
Merge branch 'master' into model-texture-fix
2020-10-28 15:58:00 -04:00
Sal
8b20a94202
Merge branch 'additive-transmap' into 'master'
...
Additive and Subtractive Translation Maps
See merge request KartKrew/Kart!323
2020-10-28 15:50:22 -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
d2c000b252
Implement an "ignore colormaps" sprite rendering flag
2020-10-27 19:54:50 -03:00
Jaime Passos
ab3f4960cb
Bug fixes
2020-10-27 17:02:35 -03:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Jaime Passos
cdc4a6d86e
Implement blend modes
2020-10-27 00:03:41 -03:00
James R
2ae394b8e3
Fix opengl splitscreen
2020-10-26 19:51:42 -07:00
Sryder
11386e12ba
Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum
...
Should have easier merging and be less likely to break current effects.
2020-10-26 11:18:53 +00:00
Sryder
488ad70da3
Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap
2020-10-25 14:43:44 +00: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
Sryder
b16a16027d
Fix additive/subtractive walls not working when sectors have multiple lights in OpenGL
...
This is a change that could have broken other areas so should be checked too for other areas
2020-10-25 00:27:28 +01:00
Sryder
282932862c
Fix the additive/subtractive floors not working in OpenGL.
2020-10-24 01:02:01 +01:00
Sryder
d311242a6e
Support for additive/subtractive translation maps on FOFs and Polyobjects
...
Polyobjects set translucency to 11 for additive, and 12 for subtractive
FOFs using the regular translucency settings set the top texture to #900 for additive, and #901 for subtractive
2020-10-22 23:13:51 +01:00
Sryder
4a10861669
Additive/Subtractive translation map support on midtextures
2020-10-22 22:27:14 +01:00
Sryder
b341cacb0a
Subtractive translation map
2020-10-19 11:57:12 +01: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
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Sryder
5558fb073a
Basic additive transmap/blend support
...
Can currently be used on sprites only
added to flames by default because it makes sense
2020-10-18 19:10:19 +01:00
Jaime Passos
e2adf00fc6
Don't render sprites with negative xscale or yscale in OpenGL
2020-10-17 22:40:49 -03:00
Jaime Passos
b9c9660629
Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures.
...
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
2020-10-15 14:31:16 -03:00
Jaime Passos
0bf5237e0d
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
Jaime Passos
96fa912bae
Implement object-defined floor sprite slopes.
2020-10-14 00:57:13 -03:00
Jaime Passos
a6f2e8b9c6
Implement relative and absolute sprite offsets for objects (mobjs)
...
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Jaime Passos
b7590971f4
Fix uninitialized variable warning
2020-10-12 22:08:45 -03:00
Jaime Passos
9bb09cdc8c
OpenGL support for splats, fix some shadow draw bugs in Software
2020-10-12 19:53:21 -03:00
James R
c04d08460a
Merge branch 'slight-shader-cleanup' into 'next'
...
Shader code cleanup
See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
Jaime Passos
37ed2a6b26
Support spritexscale and spriteyscale in OpenGL
...
Fix papersprite scaling with spritexscale and spriteyscale in Software
2020-10-12 17:25:18 -03:00
Jaime Passos
b4b4738c94
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
f133726df0
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
Jaime Passos
70cd48c9a2
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Jaime Passos
9ad15fd556
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -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
SteelT
045aaa678c
Merge branch 'ogl-model-uv-adjust' into 'next'
...
Re-adjust model UVs when sprite texture dimensions change
See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
James R
a32486b5b9
And fix opengl splitscreen
2020-09-23 17:50:47 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
98c6b54994
Improved memory management for patches
2020-09-07 02:23:07 -03:00
Hannu Hanhi
9473de18c5
Convince the compiler that I know what I'm doing, I think
2020-08-18 23:21:26 +03:00
Jaime Passos
d18d12fdea
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00