Commit graph

8166 commits

Author SHA1 Message Date
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
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
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
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
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
James R
a5904808d1 Merge branch 'you-cant-escape-console' into 'master'
Open the console in menus and draw backpic correctly

See merge request STJr/SRB2!665
2020-01-12 15:38:51 -05:00
James R
3b79b8534f Merge branch 'escape-console' into 'master'
Let Escape close the console

See merge request STJr/SRB2!664
2020-01-12 15:38:35 -05:00
Louis-Antoine
85ff92cff2 Disable title map when entering a netgame 2020-01-12 20:08:41 +01:00
Louis-Antoine
82876c2eff Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
Louis-Antoine
ad38ba1f39 Fix node numbers being used in place of player numbers 2020-01-12 18:34:08 +01:00
fickleheart
03d95484e2 Limit shadow Y scale to prevent graphical bugs 2020-01-12 09:10:09 -06:00
fickleheart
7aafa300e9 Expose mobj->shadowscale to Lua 2020-01-11 18:28:15 -06:00
fickleheart
d2c6af1167 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
fickleheart
fb30054fcc Use dedicated shadow graphic 2020-01-11 17:56:49 -06:00
fickleheart
d5b0ba7659 Fix player shadows while on rope hangs etc 2020-01-11 17:39:53 -06:00
fickleheart
ad9bec06e6 Merge remote-tracking branch 'upstream/next' into software-dropshadows 2020-01-11 17:09:57 -06:00
Monster Iestyn
7eba91f839 whoops, forgot to do this 2020-01-11 20:24:43 +00:00
Monster Iestyn
9c1b15c986 Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff! 2020-01-11 18:48:47 +00:00
Monster Iestyn
54f1cd601e Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
toaster
862a4cce19 Make Fangboss' player pogo a little less bullshit by having an actually sensible calculation instead of trying to be smart.
The old behaviour was trying way too hard to be smart and as a consequence made the hitbox way too huge.
2020-01-11 17:08:08 +00:00
toaster
3adedd5f8d Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????) 2020-01-11 16:40:42 +00:00
MascaraSnake
331fe7201c Merge branch 'udmf-vslopes' into 'next'
Add textmap vertex slope support

See merge request STJr/SRB2!633
2020-01-11 10:02:51 -05:00
toaster
0a720e70c5 Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place. 2020-01-11 14:41:37 +00:00
Zwip-Zwap Zapony
599d7a5345 Make >5 <10 emblem hints appear "symmetrical"-ish
With more than 5 but less than 10 emblem hints,
only put half of the hints on each side of the hint menu,
instead of putting e.g. 5 on the left and 1 on the right.
2020-01-11 14:59:10 +01:00
Nev3r
aa2184989c Clarify ambiguity regarding mapthing-based vertex slopes. 2020-01-11 08:53:29 +01:00