Commit graph

9205 commits

Author SHA1 Message Date
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
James R
0bc03b8f9d Don't make player transparent if the orbital camera is looking straight down 2020-01-08 20:49:38 -08:00
fickleheart
d1793e8952 Stop misusing papersprite vars for sprite skew 2020-01-08 21:52:10 -06:00
fickleheart
c74ee13912 Apply portal clipping to drop shadows too 2020-01-08 21:37:44 -06:00
fickleheart
c7e28391a0 Make ring shadows smaller and fix scale bug 2020-01-08 21:37:43 -06:00
fickleheart
44aff735ac Fix more shadow crashes and save my sanity 2020-01-08 21:37:41 -06:00
fickleheart
8bf0c0533a FUCK IT, SLOPED SHADOWS NOW 2020-01-08 21:37:40 -06:00
fickleheart
9d2a3a060e This acursed crash-inducing typo spat in my face and called me a bitch 2020-01-08 21:37:39 -06:00
fickleheart
0ea9b26b97 Prevent linkdraw sprites from connecting to shadows 2020-01-08 21:37:38 -06:00
fickleheart
6326c3fe83 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
e276e1979c 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
8cae57eab0 Reduce disappearance of vissprites close to the camera 2020-01-08 21:14:09 -06:00
fickleheart
4fcae66242 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
Zachary McAlpin
6f60341aec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-08 18:52:56 -06:00
toaster
4f77e1e99b Allow Rollout Rocks that are being ridden to:
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
toaster
456778f950 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
# Conflicts:
#	src/r_defs.h
2020-01-08 21:47:47 +00:00
James R
f97afe47fa Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
James R
b3a03c76b4 Merge branch 'names-update' into 'master'
Update copyright statements for changed names

See merge request STJr/SRB2!644
2020-01-08 16:16:41 -05:00
James R
0046d8844d Merge branch 'state-fix' into 'next'
Fix S_HAMMER being off by one

See merge request STJr/SRB2!654
2020-01-08 16:15:55 -05:00
James R
0035964251 Merge branch 'next-newcontrols' into 'next'
fcam simple controls but slightly less hacky

See merge request STJr/SRB2!647
2020-01-08 16:15:47 -05:00
James R
0f79370188 Merge branch 'highresscale-continue' into 'master'
Apply skin's highresscale to continue screen

See merge request STJr/SRB2!645
2020-01-08 16:15:15 -05:00
James R
60ffbcdf29 Merge branch 'more-opengl-fixes' into 'master'
More OpenGL fixes plus masked PNG conversion

See merge request STJr/SRB2!619
2020-01-08 16:14:51 -05:00
James R
40d080cfe1 Merge branch 'local-lua-commands' into 'next'
Local Lua commands + no magic numbers

See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05:00
Steel Titanium
447f9e65c3 Fix S_HAMMER being off by one 2020-01-08 16:00:02 -05:00
toaster
336b6ad85e Hexafaceted sprite angle support (See merge request description coming soon).
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
toaster
44b68036e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
# Conflicts:
#	src/m_menu.c
2020-01-08 20:00:50 +00:00
toaster
a2ae30c2e2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints
# Conflicts:
#	src/m_menu.c
2020-01-08 19:18:35 +00:00
Sally Cochenour
0365716299 Fullbright transparent planes
(I disagree with this feature so hard but w/e)

(cherry picked from commit fe809b2734d430655966151e56f96963e2d7b2cf)
2020-01-08 13:13:07 -05:00
Sally Cochenour
3191c365de More blend image updates
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software

(cherry picked from commit 74d7f256a7849d0c829177614b37089e2446f86b)
2020-01-08 13:12:37 -05:00
Sally Cochenour
1871d01de6 Increase precision of smooth contrast
(cherry picked from commit 4c6664292e1f9b0d5c2ff34e28f05a8b63a4dd45)
2020-01-08 13:12:15 -05:00
Sally Cochenour
23cb9a018d Fake contrast 2020-01-08 13:11:53 -05:00
Sally Cochenour
e4744f6c34 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
Nami
03e8097744 Splits part of PTR_SlideTraverse into a lua-exposed function, exposes P_RailThinker 2020-01-08 03:48:30 -08:00