0d88f31bbd
Add floorrover and ceilingrover to precipmobj_t
2018-09-10 00:23:23 -04:00
943dc9412d
Initialize floorrover and ceilingrover on SpawnMobj
2018-09-10 00:20:51 -04:00
832f891cbb
Remove rovernum increment from P_CheckPosition because unused
2018-09-10 00:13:32 -04:00
03d1baf422
Savegame floorrover fixes
2018-09-10 00:07:22 -04:00
dd35871699
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-09 23:48:42 -04:00
f33f9dd284
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-09 23:12:37 -04:00
d01193df80
Apply ~FF_EXISTS moving plat fix for VERTICALFLIP
2018-09-09 21:59:41 -04:00
231f19aaab
Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
...
This reverts commit cc114590547e3d5cd373
2018-09-09 21:02:43 -04:00
b629104197
Also check for FF_SOLID
2018-09-08 01:07:08 -04:00
cc11459054
Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists
2018-09-08 00:37:04 -04:00
7e3d5cd373
Comment out tmfloorrover and tmceilingrover because unused
2018-09-08 00:36:43 -04:00
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
f52f72256b
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-07 18:14:52 -04:00
ffde71c656
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
9e5b9ac50e
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
956d48b5e0
Compiler errors
2018-09-06 13:16:50 -04:00
bd6bc368a3
Stray comments
2018-09-06 12:13:03 -04:00
1c273cdcc8
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
e75213b14d
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
f15bb2dfba
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
0c2340b0bc
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
f8d260b044
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
7d834ff894
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
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
fe2d1e9020
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
f000a68150
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
21a55a4702
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
956b83729b
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
e5dd74eb45
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00
2b0ce807c7
Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround
2018-09-04 17:04:24 +01:00
2ac50cd2b7
Merge branch 'public_next'
...
# Conflicts:
# src/r_main.c
2018-09-04 15:53:07 +01:00
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
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
6ae78da47e
Merge branch 'master' into next
2018-09-02 13:00:56 +01:00
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
54fec7fa5c
Merge branch 'master' into addfile-verify-fix
2018-09-01 19:33:59 -04:00
322da62b3c
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
0f5d685d1f
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
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
fed72c344a
Dummy out NiGHTS item faster attract
2018-08-30 10:50:03 -04:00
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
dae37e2749
Drill mash penalty fix
2018-08-30 09:09:19 -04:00
a44be49535
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
28bbe71c57
Merge branch 'hud-cleaning' into 'master'
...
Hud cleaning
See merge request STJr/SRB2Internal!170
2018-08-29 16:22:48 -04:00
523a02aa54
Merge branch 'master' into hud-cleaning
2018-08-29 20:46:35 +01:00
1c5080151d
Fix typo introduced by changes to the setrings command
2018-08-29 20:46:08 +01:00
a48326383c
Merge branch 'master' into hud-cleaning
...
# Conflicts:
# src/y_inter.c
2018-08-29 16:39:02 +01:00
6d97a10273
Merge remote-tracking branch 'origin/master' into nightsplus-le
2018-08-29 11:06:00 -04:00
900cbf72c8
Merge branch 'nightsplus-laplogic' into 'master'
...
NiGHTS: Track player mare lap variables
See merge request STJr/SRB2Internal!143
2018-08-29 10:58:05 -04:00
dc86fe9b5f
Merge remote-tracking branch 'origin/master' into nightsplus-laplogic
2018-08-29 10:16:49 -04:00
mazmazz