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
Zachary McAlpin
11d21dd950
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-08 18:52:56 -06:00
James R
735289502c
Call it KEYWORDS
2020-01-08 14:41:38 -08:00
toaster
004cfb45aa
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
James R
74364b84f9
Revert "Oh right, the keywords..."
...
This reverts commit a00dfcf420
2020-01-08 14:26:47 -08:00
toaster
d89050f073
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
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
James R
4d8c916ca1
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
551df5f93a
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
a63bd720b9
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
117d5ab66f
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
6870492cf2
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
3b90571987
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
07dfc5cce7
Fix S_HAMMER being off by one
2020-01-08 16:00:02 -05:00
James R
8bc7b4c72d
Give chat word jumping
2020-01-08 12:58:34 -08:00
James R
702b23ec3f
Put the word jumping code in functions
2020-01-08 12:58:19 -08:00
toaster
0b1108425d
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
377194b077
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
d2da441a57
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
d49cd9755b
Fullbright transparent planes
...
(I disagree with this feature so hard but w/e)
(cherry picked from commit fe809b2734
2020-01-08 13:13:07 -05:00
Sally Cochenour
15075d4e1b
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 74d7f256a7
2020-01-08 13:12:37 -05:00
Sally Cochenour
65a02b0f8f
Increase precision of smooth contrast
...
(cherry picked from commit 4c6664292e
2020-01-08 13:12:15 -05:00
Sally Cochenour
ac365a0c81
Fake contrast
2020-01-08 13:11:53 -05:00
Sally Cochenour
6476a92817
Update blend textures to smooth out colors that have duplicate indices
2020-01-08 13:09:29 -05:00
James R
0d3c03ccd6
Left word jump (whoo that took long)
2020-01-08 02:54:17 -08:00
James R
9e703f935a
Right word jump
2020-01-08 01:03:44 -08:00
MascaraSnake
faac4ea545
Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore)
2020-01-08 09:28:37 +01:00
MascaraSnake
45404f7f27
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
MascaraSnake
031e7cfb82
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
fickleheart
6211c80a69
Mixed code and declaration stuff
2020-01-08 00:22:17 -06:00
fickleheart
5abf0c24f9
oh god I forget why this is here but let's not remove it now
2020-01-08 00:21:03 -06:00
James R
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
fickleheart
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
lachwright
01b8bd21cc
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
James R
fc1eff6eee
Merge branch 'amyhearts-fix' into 'next'
...
Fix NPC Amy's love hearts crashing if they didn't have a set fuse
See merge request STJr/SRB2!641
2020-01-07 01:05:09 -05:00
lachwright
e069e149d9
Apply skin's highresscale to continue screen
2020-01-07 13:56:54 +08:00
