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

Pirate lady #60

Merged
merged 12 commits into from
Nov 26, 2021
Merged

Pirate lady #60

merged 12 commits into from
Nov 26, 2021

Commits on Nov 10, 2021

  1. added pirate lady model

    @magsve
    magsve committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    3d0f5b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. updated pirate lady model, added textures and animations.

    @magsve
    magsve committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    ae3760e View commit details
    Browse the repository at this point in the history

  2. set up a player prefab and set up animations for the pirate lady

    @magsve
    magsve committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    fdf3203 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2021

  1. pirate lady's got blendtrees! Ready to be used (woohoo!)

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

Commits on Nov 19, 2021

  1. Made playerspecificinputmanager spawn different playermodels for diff… 

    …erent controllers. Renamed models.
    @Fueredoriku
    Fueredoriku committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    3823650 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. manual merge.

    @Fueredoriku
    Fueredoriku committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    a9545b4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into pirate-lady 

    # Conflicts:
#	Assets/Prefabs/Player/PlayerCharacters/Dahl_Player.prefab
#	Assets/Prefabs/Player/PlayerCharacters/Dahl_Player.prefab.meta
#	Assets/Prefabs/Player/PlayerCharacters/Player_Dahl.prefab
#	Assets/Prefabs/Player/PlayerCharacters/Player_Dahl.prefab.meta
#	Assets/Prefabs/Player/PlayerCharacters/Player_Pirate.prefab
#	Assets/Prefabs/Player/PlayerCharacters/Player_Pirate.prefab.meta
#	Assets/Prefabs/Players/Dahl_Player.prefab
#	Assets/Prefabs/Players/Dahl_Player.prefab.meta
    @ddabble
    ddabble committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    2254ee1 View commit details
    Browse the repository at this point in the history

  3. Tiny code cleanup

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

  4. Fixed exception for non-existent interactables

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

  5. Cleaned up file placements 

    ...specifically files in the `Animations`, `Materials`, `Models` and `Textures` folders.
    @ddabble
    ddabble committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    5ab5f0d View commit details
    Browse the repository at this point in the history

  6. Cleaned up Player_Pirate prefab component order

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

  7. Replaced copy of prefab with reference to prefab 

    ...in `Player_Pirate.prefab` - same as in dbdd4e4.
    @ddabble
    ddabble committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    5938110 View commit details
    Browse the repository at this point in the history