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

4938 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
baababcf0b Add spawn_lightlevel to sector_t 2018-09-09 12:44:35 -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
032f95803d Merge branch 'master' into change-colormap-ldef 2018-09-09 08:40:38 -04:00
mazmazz
5032f783d7 Don't add a thinker if alpha is already equal 2018-09-09 08:10:45 -04:00
mazmazz
3f4656e57e Polyobject Fade logic 2018-09-09 08:08:48 -04:00
mazmazz
eb590910b2 Added NIGHTSLINK bonus type for the 2.1 Link Bonus 2018-09-09 01:13:02 -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
b629104197 Also check for FF_SOLID 2018-09-08 01:07:08 -04:00
mazmazz
cc11459054 Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists 2018-09-08 00:37:04 -04:00
mazmazz
7e3d5cd373 Comment out tmfloorrover and tmceilingrover because unused 2018-09-08 00:36:43 -04:00
mazmazz
76d7a54b2b Fix player Z snap to floor on moving platform ~FF_EXISTS 
* Track player's old floorz by mo->floor_sectornum and floor_ffloornum
* Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum
* Ceiling variants of the above
 2018-09-08 00:34:56 -04:00
mazmazz
f52f72256b Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS 2018-09-07 18:14:52 -04:00
Monster Iestyn
316c08bbbb Merge branch 'netcode-nitpicking' into 'next' 
Netcode nitpicking

See merge request STJr/SRB2!274
 2018-09-07 15:59:49 -04:00
mazmazz
0b365d0d08 Initial polyobj fade skeleton 2018-09-07 15:27:18 -04:00
mazmazz
3b39895e4f Stray nights-onfootfix line 2018-09-07 09:01:38 -04:00
mazmazz
c0ffbdafce Revert "Ideya fixes when a player has more than one Ideya" 
This reverts commit e3facccb9d.
 2018-09-07 08:56:53 -04:00
mazmazz
4fe1b2652d Merge branch 'master' into nights-fastercapsule 2018-09-07 08:56:02 -04:00
mazmazz
49b27fc124 Deduct marescore immediately on instakill 
* Deduct player->spheres too, missed that one
 2018-09-07 08:19:22 -04:00
mazmazz
c50a0d60f5 Merge branch 'master' into nights-keeppoints 2018-09-07 08:13:57 -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