5d6d6a7d4d
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
f6244ec9a4
Disable title map when entering a netgame
2020-01-12 20:08:41 +01:00
e9108de365
Replace all instances of XD_KICK with a SendKick function
2020-01-12 19:43:04 +01:00
5b34923352
Fix node numbers being used in place of player numbers
2020-01-12 18:34:08 +01:00
8a6173a3f2
Declare checkbase for both sides of the if statement
2020-01-12 09:11:57 -06:00
9e101fc2bb
Limit shadow Y scale to prevent graphical bugs
2020-01-12 09:10:09 -06:00
cc9bae8b57
Merge branch 'stringargs' into 'udmf-next'
...
Add string-based linedef arguments to UDMF
See merge request STJr/SRB2!672
2020-01-12 08:31:11 -05:00
e60ba92a92
Checkpoint players at star post exact location with Ambush flag
2020-01-11 22:30:07 -06:00
1e2a4c2cce
Allow starpost Parameter to dictate order
2020-01-11 22:26:20 -06:00
cfb9b3c234
Expose mobj->shadowscale to Lua
2020-01-11 18:28:15 -06:00
ba8ff3d502
Add mobj shadowscale property
2020-01-11 18:24:08 -06:00
1b0a3d0fe3
Use dedicated shadow graphic
2020-01-11 17:56:49 -06:00
bf8a39f7ee
Only exit if base files fail to load
2020-01-11 15:40:18 -08:00
4e5f49c60d
Fix player shadows while on rope hangs etc
2020-01-11 17:39:53 -06:00
27bd7e4a7f
Merge remote-tracking branch 'upstream/next' into software-dropshadows
2020-01-11 17:09:57 -06:00
1643e6623d
whoops, forgot to do this
2020-01-11 20:24:43 +00:00
9c8988ab57
Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff!
2020-01-11 18:48:47 +00:00
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
a5ad02eab9
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
e938f16fef
Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????)
2020-01-11 16:40:42 +00:00
b163316cbf
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
4745264a42
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_slopes.c
2020-01-11 16:16:57 +01:00
bac379a7a3
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00
661c44b260
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
63adb235e7
Merge branch 'linedef-args' into 'udmf-next'
...
Add UDMF linedef arguments and make slope specials use them
See merge request STJr/SRB2!643
2020-01-11 10:00:07 -05:00
926cbc4141
Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place.
2020-01-11 14:41:37 +00:00
f0d663ea90
Adapt setup of linedef type 443 (Call Lua function) to UDMF
2020-01-11 15:38:50 +01:00
e6ddfc7cdf
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
afcaa94cd0
Clarify ambiguity regarding mapthing-based vertex slopes.
2020-01-11 08:53:29 +01:00
fef72c6009
Merge branch 'unsigned-bruh' into 'next'
...
Fix incorrect cast
See merge request STJr/SRB2!669
2020-01-11 02:26:52 -05:00
2046f524c7
Fix incorrect cast
2020-01-10 23:32:31 +01:00
0345a32c37
Merge branch 'brickblockbustin' into 'next'
...
Brick Block Bustin
See merge request STJr/SRB2!666
2020-01-10 16:02:59 -05:00
e1303a2b5c
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
dc151fc7a4
Merge branch 'accurate-papersprites' into 'master'
...
Accurate papersprite projection
See merge request STJr/SRB2!657
2020-01-10 16:02:23 -05:00
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
2491046bc2
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
a16c444166
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
134d1831e3
Menu option for 1upsound
2020-01-10 12:55:22 -08:00
1113a13621
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
e532efa5d0
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
023624ebb7
Merge branch 'minor-ogl-improvements' into 'next'
...
Minor OpenGL improvements
See merge request STJr/SRB2!661
2020-01-10 13:32:37 -05:00
f691b2255b
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
cbbc76b673
Fix snapping of extra multiplayer text. ( Resolves #101 )
2020-01-10 12:50:58 +00:00
80b801e91e
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
2459ca255f
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
ef3d462eb7
Let the console open in menus
2020-01-09 22:42:00 -08:00
48dd6b0580
Show Sonic's ass if con_backpic. No wait, I mean crop the backpic...
2020-01-09 22:39:01 -08:00
3179797331
Let Escape close the console
2020-01-09 22:16:46 -08:00
5c60f8b529
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R