Tatsuru
d70a76bacd
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03: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
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
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
James R
77501f8d52
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
522ef41b98
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
c27b9ca3a8
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
fc01862eeb
bruh
2020-01-15 15:57:38 +01:00
Louis-Antoine
6d703add73
Cleanup chat code a little
2020-01-15 15:48:03 +01:00
Louis-Antoine
7459a6b4a8
Increase maximum and default chat width
2020-01-15 15:36:11 +01:00
James R
ce4e6aa36b
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
James R
73852fc767
Update buffer for SendNameAndColor
2020-01-14 21:40:58 -08:00
James R
3ed8003a04
And free addrinfo
...
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
2020-01-14 19:33:52 -08:00
James R
e9f9c39124
Let MS_Connect use -bindaddr
...
And so now you really can host from multiple IP addresses.
(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
2020-01-14 19:33:52 -08:00
James R
f6def02b49
Load flats first so textures with the same name are prefered on walls
2020-01-13 15:21:35 -08:00
James R
3842b04bdc
Refactor R_LoadTextures into something manageable (no goto!!)
2020-01-13 15:20:50 -08:00
James R
0abc6be3a5
Merge branch '@moderator' into 'next'
...
Kill adminplayer for good
See merge request STJr/SRB2!686
2020-01-13 16:47:49 -05:00
James R
ca723c84f4
Merge branch 'disable-titlemap-in-netgames' into 'master'
...
Disable title map when entering a netgame
See merge request STJr/SRB2!683
2020-01-13 16:47:17 -05:00
