James R
98fb3fca57
Only exit if base files fail to load
2020-01-11 15:40:18 -08: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
d0a3447f5c
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
MascaraSnake
4e3dcc70c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_slopes.c
2020-01-11 16:16:57 +01:00
MascaraSnake
ebe467a664
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01: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
MascaraSnake
23da73f5df
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
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
MascaraSnake
897f6ee067
Adapt setup of linedef type 443 (Call Lua function) to UDMF
2020-01-11 15:38:50 +01: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
James R
cee3612dea
Let Escape close the console
2020-01-09 22:16:46 -08:00
James R
4652e87948
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R
7bb1d0a662
Merge branch 'orbital-disappearing' into 'master'
...
Don't clip player MD2 when looking straight down with the orbital camera
See merge request STJr/SRB2!658
2020-01-10 00:33:14 -05:00
James R
f1712f2cd8
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
Alam Ed Arias
f267f7bb3e
whitespace cleanup
2020-01-09 16:19:12 -05:00
James R
2317cb4c04
Merge branch 'public_hexang' into 'next'
...
Hexafaceted sprite angle support.
See merge request STJr/SRB2!652
2020-01-09 16:14:49 -05:00
MascaraSnake
9c70ee2690
Merge branch 'fakeplanes-colormap' into 'next'
...
Don't create colormap data out of sidedef text for fake planes linedef
See merge request STJr/SRB2!648
2020-01-09 15:04:33 -05:00
Tatsuru
2fda026608
*bends over seductively to pick up whitespace*
2020-01-09 16:16:24 -03:00
Tatsuru
8d5153a595
This is stupid
2020-01-09 12:15:26 -03:00
Sally Cochenour
d6e15bd2cd
Remove smooth setting
...
It got denied before for Software so I won't include it in the merge request :(
2020-01-09 01:28:14 -05:00
fickleheart
a21d664cd2
Fix shadows under hiresscale characters
2020-01-08 23:33:43 -06:00
fickleheart
52890deb59
Refactor shadow scale into an argument
2020-01-08 23:24:31 -06:00
fickleheart
9df5d1d0e3
Refactor shadow floor finding code a bit
...
I tried to fix ring shadows on polyobjects and got this in return:
https://media.discordapp.net/attachments/629477786943356938/664695818913185822/srb20156.png
2020-01-08 23:19:52 -06:00
James R
adf76f6e78
Don't clip player MD2 either!
2020-01-08 20:52:34 -08:00
