mazmazz
f445d9d934
MT_IDEYAANCHOR: Use type 1714 instead of 1717
2018-08-13 03:18:23 -04:00
mazmazz
87fc89d110
Make anchoring non-specific to Ideya states (now anchor anything!)
...
# Conflicts:
# src/p_inter.c
2018-08-13 02:19:53 -04:00
mazmazz
d3d837392f
Ideya anchoring optimization
2018-08-13 02:17:29 -04:00
mazmazz
ef9a03b021
Anchor Ideya logic
...
# Conflicts:
# src/p_enemy.c
# src/p_inter.c
2018-08-13 02:17:07 -04:00
mazmazz
d3a6688601
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
2018-08-13 02:09:52 -04:00
mazmazz
32e922f552
A_OrbitNights: Move donotrescale to bit 19
...
* For compat with `nights-ideyaspawn`
2018-08-13 02:09:00 -04:00
mazmazz
1dab7b2f79
MT_IDEYAANCHOR info and spawn logic
2018-08-13 02:03:36 -04:00
mazmazz
c89e48e23c
Fix attraction bug on non-NiGHTS and Nightopian Helper
...
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
2018-08-12 23:03:12 -04:00
mazmazz
5b61de544c
Merge nightsplus-laplogic
2018-08-12 21:20:14 -04:00
mazmazz
42da933c2c
Merge from nights-score and use Lap Bonus instead of Link Bonus
...
* One BONUSTYPE = NIGHTS option instead of several
* Use NiGHTS Bonus for special stages, not Link Bonus
2018-08-12 20:56:57 -04:00
mazmazz
83d3099fe3
Change special stage bonus to NiGHTS in-level score, per MB
2018-08-12 20:36:53 -04:00
mazmazz
8ec0865170
Have just one NiGHTS bonus option: NIGHTS and LINK together
2018-08-12 20:25:35 -04:00
mazmazz
b9b2f7cfa7
Make lap bonus more valuable
2018-08-12 20:08:40 -04:00
mazmazz
598614dbb6
Merge branch 'nightsplus-laplogic' into nights-score-lap
2018-08-12 19:59:58 -04:00
mazmazz
921b50550a
Totalmarescore typo
2018-08-12 19:59:41 -04:00
mazmazz
d24de8bc2f
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
d83b96c126
NiGHTS lap score bonus
2018-08-12 19:48:45 -04:00
mazmazz
7d59e1fc70
Merge branch 'nightsplus-laplogic' into nights-score-lap
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:39:31 -04:00
mazmazz
8d40d8ea43
BONUSTYPE typo; bonus alignment
2018-08-12 19:32:11 -04:00
mazmazz
417d7d105e
Totalmarescore typo
2018-08-12 19:26:18 -04:00
mazmazz
c51e84fdfe
NiGHTS bonus implementation
2018-08-12 19:25:21 -04:00
mazmazz
baa5d41dca
totalmarescore player variable for NiGHTS scoring
2018-08-12 19:21:55 -04:00
mazmazz
269c1a70ba
Add lapbegunat and lapstartedtime player variables
...
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-12 14:21:26 -04:00
mazmazz
b17f3e7e40
Set Drone hitbox radius by upmost 4 bits of Angle
2018-08-12 13:34:27 -04:00
mazmazz
123eb4bc3e
MT_FLICKY_CENTER flag adjustments
2018-08-12 12:49:23 -04:00
Monster Iestyn
f31dcb6357
Added "Tutorialmap" MainCfg option for SOC
2018-08-12 14:30:49 +01:00
mazmazz
01436d2a65
For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using
2018-08-12 09:28:04 -04:00
mazmazz
200a5fccd0
Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1
2018-08-12 09:23:50 -04:00
Nev3r
effd0ebe97
Merge branch 'horizon-line-hom-fix' into 'master'
...
Horizon line HOM fix
See merge request STJr/SRB2Internal!152
2018-08-12 03:48:20 -04:00
mazmazz
e203edb450
Decouple Flicky Thing logic from spawnpoint variables; use mobj variables
2018-08-12 02:34:37 -04:00
mazmazz
89cf2b8793
A_OrbitNights make actor scale to target
...
* Added `donotrescale` input to disable this behavior
* Reverted previous commit changes for scaling Ideya because unneeded
2018-08-12 01:07:26 -04:00
mazmazz
b534e01e28
Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE
2018-08-11 23:53:07 -04:00
mazmazz
e50f7fa412
NIGHTSDRONE sync visual elements when changing mobj flags
2018-08-11 23:32:12 -04:00
mazmazz
154cfa1171
When NIGHTSDRONE z changes, change DRONEMAN z as well
2018-08-11 23:15:28 -04:00
mazmazz
60025e396b
NIGHTSDRONE visual element positioning now works with scaling
2018-08-11 22:41:58 -04:00
mazmazz
f6c39495a8
Fix orbiting Ideya bug, now player gets them back again on exit
2018-08-11 22:13:33 -04:00
Alam Ed Arias
e7eaba0118
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
Alam Ed Arias
5b5013c9b1
TravisCI: gcc-4.9 is also gone
2018-08-11 21:44:07 -04:00
mazmazz
8c63bf9fe8
NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP
2018-08-11 21:38:44 -04:00
mazmazz
006f33d72f
Line fixes for visual element positioning
...
# Conflicts:
# src/p_mobj.c
2018-08-11 20:50:53 -04:00
Alam Ed Arias
e4317066a6
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
Alam Ed Arias
e7ec2e3830
Merge branch 'xpm_fix' into 'XPMupdate'
...
Fix white being treated as transparent.
See merge request STJr/SRB2!266
2018-08-11 20:36:57 -04:00
Monster Iestyn
4ab0742604
Make "Tutorial" warp directly to MAPZ0 (not configurable yet)
2018-08-11 21:17:52 +01:00
mazmazz
291a955d24
Don't need this line
2018-08-11 15:54:39 -04:00
mazmazz
14301a62d5
Make Drone hitbox height and player Z alignment configurable
...
* Default hitbox height is 80
* Drone Thing parameter sets height to multiples of 32
* Player aligns by default to bottom+24 of hitbox (offsetted)
* `MTF_OBJECTSPECIAL` aligns player to hitbox top
* `MTF_EXTRA` aligns to hitbox center
* `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox
* Goalpost and sparkle Z alignment is changed to reflect configurableness
2018-08-11 15:52:42 -04:00
Monster Iestyn
5534c0519c
Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind!
...
Also, change said menu's def to start at "Start Game" when entering it for the first time.
2018-08-11 18:01:54 +01:00
mazmazz
d8cafeba7d
Remove A_OrbitNights additional input offset on current target Z, don't need it
2018-08-11 12:06:50 -04:00
mazmazz
76dc4d99bc
Remove ORBIDYA CENTER states, we don't need 'em
2018-08-11 12:06:17 -04:00
