Sally Cochenour
5fac6f542e
Merge branch 'namirays' into oglshaderport
2020-01-11 09:32:59 -05:00
Sally Cochenour
23bd91fcd5
Merge remote-tracking branch 'nami/next' into namirays
2020-01-11 09:30:11 -05:00
Zwip-Zwap Zapony
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
Nev3r
afcaa94cd0
Clarify ambiguity regarding mapthing-based vertex slopes.
2020-01-11 08:53:29 +01:00
James R
fef72c6009
Merge branch 'unsigned-bruh' into 'next'
...
Fix incorrect cast
See merge request STJr/SRB2!669
2020-01-11 02:26:52 -05:00
Nami
943ede737a
Merge remote-tracking branch 'upstream/next' into lua-railstuff
...
# Conflicts:
# src/p_map.c
2020-01-10 19:11:17 -08:00
MascaraSnake
2046f524c7
Fix incorrect cast
2020-01-10 23:32:31 +01:00
James R
0345a32c37
Merge branch 'brickblockbustin' into 'next'
...
Brick Block Bustin
See merge request STJr/SRB2!666
2020-01-10 16:02:59 -05:00
James R
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
James R
dc151fc7a4
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
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
James R
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
James R
a16c444166
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
James R
134d1831e3
Menu option for 1upsound
2020-01-10 12:55:22 -08:00
James R
1113a13621
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
MascaraSnake
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
toaster
cbbc76b673
Fix snapping of extra multiplayer text. ( Resolves #101 )
2020-01-10 12:50:58 +00:00
toaster
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
James R
2459ca255f
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
James R
ef3d462eb7
Let the console open in menus
2020-01-09 22:42:00 -08:00
James R
48dd6b0580
Show Sonic's ass if con_backpic. No wait, I mean crop the backpic...
2020-01-09 22:39:01 -08:00
James R
3179797331
Let Escape close the console
2020-01-09 22:16:46 -08:00
James R
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
feb0fc2ee9
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
ced5ca81a4
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
71c2ee3850
whitespace cleanup
2020-01-09 16:19:12 -05:00
James R
57a31077e7
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
682e683a71
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
10e9dd2c23
*bends over seductively to pick up whitespace*
2020-01-09 16:16:24 -03:00
Tatsuru
3e3cb48feb
This is stupid
2020-01-09 12:15:26 -03:00
Sally Cochenour
487e1b02f1
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
7d2402ac62
Fix shadows under hiresscale characters
2020-01-08 23:33:43 -06:00
fickleheart
9e8d20504e
Refactor shadow scale into an argument
2020-01-08 23:24:31 -06:00
fickleheart
fa4b49d52c
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
66cf1be0d8
Don't clip player MD2 either!
2020-01-08 20:52:34 -08:00
James R
0f8c736188
Don't make player transparent if the orbital camera is looking straight down
2020-01-08 20:49:38 -08:00
fickleheart
a7edf51cb9
Stop misusing papersprite vars for sprite skew
2020-01-08 21:52:10 -06:00
fickleheart
ef4974ab4d
Apply portal clipping to drop shadows too
2020-01-08 21:37:44 -06:00
fickleheart
8757194d73
Make ring shadows smaller and fix scale bug
2020-01-08 21:37:43 -06:00
fickleheart
c078ab630d
Fix more shadow crashes and save my sanity
2020-01-08 21:37:41 -06:00
fickleheart
9c49e020c3
FUCK IT, SLOPED SHADOWS NOW
2020-01-08 21:37:40 -06:00
fickleheart
5929b4797e
This acursed crash-inducing typo spat in my face and called me a bitch
2020-01-08 21:37:39 -06:00
fickleheart
c46c92d605
Prevent linkdraw sprites from connecting to shadows
2020-01-08 21:37:38 -06:00
fickleheart
48c1ce3ac3
Add render-based drop shadows to some objects
...
Uses a hardcoded list for now. I was experiencing some
crashes with this, but the shadowyscale check seems to
have suppressed them.
2020-01-08 21:37:36 -06:00
fickleheart
ccc473917e
Check for papersprites per-sprite instead of per-row
...
In theory, should be a performance improvement. In practice idk
2020-01-08 21:14:11 -06:00
fickleheart
1790891fd8
Reduce disappearance of vissprites close to the camera
2020-01-08 21:14:09 -06:00
fickleheart
c0380a3052
Make papersprite projection completely correct in software
...
I heard properpaper had some weird crashes? I couldn't reproduce
them no matter how hard I tried, but I added some bounds checking
to this version too just in case. Gotta get other people's help
to try to reproduce those.
2020-01-08 21:14:07 -06:00
