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
|
1e6444767e
|
Fix mistake in previous commit
|
2020-04-22 23:50:50 +03: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 |
|
Hannu Hanhi
|
0467510b2e
|
Don't crash if shaders are unavailable
|
2020-04-21 23:45:48 +03:00 |
|
Hannu Hanhi
|
e569129b55
|
Newer color tinting shaders ported from SRB2 shader branch
|
2020-04-21 23:15:44 +03:00 |
|
Steel Titanium
|
71f21dd81b
|
Fix compile errors
|
2020-04-13 23:07:38 -04:00 |
|
Hannu Hanhi
|
4d5ff9fbe6
|
Backport from SRB2: Replace NextTexAvail with glGenTextures
|
2020-04-12 06:39:00 -05:00 |
|
Hannu Hanhi
|
6bf90fc441
|
Batching!
|
2020-04-12 03:09:07 +03:00 |
|
fickleheart
|
33a9e5aa83
|
Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
|
2020-03-14 12:52:15 -05:00 |
|
Jaime Passos
|
86dd35c32b
|
Fix NOTEXTURE_NUM
|
2020-02-28 18:57:34 -03:00 |
|
Jaime Passos
|
623974bf88
|
Same deal for screen textures
|
2020-02-28 18:57:15 -03:00 |
|
Jaime Passos
|
0b63c2a3cc
|
Stop using NextTexAvail
|
2020-02-28 18:56:41 -03:00 |
|
Steel Titanium
|
fc042e90f0
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
d31bfb5363
|
so is the accumulation buffer (deprecated)
|
2020-01-28 00:33:45 -03:00 |
|
Jaime Passos
|
43ecd55863
|
glFog is unused
|
2020-01-28 00:26:09 -03:00 |
|
Jaime Passos
|
64f1f2a7f8
|
load_shaders -> Shader_Load + Shader_SetUniforms
|
2020-01-28 00:20:10 -03:00 |
|
Jaime Passos
|
85f016e4d8
|
port pfnUpdateTexture
|
2020-01-28 00:16:38 -03:00 |
|
Jaime Passos
|
c80d7a2430
|
Fix NOTEXTURE_NUM
|
2020-01-25 22:20:27 -03:00 |
|
Jaime Passos
|
6df32ce34d
|
make up for the lack of ogllog.txt
|
2020-01-25 22:17:39 -03:00 |
|
Jaime Passos
|
ec5da2966b
|
I'll put this back in here, I guess.
|
2020-01-25 21:57:05 -03:00 |
|
Jaime Passos
|
f6b9b14c21
|
Same deal for screen textures
|
2020-01-25 21:46:52 -03:00 |
|
Jaime Passos
|
3efd1f3f6d
|
Stop using NextTexAvail you dunce
|
2020-01-25 21:37:33 -03:00 |
|
Jaime Passos
|
5228b0b9fe
|
make NOTEXTURE_NUM 1
|
2020-01-25 21:22:24 -03:00 |
|
Jaime Passos
|
8345d7b99c
|
remove includes
|
2020-01-25 21:21:44 -03:00 |
|
Jaime Passos
|
e8b942a3b8
|
GL_DBG_Printf instead of CONS_Alert
|
2020-01-24 17:04:38 -03:00 |
|
Jaime Passos
|
5a0119ee59
|
I_Error is too extreme I think, just CONS_Alert instead
|
2020-01-24 17:03:00 -03:00 |
|
Jaime Passos
|
6f2635d4c1
|
bye
|
2020-01-23 23:09:53 -03:00 |
|
Jaime Passos
|
9b927e7600
|
Fix warnings around load_shaders
|
2020-01-23 22:30:36 -03:00 |
|
Jaime Passos
|
40d9b7f34b
|
Wait.
|
2020-01-23 22:24:35 -03:00 |
|
James R
|
70bcf59bd6
|
Fix implicit operand because GLSL is a goof or such
|
2020-01-23 17:22:02 -08:00 |
|
Jaime Passos
|
33152ee6fa
|
Restore some model lighting code that went gone in the shaders code
|
2020-01-23 22:02:18 -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
|
a37a028e81
|
Delete USE_PALETTED_TEXTURE again
|
2020-01-23 20:21:13 -03:00 |
|
Jaime Passos
|
2d4945d558
|
Update copyright text
|
2020-01-23 20:12:15 -03:00 |
|
Jaime Passos
|
4a8340cd4a
|
Fix view aiming / shearing
|
2020-01-23 19:44:46 -03:00 |
|
Sally Cochenour
|
394aab737d
|
input is reserved apparently
|
2020-01-18 09:25:09 -05:00 |
|
fickleheart
|
a48b36f387
|
OGL can have little a viewroll
|
2020-01-17 19:01:45 -06:00 |
|
Sally Cochenour
|
f0617ce4b8
|
Merge branch 'gl-dropshadows' into oglshaderport
|
2020-01-16 14:55:55 -05:00 |
|
Monster Iestyn
|
54f1cd601e
|
Merge branch 'master' into next
|
2020-01-11 18:38:09 +00:00 |
|
Sally Cochenour
|
889bb09e6c
|
Merge branch 'namirays' into oglshaderport
|
2020-01-11 09:32:59 -05:00 |
|
James R
|
4652e87948
|
Merge branch 'software-fov' into 'master'
Software FOV
See merge request STJr/SRB2!662
|
2020-01-10 00:33:24 -05:00 |
|
James R
|
f97afe47fa
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-08 13:27:14 -08:00 |
|
Sally Cochenour
|
be3bf3acd1
|
Water surface shader
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
|
2020-01-08 03:37:46 -05:00 |
|
Sally Cochenour
|
a0fa7d3b67
|
Basic fog shader
HWR_FogBlockAlpha is still very inaccurate, which gives different results than Software even with the shader, but it's a start
|
2020-01-07 20:55:36 -05:00 |
|
Jaime Passos
|
e9e82b5ea0
|
Fix GetTextureUsed
|
2020-01-05 18:10:33 -03:00 |
|
fickleheart
|
1419ec72d5
|
Software FOV ported from kart
also fixes high software FOVs having buggy walls
|
2019-12-31 11:22:05 -06:00 |
|
Sally Cochenour
|
31304eda3e
|
Merge branch 'next' into oglshaderport
|
2019-12-28 13:58:41 -05: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 |
|