Commit graph

9249 commits

Author SHA1 Message Date
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
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
James R
013d4858e2 Merge branch 'unsigned-bruh' into 'next'
Fix incorrect cast

See merge request STJr/SRB2!669
2020-01-11 02:26:52 -05:00
MascaraSnake
07ec05a44b Fix incorrect cast 2020-01-10 23:32:31 +01:00
James R
3a7ee3e5b9 Merge branch 'brickblockbustin' into 'next'
Brick Block Bustin

See merge request STJr/SRB2!666
2020-01-10 16:02:59 -05:00
James R
47af4f51ee Merge branch 'orbital-flickering' into 'master'
Don't give player translucency when looking down with the orbital camera

See merge request STJr/SRB2!659
2020-01-10 16:02:44 -05:00
James R
a77acb349a Merge branch 'accurate-papersprites' into 'master'
Accurate papersprite projection

See merge request STJr/SRB2!657
2020-01-10 16:02:23 -05:00
James R
3225affa98 Merge branch 'showconditionset' into 'next'
Showconditionset

See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
James R
fc82e03600 Merge branch 'morehints' into 'next'
Allow for 10 emblem hints on a map by poking the drawer a bit.

See merge request STJr/SRB2!650
2020-01-10 15:59:22 -05:00
James R
5d281ebfd3 Merge branch 'playerthink-hook' into 'next'
PlayerThink Hook

See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
James R
3868ca6cfb Menu option for 1upsound 2020-01-10 12:55:22 -08:00
James R
f2445b27b5 1upsound always plays a sound instead of jingle 2020-01-10 12:55:03 -08:00
MascaraSnake
fac733331d Some minor cleanup 2020-01-10 19:56:29 +01:00
MascaraSnake
c5a7f6d6cb Merge branch 'stars-fix' into 'next'
Add MT_FLINGNIGHTSSTAR mobj type

See merge request STJr/SRB2!663
2020-01-10 13:34:43 -05:00
MascaraSnake
595537267a Merge branch 'minor-ogl-improvements' into 'next'
Minor OpenGL improvements

See merge request STJr/SRB2!661
2020-01-10 13:32:37 -05:00
MascaraSnake
000dbb2336 Merge branch 'extratextoffs' into 'next'
Fix snapping of extra multiplayer text. (Resolves #101)

See merge request STJr/SRB2!667
2020-01-10 13:31:57 -05:00
toaster
8926b8b324 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
toaster
1adceb858c Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually. 2020-01-10 11:43:41 +00:00
James R
e76c98b2b7 Factor z distance into camera translucency 2020-01-10 00:04:17 -08:00
James R
3a9cc8db92 Let the console open in menus 2020-01-09 22:42:00 -08:00
James R
ed6a78fe05 Show Sonic's ass if con_backpic. No wait, I mean crop the backpic... 2020-01-09 22:39:01 -08:00