Commit graph

9305 commits

Author SHA1 Message Date
Jaime Passos
aea720ef65 Merge branch 'sal-oglshaderport' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 2020-01-25 22:22:20 -03:00
Jaime Passos
9e79b337b1 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos
e576c1ada1 make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
Jaime Passos
8bcdd105ce I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos
647107a220 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos
c219a170da Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos
b9b1958886 make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos
8401e09787 remove includes 2020-01-25 21:21:44 -03:00
Steel Titanium
2731c9e92d Add newlines to GL debug print. 2020-01-24 15:44:57 -05:00
Jaime Passos
bdc1594b07 Redundant define? 2020-01-24 17:05:40 -03:00
Jaime Passos
075ae996fa GL_DBG_Printf instead of CONS_Alert 2020-01-24 17:04:38 -03:00
Jaime Passos
1c7b584dee I_Error is too extreme I think, just CONS_Alert instead 2020-01-24 17:03:00 -03:00
Jaime Passos
7c4c04ca6a Fix custom shader loading 2020-01-24 16:57:21 -03:00
Jaime Passos
b18c0cfcab Un-HWRENDER shader lump names 2020-01-24 16:42:55 -03:00
Jaime Passos
0246026ade I don't know why this happened 2020-01-24 00:35:51 -03:00
Jaime Passos
686d8e418e st_translucency went missing in here for... reasons... 2020-01-23 23:52:11 -03:00
Jaime Passos
afa9b58cee fix corona compiling lol 2020-01-23 23:41:09 -03:00
Jaime Passos
922ac73594 Menu organisation 2020-01-23 23:15:27 -03:00
Jaime Passos
a521e40c0e bye 2020-01-23 23:09:53 -03:00
Jaime Passos
d019080327 I LOVE MENU CODE! 2020-01-23 22:38:54 -03:00
Jaime Passos
11c3721db4 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Jaime Passos
d24060bb94 Wait. 2020-01-23 22:24:35 -03:00
James R
968fea0383 Fix implicit operand because GLSL is a goof or such 2020-01-23 17:22:02 -08:00
Jaime Passos
770135451f Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos
1755c240bf Fix the gl_leveltime problem, I guess.
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos
544d6acc51 Delete USE_PALETTED_TEXTURE again 2020-01-23 20:21:13 -03:00
Jaime Passos
1601f0c66f Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos
014638ead7 Fix view aiming / shearing 2020-01-23 19:44:46 -03:00
Jaime Passos
7266e0876a towards 2020-01-23 19:17:05 -03:00
Sally Cochenour
7e333c6331 input is reserved apparently 2020-01-18 09:25:09 -05:00
Sally Cochenour
a12d6885a3 Merge branch 'gl-dropshadows' into oglshaderport 2020-01-17 22:29:31 -05:00
Sally Cochenour
43828f265c Use shadow cvar 2020-01-17 22:20:04 -05:00
Sally Cochenour
ba51f83aaf Merge branch 'next' into gl-dropshadows 2020-01-17 22:19:51 -05:00
James R
9a1cb0e30e Merge branch 'software-dropshadows' into 'next'
Software dropshadows

See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
James R
96c91ce716 Merge branch 'r_ispointinsubsector' into 'next'
Add R_IsPointInSubsector to lua baselib

See merge request STJr/SRB2!700
2020-01-17 18:24:04 -05:00
Alam Ed Arias
b09341383f Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
Alam Ed Arias
b38921ff53 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
Fuck NONET

See merge request STJr/SRB2!699
2020-01-17 11:11:02 -05:00
MascaraSnake
14c8fdd3aa Merge branch 'intangable' into 'next'
Fix FF_INTANGABLEFLATS typo

See merge request STJr/SRB2!701
2020-01-17 03:13:45 -05:00
fickleheart
f59ed6b2f4 DOUBLE DAMNIT 2020-01-17 00:34:57 -06:00
fickleheart
d39d8506ca Let nerds turn off shadows 2020-01-17 00:20:10 -06:00
fickleheart
919661ff8f Give me a break 2020-01-17 00:18:00 -06:00
fickleheart
4ca44f2d57 Bosses need dropshadows too 2020-01-17 00:16:15 -06:00
fickleheart
9a4ad20947 DAMNIT 2020-01-17 00:13:13 -06:00
fickleheart
f0843cba13 Let vissprites have shadows too
fuck it, hopefully it works
2020-01-17 00:13:05 -06:00
Jaime Passos
8bfdb52231 add R_IsPointInSubsector to lua baselib 2020-01-17 00:49:43 -03:00
Jaime Passos
7adc108a2a typoe 2020-01-17 00:34:31 -03:00
James R
e4f0fa46f5 Dumbass NONET stuff... 2020-01-16 18:07:28 -08:00
James R
b6f68be52c Merge branch 'credits-woopises' into 'next'
Add missing name to the credits

See merge request STJr/SRB2!696
2020-01-16 20:33:35 -05:00
James R
098e41e518 Merge branch 'larger-chat' into 'master'
Larger chat

See merge request STJr/SRB2!691
2020-01-16 20:33:09 -05:00
James R
d4e0bfe87f Merge branch 'snac-bruh' into 'master'
Try to set a 21 character name and SIGABRT

See merge request STJr/SRB2!689
2020-01-16 20:32:58 -05:00