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.

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

Feature/interactive tutorial #101

Merged
merged 14 commits into from
Mar 17, 2022
Merged

Conversation

ThomasJGabrielsen
Copy link
Contributor

No description provided.

Fueredoriku and others added 7 commits October 11, 2021 00:36
Added new textures
Added functionality to display specific buttons to press
Created TutoralText.cs to handle the new interactions
Added TutorialCanvas prefab
Added selling highlight
Changed tutorial text highlighting to a per case basis
Updated AxeTurret.prefab to work with new functions
Updated AxeTurretHolo.prefab to also display tips
Altered pulsating button animation to not show on the northUI button
Bug discovered: if a player is targeting a tower as it dies the player cannot select anything else until a respawn.
Added TutorialCanvas to Loot Crystal
Implemented tutorial images for loot crystals
@jesper2k
Copy link
Contributor

Looks good. UI could be a bit bigger, but this might work on bigger screens anyway.

Fueredoriku and others added 7 commits March 17, 2022 17:42
…e-tutorial

# Conflicts:
#	Assets/Prefabs/Towers/LightningTurret/LightningTurret.prefab
…e-tutorial

# Conflicts:
#	Assets/Prefabs/Towers/AxeTurret/AxeTurret.prefab
#	Assets/Prefabs/Towers/LightningTurret/LightningTurret.prefab
Updated AxeTurretHolo to use a prefab of tutorialcanvas instead of an unlinked gameobject
Copy link
Contributor

@Fueredoriku Fueredoriku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good, works as intended on my machine! 🎉

@ThomasJGabrielsen ThomasJGabrielsen merged commit 46c3369 into develop Mar 17, 2022
@ThomasJGabrielsen ThomasJGabrielsen deleted the feature/interactive-tutorial branch March 17, 2022 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants