Commit graph

4188 commits

Author SHA1 Message Date
mazmazz
baababcf0b Add spawn_lightlevel to sector_t 2018-09-09 12:44:35 -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
68e67917f1 Split P_FadeLight into P_FadeLightBySector 2018-09-08 22:14:49 -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
Digiku
ffde71c656 Merge branch 'flicky-things' into 'master'
Flicky Thing Types

See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
9e5b9ac50e Flicky colors indexing fix 2018-09-06 13:20:55 -04:00
mazmazz
956d48b5e0 Compiler errors 2018-09-06 13:16:50 -04:00
mazmazz
bd6bc368a3 Stray comments 2018-09-06 12:13:03 -04:00
mazmazz
1c273cdcc8 Make default flicky home radius 384 2018-09-06 11:59:55 -04:00
mazmazz
e75213b14d Limit random fish color to SRB2's defaults 2018-09-06 11:56:55 -04:00
mazmazz
f15bb2dfba Change default radius to 448
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
0c2340b0bc Impose home radius on aimless flickies; improve randomness of flickyhitwall angle 2018-09-06 11:17:08 -04:00
mazmazz
f8d260b044 Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE) 2018-09-06 10:32:26 -04:00
mazmazz
7d834ff894 Erase default home radius from states and impose default on home check 2018-09-06 10:20:01 -04:00
mazmazz
2cfd941778 Re-organize flags for FLICKY_CENTER
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
fe2d1e9020 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
mazmazz
f000a68150 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
21a55a4702 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
mazmazz
956b83729b Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
mazmazz
e5dd74eb45 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -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
Monster Iestyn
2ac50cd2b7 Merge branch 'public_next'
# Conflicts:
#	src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
38ac999d77 Merge branch 'addfile-verify-fix' into 'next'
Addfile command verify fix.

See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00
Digiku
01314b6674 Merge branch 'nightsplus-le' into 'master'
NiGHTS Linedef Executor Triggers

Closes #102

See merge request STJr/SRB2Internal!142
2018-09-02 18:10:50 -04:00
Monster Iestyn
6ae78da47e Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
4b5ebef6c2 Merge branch 'homremoval-nongreenfix' into 'master'
Fix for HOM removal in non-green resolutions

See merge request STJr/SRB2!273
2018-09-01 20:53:49 -04:00
Steel Titanium
54fec7fa5c Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Steel Titanium
0f5d685d1f Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
6ab0eb53f9 Merge branch 'nights-nofastattract' into 'master'
NiGHTS: Dummy out faster item attract

See merge request STJr/SRB2Internal!183
2018-08-30 17:26:42 -04:00
mazmazz
fed72c344a Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
baa6ba6899 Merge branch 'nights-inufixes' into 'master'
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer

See merge request STJr/SRB2Internal!156
2018-08-30 09:12:55 -04:00
mazmazz
dae37e2749 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
a44be49535 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
28bbe71c57 Merge branch 'hud-cleaning' into 'master'
Hud cleaning

See merge request STJr/SRB2Internal!170
2018-08-29 16:22:48 -04:00
Monster Iestyn
523a02aa54 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
1c5080151d Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00