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

3514 commits

Author SHA1 Message Date
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 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 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
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
mazmazz fed72c344a Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -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 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
Monster Iestyn a48326383c Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz 6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
mazmazz dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku e0601616fe Merge branch 'nights-bumper-fix' into 'master' 
NiGHTS: Fix player positioning when touching Bumper

See merge request STJr/SRB2Internal!165
 2018-08-29 06:02:24 -04:00
Digiku a28cc10861 Merge branch 'op-nights-bumper' into 'master' 
Objectplace: Place NiGHTS Bumpers with the player's fly angle

See merge request STJr/SRB2Internal!166
 2018-08-29 06:01:27 -04:00
Digiku f8332f6765 Merge branch 'nights-nightserizeangle' into 'master' 
NiGHTS: Reset player another/flyangle on De/Nightserize

See merge request STJr/SRB2Internal!139
 2018-08-29 04:27:02 -04:00
Digiku 4882b7c3f8 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
Digiku 9746442a93 Merge branch 'le-ringspheres' into 'master' 
Line Execs: Make Ring triggers accept spheres in NiGHTS levels

See merge request STJr/SRB2Internal!163
 2018-08-29 04:24:47 -04:00
Digiku 78c78d9e63 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
Monster Iestyn 58a844d3cf Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
Monster Iestyn 61836e1565 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
toaster 710550bb9d Missed one! 2018-08-26 12:38:53 +01:00
Monster Iestyn d5ab3e75a5 Merge branch 'v_video_killed_the_r_radio_star' into 'master' 
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
 2018-08-25 16:43:25 -04:00
Monster Iestyn ed5bed4d2c Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' 
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
 2018-08-25 16:43:14 -04:00
toaster 85474e33dd Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
toaster 80ac2366ba Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions. 
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
 2018-08-25 19:52:17 +01:00
Digiku cddb743fe1 Merge branch 'op-nightshoop' into 'master' 
NiGHTS objectplace: Place new hoop 1713 instead of 1705

See merge request STJr/SRB2Internal!136
 2018-08-25 13:23:51 -04:00
toaster 91eb248e46 Fix up them there ghosts! 
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
 2018-08-25 17:11:49 +01:00