7 Years Ago
repel bullets over time, lerp impulse friction lerp friction for movementcontrollers tweak bullet danger slowdown bullets use impulse velocity tentacle diamond bullets fixed keyboard movement lerping removed braking and boosting diamond bullets for octopus robot diamond bullets cleaned up gamemanager cleanup, better pixel explosions Merge remote-tracking branch 'refs/remotes/origin/master' into replays # Conflicts: # Assets/Scenes/game.unity # Assets/Scripts/Bullets/Bullet.cs # Assets/Scripts/GameManager/GameManager.cs # Assets/Scripts/Player/Components/Player_Body.cs # Assets/Scripts/Player/Components/Player_Boosting.cs # Assets/Scripts/Player/Components/Player_Braking.cs # Assets/Scripts/Player/Components/Player_Camera.cs # Assets/Scripts/Player/Components/Player_Hitbox.cs # Assets/Scripts/Player/Components/Player_Input.cs # Assets/Scripts/Player/Components/Player_Trail.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Pxc/PxcComponents/Pxc_Collision.cs # Assets/Scripts/Stages/Stage.cs # Assets/Scripts/Units/Robot/Robot.cs