toaster
2868639144
Add PF_ColorMapped
...
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
# Conflicts:
# src/hardware/hw_main.c
2022-03-18 12:43:36 +00:00
James R
1ac123246d
Model stretching
2021-12-09 22:41:54 -08: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
7e28b7d3e9
OpenGL backend: Manage uploaded GPU textures with an internal list
...
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
Jaime Ita Passos
b8a13e6006
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
f4e763ed72
Use additive/subtractive on models
2020-11-17 18:49:14 -05:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -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
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
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
Jaime Passos
16c4ba672a
Move the sky dome code out of r_opengl.c, fix issues with shaders
2020-07-17 02:48:05 -03:00
kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
a5f4c3eeb0
Backwards compatibility for shaderless hardware
2020-06-18 17:39:34 +03:00
Hannu Hanhi
6cdb8c3320
Change some unsigned ints to UINT32
2020-06-07 21:32:52 +03:00
Hannu Hanhi
8ea66e3813
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
Sryder
5cccff08aa
Basic merge some of the easier HW files.
...
hw_main and hw_md2 still need merge.
hw_cache needs evaluating for encore mode.
2020-05-29 20:43:34 +01: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
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
Wolfy
98183fef6f
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Hannu Hanhi
e4bbe42eec
Fix lighting breaking if trying to use unavailable shaders
2020-04-22 23:50:14 +03:00
Hannu Hanhi
74b846a6e3
Sky dome from SRB2
2020-04-22 00:18:58 +03:00
Steel Titanium
71f21dd81b
Fix compile errors
2020-04-13 23:07:38 -04:00
Hannu Hanhi
6bf90fc441
Batching!
2020-04-12 03:09:07 +03:00
Jaime Passos
85f016e4d8
port pfnUpdateTexture
2020-01-28 00:16:38 -03:00
Jaime Passos
5d3d031db3
Fix the gl_leveltime problem, I guess.
...
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos
2d4945d558
Update copyright text
2020-01-23 20:12:15 -03:00
Sally Cochenour
add2497220
Port of Jimita's shader stuff + my lighting shader
...
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
2019-12-25 14:22:01 -05:00
Jaime Passos
af292bc2c5
Die, Apple!
2019-12-08 22:31:59 -03:00
Jaime Passos
4ccc854a90
Die
2019-12-08 22:12:56 -03:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03: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
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03: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
5e1ebad9d3
sky barreling
2019-09-17 23:38:04 -03:00
Alam Ed Arias
aab58a4613
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00: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
53568ba62f
Better fades
2019-09-09 23:31:48 -03:00
Jaime Passos
6573e94e3a
PRBoom sky dome
2019-09-03 02:12:17 -03:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
47ae715962
Hardware mode y-shearing matches software mode mouselook
2019-05-17 17:49:04 -03:00
Jaime Passos
2a3e885b9a
01052019
2019-05-01 19:37:42 -03:00
Jaime Passos
0ff96207c7
More Softwarification
2019-04-14 19:08:59 -03:00
Jaime Passos
fbc3e27592
stuff
2019-04-06 23:33:34 -03:00