mazmazz
b17f3e7e40
Set Drone hitbox radius by upmost 4 bits of Angle
2018-08-12 13:34:27 -04:00
mazmazz
01436d2a65
For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using
2018-08-12 09:28:04 -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
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
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
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
mazmazz
3b18d3984e
* 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
46f1463595
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
c5d6dd55d5
player->oldscale var for pre-Nightserize scale
2018-08-11 00:49:28 -04:00
mazmazz
6f1b9de436
Switch Ideya orbiting state to centered offset states when orbiting around Drone
2018-08-11 00:09:02 -04:00
mazmazz
2dc74aa186
A_OrbitNights height offset by target height implementation
2018-08-11 00:07:26 -04:00
mazmazz
3ec985dde9
ORBITEM CENTER states for A_OrbitNights target height offset
2018-08-10 23:49:02 -04:00
mazmazz
30fccd6946
Drone de-coupling implementation
...
* Visual elements and hitbox work as expected with scaling and OBJECTFLIP
2018-08-10 22:11:48 -04:00
mazmazz
60f6792ad0
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
mazmazz
4e319541b6
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
Monster Iestyn
20ea372306
Merge branch 'polyobj-sky-plane-crash-fix' into 'master'
...
Polyobject sky plane crash fix
See merge request STJr/SRB2Internal!146
2018-08-10 15:40:43 -04:00
Monster Iestyn
593c41f34f
Merge branch 'leveltitle-tinkering' into 'master'
...
Leveltitle tinkering
See merge request STJr/SRB2Internal!134
2018-08-10 15:30:26 -04:00
Monster Iestyn
827da4098d
Merge branch 'master' into polyobj-sky-plane-crash-fix
2018-08-10 20:06:12 +01:00
Monster Iestyn
3e80f4a59b
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
2018-08-10 20:03:59 +01:00
Monster Iestyn
1952653f5b
Merge branch 'public_next'
2018-08-10 19:36:51 +01:00
Monster Iestyn
877ac62895
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a
Merge branch 'woops!_all_trans' into 'master'
...
Woops! All trans
See merge request STJr/SRB2!265
2018-08-10 14:27:45 -04:00
Digiku
2f7cfcc7b8
Merge branch 'hardcoding-nights-spheredamage' into 'master'
...
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently
See merge request STJr/SRB2Internal!157
2018-08-10 13:50:57 -04:00
Digiku
e1e00ecb88
Merge branch 'nights-invertloopfix' into 'master'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2Internal!138
2018-08-10 13:49:42 -04:00
mazmazz
9591ac92ec
Pandora's Box support for player->spheres
...
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
2018-08-10 13:15:54 -04:00
MascaraSnake
72796d3d62
Merge branch 'hardcoding-time-again' into 'master'
...
Hardcoding time again
See merge request STJr/SRB2Internal!130
2018-08-10 13:14:53 -04:00
mazmazz
9e8784a376
SETSPHERES console command for debugging/cheating
...
Fixed sphere spill bug where no spheres spill if player->rings is 0
2018-08-10 13:06:53 -04:00
mazmazz
f8a3343500
Track player's previous mare rings with player->finishedrings.
...
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
2018-08-10 04:05:20 -04:00
mazmazz
7a8cdf06f4
Reset player->rings on denightserize and on new mare
2018-08-10 04:01:33 -04:00
mazmazz
37b50ca5a4
Tag damage fix error
2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f
Correct player->spheres deduction upon losing spheres
...
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.
Therefore, just deduct player->spheres.
2018-08-10 02:18:34 -04:00
mazmazz
c2f81eaf8f
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 02:18:24 -04:00
mazmazz
f7a32c9fad
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 02:18:20 -04:00
toaster
dd31c02415
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
toaster
e11a734b2f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
Monster Iestyn
fc68174e8b
Merge branch 'master' into next
2018-08-07 20:54:19 +01:00
Monster Iestyn
c666f5f182
Merge branch 'transparency_i_hardly_knew_er' into 'master'
...
Transparency? I hardly knew 'er!
See merge request STJr/SRB2!264
2018-08-07 15:29:35 -04:00
toaster
ca262dcbba
Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice).
...
Please note I haven't touched the ASM equivalent, given as it's not actually used.
2018-08-07 19:12:10 +01:00
Monster Iestyn
9812df00d6
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
Monster Iestyn
8de4bb2be5
Merge branch 'lua-archive-long-string-fix' into 'next'
...
Fixes for archiving/unarchiving Lua strings in netgames
See merge request STJr/SRB2!262
2018-08-06 10:12:59 -04:00
Monster Iestyn
dcd31eadf8
Merge branch 'password-fix-hotfix' into 'master'
...
Password fix hotfix
See merge request STJr/SRB2!261
2018-08-06 09:43:54 -04:00
Monster Iestyn
2ad792ccd4
Rewrite archiving/unarchiving of Lua strings for netgames.
...
This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)
2018-08-05 22:02:20 +01:00