Commit graph

4150 commits

Author SHA1 Message Date
mazmazz
43b0c71de1 Lua support for floorrover/ceilingrover 2018-09-14 21:43:43 -04:00
mazmazz
092b58fe39 Set mobj->floorrover and ceilingrover in appropriate places 2018-09-10 00:38:07 -04:00
mazmazz
df9c6c4a1f Add floorrover and ceilingrover to precipmobj_t 2018-09-10 00:23:23 -04:00
mazmazz
3d83908596 Initialize floorrover and ceilingrover on SpawnMobj 2018-09-10 00:20:51 -04:00
mazmazz
913177ce23 Remove rovernum increment from P_CheckPosition because unused 2018-09-10 00:13:32 -04:00
mazmazz
93fa4d2f3a Savegame floorrover fixes 2018-09-10 00:07:22 -04:00
mazmazz
45228f823c Savegame netsync for mobj->floorrover and ceilingrrover 2018-09-09 23:48:42 -04:00
mazmazz
5402e8a9a3 Replace sectornum/rovernum index vars with ffloor pointers 2018-09-09 23:12:37 -04:00
mazmazz
3f1789ad79 Apply ~FF_EXISTS moving plat fix for VERTICALFLIP 2018-09-09 21:59:41 -04:00
mazmazz
f1fe584552 Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
This reverts commit f7731d7a41, reversing
changes made to bc63a44330.
2018-09-09 21:02:43 -04:00
mazmazz
9c1fc17233 Also check for FF_SOLID 2018-09-08 01:07:08 -04:00
mazmazz
f7731d7a41 Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists 2018-09-08 00:37:04 -04:00
mazmazz
bc63a44330 Comment out tmfloorrover and tmceilingrover because unused 2018-09-08 00:36:43 -04:00
mazmazz
05ac0bb337 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
969741717d Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS 2018-09-07 18:14:52 -04:00
Digiku
8d015bd7cc Merge branch 'flicky-things' into 'master'
Flicky Thing Types

See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826 Flicky colors indexing fix 2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4 Compiler errors 2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3 Stray comments 2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0 Make default flicky home radius 384 2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763 Limit random fish color to SRB2's defaults 2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e Change default radius to 448
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33 Impose home radius on aimless flickies; improve randomness of flickyhitwall angle 2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4 Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE) 2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22 Erase default home radius from states and impose default on home check 2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2 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
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
mazmazz
6426d88141 Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
mazmazz
a095b47980 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00
Monster Iestyn
cd8a46b3a1 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
Monster Iestyn
82e46d101c Merge branch 'public_next'
# Conflicts:
#	src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263 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
816a81b396 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
4bd725e7b8 Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
44c4534231 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
4b690b20d3 Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
Monster Iestyn
7fc4d864a8 Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Steel Titanium
277bec55c2 Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
b24a04989e 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
dcca56bc04 Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4 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
f8588739b8 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
ede540a259 Merge branch 'hud-cleaning' into 'master'
Hud cleaning

See merge request STJr/SRB2Internal!170
2018-08-29 16:22:48 -04:00
Monster Iestyn
a9882bfda4 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
d130c48787 Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning
# Conflicts:
#	src/y_inter.c
2018-08-29 16:39:02 +01:00
mazmazz
c43c15ff10 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00