Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move towers + cleanup #59

Merged
merged 19 commits into from
Nov 18, 2021
Merged

Move towers + cleanup #59

merged 19 commits into from
Nov 18, 2021

Commits on Nov 17, 2021

  1. Refactored loot script

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    97425a3 View commit details
    Browse the repository at this point in the history

  2. Renamed AxeTowerController -> AxeTowerAnimationController

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    dc10cd1 View commit details
    Browse the repository at this point in the history

  3. Reordered fields in TowerLogic 

    Also removed the unused `lookingTowards` and `autoShoot` fields.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    0989516 View commit details
    Browse the repository at this point in the history

  4. Added RotatableTowerLogic 

    Also removed the rotation logic from `TowerLogic`, so that only rotatable towers have that logic.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    b6b2e07 View commit details
    Browse the repository at this point in the history

  5. Removed rotation logic from AxeTowerAnimationController 

    This was duplicated from `TowerLogic`.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    50aa5cc View commit details
    Browse the repository at this point in the history

  6. Extracted projectile logic from TowerLogic 

    ...to the separate script, `ProjectileTowerLogic`.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    eb2ed8a View commit details
    Browse the repository at this point in the history

  7. Fixed non-relative tower rotation 

    This fixes the axe tower being rotated wrongly, as its initial rotation is `(-90, 0, 0)` instead of `(0, 0, 0)`.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    da07a10 View commit details
    Browse the repository at this point in the history

  8. Fixed tower arrow pointer not rendering properly

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    56ecbf7 View commit details
    Browse the repository at this point in the history

  9. Added various debug variables in PlayerStateController 

    This makes the values of `HeldInteractable`, `FocusedInteractable`, `LiftedObject` and `TargetCell` visible in the inspector,
but unable to be written to.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    c8d0bbe View commit details
    Browse the repository at this point in the history

  10. Added turret input debug variable in TowerLogic 

    This makes the value of `TurretInput` visible in the inspector, but unable to be written to.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    19145a5 View commit details
    Browse the repository at this point in the history

  11. Specified type of TowerScript's tower prefab

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    8dd4cc2 View commit details
    Browse the repository at this point in the history

  12. Moved logic for instantiating construction tower 

    ...to `TowerScript`.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    9f3beb6 View commit details
    Browse the repository at this point in the history

  13. Added TowerScript field to TowerLogic

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    760e6fd View commit details
    Browse the repository at this point in the history

  14. Fixed keyboard keys mapped to physical location 

    They're now mapped to the character typed - no matter the physical location.
    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    9c50719 View commit details
    Browse the repository at this point in the history

  15. Added move tower button

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    39ab655 View commit details
    Browse the repository at this point in the history

  16. Made Move tower button move towers

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    1527697 View commit details
    Browse the repository at this point in the history

  17. Small code cleanup of PlayerStateController

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    049b213 View commit details
    Browse the repository at this point in the history

  18. Updated tower script README

    @ddabble
    ddabble committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    1f5af20 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/move-towers 

    # Conflicts:
#	Assets/Prefabs/PlayerControls.inputactions
#	Assets/Scripts/Player/PlayerControls.cs
#	Assets/Scripts/Player/PlayerStateController_Input.cs
    @ddabble
    ddabble committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    3251f67 View commit details
    Browse the repository at this point in the history