MascaraSnake
|
383eccd630
|
Merge branch 'master' into next
|
2020-01-24 22:37:25 +01:00 |
|
SteelT
|
003f3769df
|
Merge pull request #447 from ConfusionAlphaX/local-resynch-fix
Fix title screen broken when leaving during resynch
|
2020-01-21 19:09:15 -05:00 |
|
James R
|
3fb54559ed
|
Merge branch 'gl-dropshadows' into 'next'
OpenGL drop shadows
See merge request STJr/SRB2!703
|
2020-01-20 16:52:40 -05:00 |
|
Confusion
|
db4cc87be7
|
Fix title screen broken when leaving during resynch
|
2020-01-19 17:55:22 +03:00 |
|
James R
|
06f75ca73a
|
Merge branch 'add-exitmove-to-menu' into 'next'
Put cv_exitmove in the server options menu
See merge request STJr/SRB2!704
|
2020-01-19 02:18:49 -05:00 |
|
Tatsuru
|
a4215645f7
|
Goal posts
|
2020-01-18 13:15:24 -03:00 |
|
LJ Sonic
|
9f1b3ca753
|
Merge branch 'mapthingflagextradehackedconstant' into 'next'
Mapthing flag EXTRA DeHackEd constant
See merge request STJr/SRB2!705
|
2020-01-18 10:31:29 -05:00 |
|
Jaime Passos
|
24f8f69218
|
Fix missing constant
|
2020-01-18 12:10:48 -03:00 |
|
Tatsuru
|
d70a76bacd
|
Put cv_exitmove in the menus
|
2020-01-18 12:06:04 -03:00 |
|
James R
|
8de506ee1c
|
Merge branch 'intangable' into 'next'
Add FF_INTANGABLEFLATS as an alternative spelling for FF_INTANGIBLEFLATS
See merge request STJr/SRB2!702
|
2020-01-18 00:49:08 -05:00 |
|
Sally Cochenour
|
664fb9cf6e
|
Use shadow cvar
|
2020-01-17 22:20:04 -05:00 |
|
Sally Cochenour
|
60795e5a2f
|
Merge branch 'next' into gl-dropshadows
|
2020-01-17 22:19:51 -05:00 |
|
James R
|
a9cd4a1c10
|
Merge branch 'software-dropshadows' into 'next'
Software dropshadows
See merge request STJr/SRB2!660
|
2020-01-17 18:56:13 -05:00 |
|
James R
|
fa74e75648
|
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
|
1da214088b
|
backwards compat
|
2020-01-17 16:11:17 -03:00 |
|
Alam Ed Arias
|
43a78e6821
|
Merge branch 'master' into next
|
2020-01-17 11:12:10 -05:00 |
|
Alam Ed Arias
|
b836b911a7
|
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
|
9ef2cfcffd
|
Merge branch 'intangable' into 'next'
Fix FF_INTANGABLEFLATS typo
See merge request STJr/SRB2!701
|
2020-01-17 03:13:45 -05:00 |
|
fickleheart
|
a69be1f388
|
DOUBLE DAMNIT
|
2020-01-17 00:34:57 -06:00 |
|
fickleheart
|
bc7a271901
|
Let nerds turn off shadows
|
2020-01-17 00:20:10 -06:00 |
|
fickleheart
|
ffbf72bdb6
|
Give me a break
|
2020-01-17 00:18:00 -06:00 |
|
fickleheart
|
3f570ab888
|
Bosses need dropshadows too
|
2020-01-17 00:16:15 -06:00 |
|
fickleheart
|
fa245e90ae
|
DAMNIT
|
2020-01-17 00:13:13 -06:00 |
|
fickleheart
|
4e97b1825b
|
Let vissprites have shadows too
fuck it, hopefully it works
|
2020-01-17 00:13:05 -06:00 |
|
Jaime Passos
|
1a48e6131f
|
add R_IsPointInSubsector to lua baselib
|
2020-01-17 00:49:43 -03:00 |
|
Jaime Passos
|
7ec8c607ce
|
typoe
|
2020-01-17 00:34:31 -03:00 |
|
James R
|
6793b03827
|
Dumbass NONET stuff...
|
2020-01-16 18:07:28 -08:00 |
|
James R
|
350773fcf3
|
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
|
ef92934661
|
Merge branch 'larger-chat' into 'master'
Larger chat
See merge request STJr/SRB2!691
|
2020-01-16 20:33:09 -05:00 |
|
James R
|
f3b670fa20
|
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
|
d309bb597b
|
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
|
54c778b18c
|
Merge branch 'master' into next
|
2020-01-16 20:18:54 -05:00 |
|
Alam Ed Arias
|
2ce99b7914
|
Merge remote-tracking branch 'origin/next' into next
|
2020-01-16 20:17:58 -05:00 |
|
Alam Ed Arias
|
885273d103
|
Merge remote-tracking branch 'origin/master'
|
2020-01-16 20:17:05 -05:00 |
|
James R
|
ab86ef936a
|
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
|
1de00bc6bb
|
Merge branch 'word' into 'master'
Word jumping
See merge request STJr/SRB2!653
|
2020-01-16 20:05:12 -05:00 |
|
James R
|
1dbe22c6fa
|
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
|
e831a61df5
|
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
|
c87299cd05
|
Also check ALTTITLE
|
2020-01-16 16:46:31 -08:00 |
|
James R
|
b603266086
|
Bah it's a new year!
|
2020-01-16 16:45:52 -08:00 |
|
James R
|
2edd207624
|
Merge branch 'musicdef' into 'next'
MUSICDEF parser changes.
See merge request STJr/SRB2!599
|
2020-01-16 19:35:38 -05:00 |
|
James R
|
619a4d7978
|
musicdef-2.2.1 for converting 2.2.0 MUSICDEF to new format
|
2020-01-16 16:36:10 -08:00 |
|
Steel Titanium
|
4622e51918
|
Revert "Move to the end of the list"
This reverts commit 9257ef4844.
|
2020-01-16 19:20:05 -05:00 |
|
Steel Titanium
|
9257ef4844
|
Move to the end of the list
|
2020-01-16 18:59:39 -05:00 |
|
Steel Titanium
|
4ed4fdc5b2
|
Restore this that got removed shomehow
|
2020-01-16 14:31:36 -05:00 |
|
Steel Titanium
|
b6c9474517
|
Add missing name to the credits
|
2020-01-16 14:28:47 -05:00 |
|
Sally Cochenour
|
6ddb5437a4
|
OpenGL shadows
|
2020-01-16 12:37:32 -05:00 |
|
Alam Ed Arias
|
282abfd4ac
|
Merge branch 'master' into next
|
2020-01-16 12:08:36 -05:00 |
|
Alam Ed Arias
|
45139da3b5
|
please stop breaking clang
|
2020-01-16 12:05:21 -05:00 |
|
Sally Cochenour
|
06ca9c30c2
|
Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows
|
2020-01-16 09:38:12 -05:00 |
|