lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9285 commits 1 branch 29 tags 122 MiB
Commit graph

9285 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Sally Cochenour ca5b56181b Merge next 2020-01-07 07:35:39 -05: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
Tatsuru 360e8f28b4 ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Steel Titanium 808d731652 Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
MascaraSnake b95d1cef01 Merge branch 'ignore-glsegs' into 'next' 
Add missing glseg checks (and remove a superfluous one)

See merge request STJr/SRB2!642
 2020-01-06 17:08:32 -05:00
Alam Ed Arias 5b93230a94 Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias 21c224fce0 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake 759b1c82e2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
MascaraSnake 1cbf7aba0d Merge branch 'move-map-copying' into 'next' 
Reorder map loading

See merge request STJr/SRB2!635
 2020-01-06 04:24:39 -05:00
Alam Ed Arias 0fbc459243 cleanup whitespace 2020-01-05 21:49:07 -05:00
Tatsuru 07f9ddc45a Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru fce1313517 No comments 2020-01-05 23:19:52 -03:00
Tatsuru 664bce71de :amybruh: 2020-01-05 23:18:38 -03:00