mazmazz
0c8e2ffd78
Totalmarescore typo
2018-08-12 19:59:41 -04:00
mazmazz
ec8d264029
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
5938a57970
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
fe904b0eb2
NiGHTS lap score bonus
2018-08-12 19:48:45 -04:00
mazmazz
0c0a403bb3
Merge branch 'nightsplus-laplogic' into nights-score-lap
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:39:31 -04:00
mazmazz
feadcbfc94
BONUSTYPE typo; bonus alignment
2018-08-12 19:32:11 -04:00
mazmazz
372fc540bc
Totalmarescore typo
2018-08-12 19:26:18 -04:00
mazmazz
30d57eac79
NiGHTS bonus implementation
2018-08-12 19:25:21 -04:00
mazmazz
61999100e5
totalmarescore player variable for NiGHTS scoring
2018-08-12 19:21:55 -04:00
mazmazz
4e02171c23
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
ce0b23a576
Set Drone hitbox radius by upmost 4 bits of Angle
2018-08-12 13:34:27 -04:00
mazmazz
02d5e4e902
MT_FLICKY_CENTER flag adjustments
2018-08-12 12:49:23 -04:00
Monster Iestyn
0da21244c0
Added "Tutorialmap" MainCfg option for SOC
2018-08-12 14:30:49 +01:00
mazmazz
8f50fbeb4f
For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using
2018-08-12 09:28:04 -04:00
mazmazz
2f6c0d7e4e
Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1
2018-08-12 09:23:50 -04:00
Nev3r
f19b7bfacf
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
f4a813891f
Decouple Flicky Thing logic from spawnpoint variables; use mobj variables
2018-08-12 02:34:37 -04:00
mazmazz
43b790c26f
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
aecabb246d
Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE
2018-08-11 23:53:07 -04:00
mazmazz
9bc9f96e09
NIGHTSDRONE sync visual elements when changing mobj flags
2018-08-11 23:32:12 -04:00
mazmazz
0c8e1aa10a
When NIGHTSDRONE z changes, change DRONEMAN z as well
2018-08-11 23:15:28 -04:00
mazmazz
79c042ca09
NIGHTSDRONE visual element positioning now works with scaling
2018-08-11 22:41:58 -04:00
mazmazz
4f9231b7a5
Fix orbiting Ideya bug, now player gets them back again on exit
2018-08-11 22:13:33 -04:00
Alam Ed Arias
01a023206f
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
Alam Ed Arias
7d3e4f729f
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
Alam Ed Arias
b5cc11f7d8
TravisCI: gcc-4.9 is also gone
2018-08-11 21:44:07 -04:00
mazmazz
a4e3f8cbcf
NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP
2018-08-11 21:38:44 -04:00
mazmazz
72b592888f
Line fixes for visual element positioning
...
# Conflicts:
# src/p_mobj.c
2018-08-11 20:50:53 -04:00
Alam Ed Arias
bb94d9fa3a
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772
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
51b8d6e01a
Make "Tutorial" warp directly to MAPZ0 (not configurable yet)
2018-08-11 21:17:52 +01:00
mazmazz
2c4f9d4776
Don't need this line
2018-08-11 15:54:39 -04:00
mazmazz
c99258b2e2
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
0b88c364bc
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
0fe41e06ff
Remove A_OrbitNights additional input offset on current target Z, don't need it
2018-08-11 12:06:50 -04:00
mazmazz
c8dcb57e83
Remove ORBIDYA CENTER states, we don't need 'em
2018-08-11 12:06:17 -04:00
mazmazz
d0f0f475ce
* Bounce Droneman within hitbox instead of floorz
...
* Correct Droneman hiding so he always stays within hitbox even when invisible
2018-08-11 02:03:44 -04:00
mazmazz
d1a8e0baa0
Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize
...
* Also correct player's position to Z center of Drone hitbox on Nightserize
2018-08-11 02:02:56 -04:00
mazmazz
480c4f890d
player->oldscale var for pre-Nightserize scale
2018-08-11 00:49:28 -04:00
mazmazz
8154578fb6
Switch Ideya orbiting state to centered offset states when orbiting around Drone
2018-08-11 00:09:02 -04:00
mazmazz
b97037f644
A_OrbitNights height offset by target height implementation
2018-08-11 00:07:26 -04:00
mazmazz
c9c0219393
ORBITEM CENTER states for A_OrbitNights target height offset
2018-08-10 23:49:02 -04:00
mazmazz
7c0186bc97
Drone de-coupling implementation
...
* Visual elements and hitbox work as expected with scaling and OBJECTFLIP
2018-08-10 22:11:48 -04:00
mazmazz
32c17b1454
Basic implementation for player position correction to Drone center
...
* player->drone mobj variable
* P_MoveNiGHTSToDrone, will change later
2018-08-10 19:25:49 -04:00
Steel Titanium
d9c7334dea
Fix white being treated as transparent.
2018-08-10 19:02:03 -04:00
mazmazz
e0e77d873b
Nights Drone mobj and state entries
...
* New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING
* NIGHTSGOAL renamed to NIGHTSDRONE_GOAL
* MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 18:24:31 -04:00
mazmazz
c72e724122
Merge branch 'nightsplus-laplogic' into nightsplus-le
...
# Conflicts:
# src/p_map.c
# src/p_setup.c
2018-08-10 17:24:12 -04:00
Alam Ed Arias
0575d2f1f9
TravisCI: remove gcc-5 test, gcc-5 package is gone
2018-08-10 17:16:26 -04:00
mazmazz
872761e258
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-10 17:12:26 -04:00
Alam Ed Arias
3479310546
SDL: update IMG_xpm.c
2018-08-10 17:09:11 -04:00
