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

Fix misc. #49

Merged
merged 14 commits into from
Oct 17, 2021
Merged

Fix misc. #49

merged 14 commits into from
Oct 17, 2021

Commits on Oct 11, 2021

  1. Renamed Back button to Cancel + changed key to Esc

    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    b33da98 View commit details
    Browse the repository at this point in the history

  2. Converted some fields to auto-properties

    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    24d8825 View commit details
    Browse the repository at this point in the history

  3. Moved class enums to outside of class 

    It might be a better idea to move the enums to separate files, but this will do for now.
    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    cb73614 View commit details
    Browse the repository at this point in the history

  4. Code cleanup

    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    5331644 View commit details
    Browse the repository at this point in the history

  5. Made Interactable an abstract class 

    Also reordered some of the overridden methods, so that they appear in the same order as in the abstract class.
    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    abbf291 View commit details
    Browse the repository at this point in the history

  6. Made PlayerStateController.interactables a set 

    This removes the need to check whether an element exists in the set, which is fairly inefficient compared to just using a set.
    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    3220f55 View commit details
    Browse the repository at this point in the history

  7. Added debug variable for current player state 

    This makes the value of `CurrentState` visible in the inspector, but unable to be written to.
    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    8ee029e View commit details
    Browse the repository at this point in the history

  8. Only update/set focused interactable in specific states 

    This fixes a bug that let the player change the direction of nearby towers while in the turret selection menu.
    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    38ab01b View commit details
    Browse the repository at this point in the history

  9. Removed unused code in TurretInput

    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    acdf9ba View commit details
    Browse the repository at this point in the history

  10. Reordered Unity event method

    @ddabble
    ddabble committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    49d8f1d View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2021

  1. Made focus methods in Interactable non-abstract

    @ddabble
    ddabble committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    df61784 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into fix/misc 

    # Conflicts:
#	Assets/Scripts/Player/PlayerStateController.cs
#	Assets/Scripts/Player/PlayerUi.cs
    @ddabble
    ddabble committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    6d2adca View commit details
    Browse the repository at this point in the history

  3. Added variables for customizing base explosion

    @ddabble
    ddabble committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    7f4ce6e View commit details
    Browse the repository at this point in the history

  4. Code cleanup

    @ddabble
    ddabble committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    37b8cf1 View commit details
    Browse the repository at this point in the history