8 Years Ago
tweaked pixel debris removed powerup class, added bubble shield, etc refactoring patterns, octopus done tentacle partially converted to forms working on respawning with child pxcs fixed some issues with respawning while having child pxcs fixed respawn core bug tweaked pxc collision danger slowdown amount form core handled like other parts reworking spritecontroller animation spritecontroller default anim animated sprite controller load spritesheet anims from json rehooked up octopus rehooked up tentacle, bullets can avoid player instead of homing Merge remote-tracking branch 'refs/remotes/origin/master' into replays # Conflicts: # Assets/Resources/Units/Octopus.prefab # Assets/Resources/Units/OctopusTurret.prefab # Assets/Resources/Units/TentacleMonster.prefab # Assets/Scenes/game.unity # Assets/Scripts/Chunks/PixelGroupChunk.cs # Assets/Scripts/GameManager/GameManager.cs # Assets/Scripts/GameManager/ImportManager.cs # Assets/Scripts/Globals.cs # Assets/Scripts/Laser.cs # Assets/Scripts/Player/Components/Player_Body.cs # Assets/Scripts/Player/Components/Player_Health.cs # Assets/Scripts/Player/Components/Player_Powerups.cs # Assets/Scripts/Player/Guns/PlayerGun.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Pxc/Pxc.cs # Assets/Scripts/Stages/Levels/BossStage.cs # Assets/Scripts/Stages/Levels/HubStage.cs # Assets/Scripts/Stages/Levels/OctopusStage.cs # Assets/Scripts/Stages/Levels/RobotStage.cs # Assets/Scripts/Stages/Levels/TentacleStage/TentacleStage.cs # Assets/Scripts/Stages/Levels/YellowStage/YellowStage.cs # Assets/Scripts/Stages/StageComponents/Stage_LineParticles.cs # Assets/Scripts/Units/Octopus/Octopus.cs # Assets/Scripts/Units/Octopus/OctopusTurret.cs # Assets/Scripts/Units/Portal/Gate.cs # Assets/Scripts/Units/Portal/Portal.cs # Assets/Scripts/Units/Robot/Robot.cs # Assets/Scripts/Units/TentacleMonster/Tentacle.cs # Assets/Scripts/Units/TentacleMonster/TentacleMonster.cs # Assets/Scripts/Units/UnitComponents/Unit_Forms.cs # Assets/Scripts/Units/UnitComponents/Unit_Pxc.cs # Assets/Scripts/Units/YellowGuy/YellowGuy.cs