Commit graph

1617 commits

Author SHA1 Message Date
Jaime Passos
043057532c Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
James R
d6251a763b Merge branch 'viewroll' into 'next'
Rolling

See merge request STJr/SRB2!690
2020-02-17 00:10:57 -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
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
MascaraSnake
4c4596a45f Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01: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
MascaraSnake
f4a7a5db11 Some fixes for the linedef alpha field 2020-02-10 20:26:29 +01: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
Jaime Passos
830583d973 why does this still exist? 2020-02-08 18:19:27 -03:00
Jaime Passos
622bf09908 i'm not paying too much attention, am i. 2020-02-08 18:08:56 -03:00
Jaime Passos
fa5957f785 add "third person only" option to gr_shearing. 2020-02-08 17:42:26 -03:00
Jaime Passos
402b63ed77 Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport 2020-02-03 01:17:26 -03:00
Sally Cochenour
a063ffed2e Remove blend to black 2020-02-02 07:28:31 -05:00
Sally Cochenour
6b6c4ec517 Drop shadows closer to software 2020-02-02 07:28:31 -05:00
Sally Cochenour
8ee1cc9209 FIX COLOR BUG 2020-02-02 07:28:31 -05:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
Jaime Passos
e5ca7039cf no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03: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
6f60fd2a64 Fix shader reading yet again 2020-01-27 02:15:34 -03:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
MascaraSnake
e22661e150 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01: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
36fcd35108 Redundant define? 2020-01-24 17:05:40 -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
3d97a0b73d Fix custom shader loading 2020-01-24 16:57:21 -03:00
Jaime Passos
17f4ba7219 st_translucency went missing in here for... reasons... 2020-01-23 23:52:11 -03:00
Jaime Passos
6b709386cf fix corona compiling lol 2020-01-23 23:41:09 -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