fickleheart
d63aa1031e
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-17 18:27:15 -06: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
Jaime Passos
999094f2f6
backwards compat
2020-01-17 16:11:17 -03: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
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
Alam Ed Arias
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
Alam Ed Arias
0134be8b78
please stop breaking clang
2020-01-16 12:05:21 -05:00
lachwright
28c466a0a5
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
Sally Cochenour
28cd5b2f03
Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows
2020-01-16 09:38:12 -05:00
James R
542e38e717
Don't draw player mobj in first person
...
This solves that annoying albeit slightly amusing bug
where your sprite clips into your view during a quake.
For OpenGL, this also solves the player's model
rendering while in first person. So you'll no
longer be looking through Sonic's body!
2020-01-16 03:18:05 -08:00
James R
bbbe76d2ca
Expose viewmobj as r_viewmobj
2020-01-16 03:09:02 -08:00
James R
36b9549b23
Merge branch 'locale-liberation' into 'master'
...
Locale liberation
Closes #113
See merge request STJr/SRB2!677
2020-01-15 23:38:40 -05:00
James R
55cc978f40
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
James R
06105f6d8f
Merge branch 'flats-in-walls-fix' into 'master'
...
Prefer textures on walls, not flats
See merge request STJr/SRB2!687
2020-01-15 23:37:41 -05:00
Louis-Antoine
0197a83db7
bruh
2020-01-15 15:57:38 +01:00
Louis-Antoine
ec5db89e55
Cleanup chat code a little
2020-01-15 15:48:03 +01:00
Louis-Antoine
9504ba96da
Increase maximum and default chat width
2020-01-15 15:36:11 +01:00
James R
1489b4bcdd
It's FALLTHRU not fallthru
...
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
2020-01-15 02:14:20 -08:00
fickleheart
e23f632cdb
Clean up fisheye and fix crashes
2020-01-14 23:44:21 -06:00
