Commit Graph

9285 Commits

Author SHA1 Message Date
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
James R d7b6a3dd61 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master'
-bindaddr for mserv

See merge request STJr/SRB2!688
2020-01-16 20:32:49 -05:00
Alam Ed Arias b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
Alam Ed Arias d9742afb45 Merge remote-tracking branch 'origin/next' into next 2020-01-16 20:17:58 -05:00
Alam Ed Arias daab7a0d21 Merge remote-tracking branch 'origin/master' 2020-01-16 20:17:05 -05:00
James R f93ddc3f37 Merge branch 'keywords-back-again' into 'next'
Level header keywords

See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
James R f8666d6cee Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
James R 601d4aec34 Merge branch 'FALLTHRU' into 'next'
FALLTHRU versus fallthru, which will win?

See merge request STJr/SRB2!692
2020-01-16 19:59:00 -05:00
James R 1be648578f Merge branch 'clear-sign-sprite' into 'next'
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
James R 51f1f4f2b1 Also check ALTTITLE 2020-01-16 16:46:31 -08:00
James R 90c9a467f3 Bah it's a new year! 2020-01-16 16:45:52 -08:00
James R 1f36bde25f Merge branch 'musicdef' into 'next'
MUSICDEF parser changes.

See merge request STJr/SRB2!599
2020-01-16 19:35:38 -05:00
James R f9dd5056c6 musicdef-2.2.1 for converting 2.2.0 MUSICDEF to new format 2020-01-16 16:36:10 -08:00
Steel Titanium 54ec64062c Revert "Move to the end of the list"
This reverts commit 32c65ae844.
2020-01-16 19:20:05 -05:00
Steel Titanium 32c65ae844 Move to the end of the list 2020-01-16 18:59:39 -05:00
Sally Cochenour 56f96674b0 Slope contrast
Off by default
2020-01-16 16:45:49 -05:00
Sally Cochenour ef81bf810b ??
did not commit??
2020-01-16 14:56:11 -05:00
Sally Cochenour e5215e929c Merge branch 'gl-dropshadows' into oglshaderport 2020-01-16 14:55:55 -05:00
Steel Titanium 4c6edd87df Restore this that got removed shomehow 2020-01-16 14:31:36 -05:00
Steel Titanium 36511afda9 Add missing name to the credits 2020-01-16 14:28:47 -05:00
Sally Cochenour 4e481340ce OpenGL shadows 2020-01-16 12:37:32 -05:00