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
MascaraSnake
c49232c1f1
Merge branch 'fakeplanes-colormap' into stringargs
2020-01-08 20:10:43 +01: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
Nami
d865b72b13
Splits part of PTR_SlideTraverse into a lua-exposed function, exposes P_RailThinker
2020-01-08 03:48:30 -08:00
James R
0d3c03ccd6
Left word jump (whoo that took long)
2020-01-08 02:54:17 -08:00
Sally Cochenour
fe809b2734
Fullbright transparent planes
...
(I disagree with this feature so hard but w/e)
2020-01-08 04:10:23 -05:00
James R
9e703f935a
Right word jump
2020-01-08 01:03:44 -08:00
Sally Cochenour
465b3b1559
Water surface shader
...
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
2020-01-08 03:37:46 -05: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
MascaraSnake
2d7b43c244
Implement linedef string arguments
2020-01-08 08:42:35 +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
Sally Cochenour
7d8ff43019
Basic fog shader
...
HWR_FogBlockAlpha is still very inaccurate, which gives different results than Software even with the shader, but it's a start
2020-01-07 20:55:36 -05:00
Sally Cochenour
a35a2c81e2
Fix errors
2020-01-07 19:30:09 -05:00
Jaime Passos
cdc2a8a923
Fix shadowed declarations
2020-01-07 20:07:35 -03:00
Jaime Passos
8202ea86b7
Fix Picture_GetPatchPixel
2020-01-07 20:05:40 -03:00
Jaime Passos
ae748d6d5c
Fix patch generation
2020-01-07 20:05:33 -03:00
Jaime Passos
ce7f81c78d
use enum for bpp
2020-01-07 20:04:18 -03:00
MascaraSnake
b6ab1af424
Check slope flags explicitly instead of setting them directly (in case they ever change)
2020-01-07 21:50:14 +01:00
Jaime Passos
79116ae471
Provide some cleaner method to generate textures as flats.
...
R_GenerateTextureAsFlat
2020-01-07 16:51:02 -03:00
Jaime Passos
b8625d9efb
AA trees are not needed at all for rotated patches
2020-01-07 16:10:38 -03:00
Jaime Passos
5a2ad5c2f3
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
Jaime Passos
854d31a08b
How did I even manage to do this?
2020-01-07 14:12:19 -03:00
Jaime Passos
1358507785
Fix OpenGL
2020-01-07 14:07:14 -03:00
Jaime Passos
5b5f371b0c
R_GetTextureFlat -> R_GetLevelFlat
2020-01-07 13:27:59 -03:00
Jaime Passos
76a6710f8b
Move location of R_CheckPowersOfTwo and R_CheckFlatLength
2020-01-07 12:46:46 -03:00