mazmazz
d92fca91d1
Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof
2018-08-16 23:38:03 -04:00
mazmazz
9f9bf86d2b
Rename dofadeinonly to doghostfade
...
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-16 22:27:26 -04:00
mazmazz
6dd64bccbc
Place backwards Bumpers with the correct Thing angle
2018-08-16 22:07:53 -04:00
Monster Iestyn
004fd77b41
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
Monster Iestyn
0792e78254
Merge branch 'lua-sector-names-fix' into 'next'
...
Lua sector names fix
See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
Monster Iestyn
6797976531
Merge branch 'sdl_mixer_fixes' into 'master'
...
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
mazmazz
5fdece424a
Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace
2018-08-16 16:51:48 -04:00
mazmazz
4aade072ef
Checkpoint (unfinished): player->totalsphere
2018-08-16 13:11:32 -04:00
mazmazz
32939a11f1
Change SETRINGS to support player->spheres in NiGHTS
2018-08-16 12:13:57 -04:00
mazmazz
ed9e74c15a
Line from revert
2018-08-16 11:35:35 -04:00
mazmazz
4b8fd01bc0
Revert "SETSPHERES console command for debugging/cheating"
...
This reverts commit 9e8784a376
2018-08-16 11:34:57 -04:00
mazmazz
2fcb94d408
Make Ideya Anchor use parameter # instead of angle for Ideya ID
2018-08-16 11:25:35 -04:00
mazmazz
675ed7ecf0
Don't apply autobrake on NiGHTS bumpers
2018-08-15 23:40:42 -04:00
mazmazz
c7b914c2ce
Force non-nights player into rolling animation when destructing capsule
2018-08-15 23:11:32 -04:00
mazmazz
2b5dd97446
Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations
2018-08-15 22:35:09 -04:00
mazmazz
baa4c30e99
Also center non-NiGHTS players on NiGHTS bumpers
2018-08-15 19:09:54 -04:00
mazmazz
6010822c84
Use more efficient position setting. For Z, also adjust for bumper mobj scale.
2018-08-15 18:50:28 -04:00
mazmazz
1381ffc3e6
Fix NiGHTS Bumper player positioning
2018-08-15 18:42:20 -04:00
mazmazz
22e95a58da
Recalc capsule timing when leaving the capsule during destruct sequence (somehow)
...
* Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?
2018-08-15 13:59:27 -04:00
mazmazz
8a348794a3
Fix issue where capsule immediately re-triggers if player gains rings during destruct
2018-08-15 13:49:03 -04:00
mazmazz
c072b15e4f
Fixed capsule timing logic
...
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
2018-08-15 13:38:15 -04:00
mazmazz
3288b73ad0
Make camera further if on-foot and destroying the Egg Capsule
2018-08-15 12:29:06 -04:00
mazmazz
513a0a54ec
Counter fix
2018-08-15 12:22:46 -04:00
mazmazz
79ebbdc360
Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule
2018-08-15 12:09:46 -04:00
mazmazz
6ec3aa337c
Checkpoint: Force Egg Capsule time at 60 tics
2018-08-15 00:59:29 -04:00
mazmazz
fd725050d0
Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration
2018-08-15 00:32:48 -04:00
mazmazz
9371441008
Nights capsule faster attract timing
2018-08-14 19:48:18 -04:00
mazmazz
60df69d04c
capsule->extravalue2 tic timer
2018-08-14 19:21:32 -04:00
mazmazz
af2fb1ef97
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
...
# Conflicts:
# src/p_inter.c
2018-08-14 18:08:51 -04:00
mazmazz
9129f17ab0
Look for two anchorpoints if player has two Ideyas
...
* Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 17:48:14 -04:00
mazmazz
0838a81dd9
Ideya fixes when a player has more than one Ideya
...
# Conflicts:
# src/p_inter.c
# Conflicts:
# src/p_inter.c
2018-08-14 17:28:51 -04:00
mazmazz
0a110d9ef4
Ideya fixes when a player has more than one Ideya
...
# Conflicts:
# src/p_inter.c
2018-08-14 17:21:49 -04:00
mazmazz
fe37d1e3e0
Ideya fixes when a player has more than one Ideya
2018-08-14 17:13:23 -04:00
mazmazz
a49aa9babe
Fix bonus time quirk where lines are run if player->marebonuslap is 0
...
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
2018-08-14 16:08:21 -04:00
mazmazz
6ba6454056
Comments
2018-08-14 14:57:58 -04:00
mazmazz
d321ec83e1
Fix issue where player cannot destroy the NiGHTS Capsule if they have not transformed to NiGHTS
2018-08-14 14:18:18 -04:00
mazmazz
9452c02ca1
Fix Capsule Entrance exec firing repeatedly
2018-08-14 12:48:00 -04:00
mazmazz
b1368078c6
Make Bonus Time Start executor into a general Egg Capsule Touch executor
...
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
2018-08-14 12:00:37 -04:00
mazmazz
35bcf200be
Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop
...
* Use MT_EGGCAPSULE extravalue2 for tic timer
2018-08-14 11:41:10 -04:00
mazmazz
3a3976bd71
Make LE Ring triggers accept spheres for NiGHTS levels
2018-08-14 11:10:10 -04:00
mazmazz
e399d08d76
Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres
2018-08-14 10:48:50 -04:00
mazmazz
a2883009ed
Preproc comment out Y_SetLinkBonus because unused
2018-08-14 10:20:56 -04:00
mazmazz
4f5ca26ce5
Attach fade_t thinker to proper control sector upon savegame load
2018-08-13 22:17:58 -04:00
mazmazz
b658598a96
Whitespace
2018-08-13 22:10:16 -04:00
mazmazz
3255fcf26c
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof
2018-08-13 14:47:57 -04:00
mazmazz
53303174c1
MaxBonusLives level header option for # of lives in score tally
2018-08-13 14:17:38 -04:00
mazmazz
2a2569155a
Deduct marescore when player hits ground
...
* ~~For speedrunning~~: Land on the Drone, keep your points!
2018-08-13 11:12:53 -04:00
mazmazz
a177ac38f4
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
2018-08-13 09:51:14 -04:00
mazmazz
539c323838
Make Drone visual elements react to height change
2018-08-13 09:50:50 -04:00
mazmazz
3170d31708
Correct hitboxradius value; proper sparkle->z when moving x/y
2018-08-13 04:49:32 -04:00
