stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4203 commits 172 branches 41 tags 280 MiB
Commit graph

274 commits

Author SHA1 Message Date
mazmazz
02a94dc941 Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets) 2018-09-10 09:49:52 -04:00
mazmazz
b8da218b61 Add relative destvalue calc (ML_EFFECT4) 
* rover->alpha init fixes with invisible FOFs
 2018-09-10 09:49:00 -04:00
mazmazz
5136293f62 Store sectornum/ffloornum as UINT32, not INT32 2018-09-09 23:52:36 -04:00
mazmazz
9cc186441b Fix fog visual glitch with fading 2018-09-09 22:14:24 -04:00
mazmazz
0202bbcfd3 Replace firsttic with timer increment 2018-09-09 20:45:12 -04:00
mazmazz
ea2276eb07 Fix tic-based bug returning early 2018-09-09 19:57:41 -04:00
mazmazz
43ae628adc Cap lightlevel fading at spawn_lightlevel (don't make darker) 2018-09-09 19:44:35 -04:00
mazmazz
c3c4a251f1 Added tic-based logic to FOF fade (ML_EFFECT5) 2018-09-09 19:31:32 -04:00
mazmazz
80a4a03f8e Finalize light level on fade finish (not forced stop) 
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
 2018-09-09 17:20:35 -04:00
mazmazz
368f96e605 Fade FOF lighting fixes; properly calculate destlightvalue 2018-09-09 15:41:30 -04:00
mazmazz
ca58fba24a Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 13:44:30 -04:00
mazmazz
aeb45132c5 Revert "Snap light level to software values (32 levels)" 
This reverts commit cc26d03c93.
 2018-09-09 13:43:00 -04:00
mazmazz
675f69afea Flag re-organization 
* Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM
* Change tic-based flag from NOCLIMB to EFFECT5
 2018-09-09 09:34:36 -04:00
mazmazz
5032f783d7 Don't add a thinker if alpha is already equal 2018-09-09 08:10:45 -04:00
mazmazz
0049f904c0 Add light fading to FadeFakeFloor 
* Declare P_RemoveLighting in header for p_spec.c use
 2018-09-08 23:44:29 -04:00
mazmazz
4ca38dc8a1 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-08 23:03:18 -04:00
mazmazz
cc26d03c93 Snap light level to software values (32 levels) 
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
 2018-09-08 23:01:35 -04:00
mazmazz
1e1b01c157 Implemented tic-based light fading 
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
 2018-09-08 22:10:51 -04:00
mazmazz
81acf82e99 Re-render lighting when setting FF_EXISTS 2018-09-08 20:49:32 -04:00
mazmazz
069cc480c1 Add dolighting flag to FadeFakeFloor thinker 2018-09-08 20:41:45 -04:00
mazmazz
3eb7c3931e When detecting invisible FOFs, don't include light blocks 2018-09-08 20:08:48 -04:00
mazmazz
3858a93cfa Initialize invisible FOF alpha to 1 on first fade 2018-09-08 09:31:23 -04:00
mazmazz
fa0918c2f1 Handle rendering flags for invisible FOFs 2018-09-08 09:08:32 -04:00
mazmazz
fcc7180d5c Enable FF_CUTSOLIDS handling and updating by sector->moved 2018-09-08 08:59:17 -04:00
mazmazz
47c9bf2ebc Disable FadeFakeFloor for laser block 2018-09-08 01:33:12 -04:00
mazmazz
dc964738eb Never handle FF_EXISTS if FF_BUSTUP 2018-09-08 01:23:15 -04:00
mazmazz
66dc84509a Fix Mario block triggering during ghost fade 2018-09-08 01:12:34 -04:00
mazmazz
4147773d0c Merge branch 'master' into le-fadefof 2018-09-06 18:12:24 -04:00
Monster Iestyn
2b0ce807c7 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
mazmazz
6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
mazmazz
4b07246565 Add "finalize" flag to Type 453 Stop Fade 2018-08-18 06:04:11 -04:00
mazmazz
773d8bdb8d P_ResetFakeFloorFader: Unclamp rover->alpha from software levels 2018-08-18 05:31:41 -04:00
mazmazz
d94608fa10 Add alpha clamping so OpenGL conforms to Software's translucent levels 2018-08-17 17:07:07 -04:00
mazmazz
bf5efe6457 Cleanup fade fake floor code 2018-08-17 15:59:34 -04:00
mazmazz
45ae6efbad Refactor function and variable names; change defaults for fake floor fader line flags 2018-08-17 15:25:25 -04:00
mazmazz
020b18b84b Revised and re-organized P_DoFakeFloorAlpha fading procedure 
* dosolid routine now refers to spawnflags
 2018-08-17 14:49:33 -04:00
mazmazz
677f19ede6 Move fading thinker to ffloor_t.fadingdata 2018-08-17 02:28:52 -04:00
mazmazz
2e252cb905 Move fadingdata (fade_t thinker) to line_t 2018-08-17 01:11:04 -04:00
mazmazz
931297e2d7 Rename dofadeinonly to doghostfade 
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
 2018-08-16 22:27:26 -04:00
mazmazz
61c84be704 Fix bonus time quirk where lines are run if player->marebonuslap is 0 
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
 2018-08-14 16:08:21 -04:00
mazmazz
c3703cfc24 Comments 2018-08-14 14:57:58 -04:00
mazmazz
3f312ce114 Make Bonus Time Start executor into a general Egg Capsule Touch executor 
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
 2018-08-14 12:00:37 -04:00
mazmazz
1cb68a615e Make LE Ring triggers accept spheres for NiGHTS levels 2018-08-14 11:10:10 -04:00
mazmazz
62a6fe845d Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres 2018-08-14 10:48:50 -04:00
mazmazz
004cbe6a3d Whitespace 2018-08-13 22:10:16 -04:00
mazmazz
b8eb282367 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker 2018-08-10 15:03:07 -04:00
mazmazz
d97c25f6dd Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
 2018-08-10 13:44:47 -04:00
toaster
1242180667 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
Monster Iestyn
14d49b8bf1 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
 2018-06-09 19:35:36 +01:00
toaster
3725203bcd Bit of a random one today, but the branch approaches completion... 
* Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL.
* Blueberry bushes, both normal and Xmas, from patch.dta.
* BSZ tulips, also from patch.dta!
* Frozen Hillside badniks - Penguinator and Pophat.
* Frozen Hillside ice decoration!
* Fixed some big bugs with the DSZ light beams.
* Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c
* Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels.
* State optimisation.
* Serious cruft-removal of the NiGHTS drone thinker.
* Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs.
* Tweak NiGHTS player flashing.
* Add text colour support to the titlecard font.
* Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability.
* Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time.
* Fix that thing where flying mid-spin didn't enact autobrake.
* Modify graymap a little on Sryder's suggestion.
* [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
 2018-06-05 17:22:28 +01:00