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
lachwright
9a41bca7d7
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
Sally Cochenour
06ca9c30c2
Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows
2020-01-16 09:38:12 -05:00
James R
362c74ea65
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
f40e962816
Expose viewmobj as r_viewmobj
2020-01-16 03:09:02 -08: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
James R
b3afa91673
Remove adminplayer from SERVERINFO (PACKETVERSION 2)
2020-01-12 20:21:35 -08:00
James R
2c9ea284a7
Kill Lua adminplayer
2020-01-12 20:04:05 -08:00
James R
f344739294
Merge branch 'fangpogo' into 'next'
...
Make Fangboss' player pogo a little less bullshit.
See merge request STJr/SRB2!676
2020-01-12 17:54:02 -05:00
James R
7daf24fcb8
Merge remote-tracking branch 'origin/master' into next
2020-01-12 14:17:52 -08:00
James R
97ca460531
Merge branch 'split-emblem-hints' into 'next'
...
"Symmetrical"-ish Emblem Hint pages
See merge request STJr/SRB2!670
2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony
eb58de0980
Fix "symmetrical"-ish emblem hints for ERRORMODE
...
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
2020-01-12 23:09:27 +01:00
LJ Sonic
fd18f1cb7f
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
James R
81021ad254
Merge branch 'egg2pogo' into 'next'
...
Egg Slimer Pogo Bruh Moment (resolves #112 )
See merge request STJr/SRB2!674
2020-01-12 15:43:24 -05:00
James R
5e9a1003b6
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
LJ Sonic
2023d9bed1
Merge branch 'refactor-kicks' into 'fix-node-player-mixups'
...
Replace all instances of XD_KICK with a SendKick function
See merge request STJr/SRB2!682
2020-01-12 15:41:18 -05:00
LJ Sonic
e9002a15c4
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node numbers being used in place of player numbers
See merge request STJr/SRB2!681
2020-01-12 15:40:25 -05:00