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

Develop #34

Merged
merged 35 commits into from
Feb 28, 2018
Merged

Develop #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8a3032a
Camera rig rotates towards penguins on load
ddabble Feb 12, 2018
ab1dea1
Rotated towers in level1.unity
hackerspacevr Feb 14, 2018
f1f53df
Enemy spawning refactor
ddabble Feb 15, 2018
db122f1
Readded setting random Enemy pitch
ddabble Feb 15, 2018
9aaeb3a
Improved enemy idle sound
ddabble Feb 17, 2018
a1c4bc6
Code cleanup
ddabble Feb 17, 2018
7111741
Tidied enemy audio folder
ddabble Feb 17, 2018
e2b6e88
Enforce various Manager singletons
ddabble Feb 17, 2018
3ff0df7
Enemies play idle sound after period of silence
ddabble Feb 18, 2018
3d0deea
should have fixed the teleportion through ice
Feb 19, 2018
8e054d9
All spells now ignores teleport arc
hackerspacevr Feb 19, 2018
d411b37
Added explosion to fireball. +some tweaks to spells
hackerspacevr Feb 19, 2018
dc44705
made the values in scripts be same as prefabs
hackerspacevr Feb 19, 2018
6be2db2
tweaked magicBook to be balanced powerful
hackerspacevr Feb 19, 2018
c6a18e1
fixed fireball sphereCollider too small
hackerspacevr Feb 19, 2018
e36d78f
tweaked lighting settings for the scenes
hackerspacevr Feb 19, 2018
d4da584
Butterfly with animation
MiriamFi Feb 20, 2018
703cd47
Added various decorations to level1
ddabble Feb 20, 2018
f4accb6
Added fireball particle sound, fixes #33
ddabble Feb 21, 2018
292758c
Shortened Lose_music
ddabble Feb 21, 2018
8becf41
Game resets after Lose_music has finished playing
ddabble Feb 21, 2018
d6ba25e
Cleaned up penguin baby code and prefabs
ddabble Feb 21, 2018
7dc111f
Improved Fireball collision
ddabble Feb 21, 2018
37fba82
Moved trees in level1
ddabble Feb 21, 2018
5a253ae
Optimized MagicBook prefab rig
ddabble Feb 21, 2018
fee1bf0
Removed goal teleport
hackerspacevr Feb 21, 2018
d93a014
Butterfly now has working animation
hackerspacevr Feb 21, 2018
0cbb155
Enemies don't spam hurt sounds from Fireball
ddabble Feb 21, 2018
6cbcbbf
Removed NatureStarterKit asset
hackerspacevr Feb 21, 2018
8eb4879
Tidied Butterfly positions and assets
ddabble Feb 21, 2018
6bf1ca4
Removed traces of NatureStarterKit scripts
hackerspacevr Feb 21, 2018
d843e03
Randomized Butterfly flapping speed
ddabble Feb 21, 2018
a09717e
Enemies make warning sound when close to goal
ddabble Feb 22, 2018
d08b9b6
Readded camera rig rotate focus objects
ddabble Feb 22, 2018
bd6d8b4
Harder to accidentally load level from menu
ddabble Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Assets/NatureStarterKit.meta → Assets/Audio/Enemies/Bear.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Assets/Audio/Enemies/Bear_death.ogg → Assets/Audio/Enemies/Bear/Bear_death.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_death.ogg.meta → ...ts/Audio/Enemies/Bear/Bear_death.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 1.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 2.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 3.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_hurt - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 1.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 2.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 3.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 4.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 4.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Bear_idle - 4.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 4.ogg.meta
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions Assets/NatureStarterKit/Materials.meta → Assets/Audio/Enemies/Fox.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Assets/Audio/Enemies/Fox_death - 1.ogg → Assets/Audio/Enemies/Fox/Fox_death - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_death - 1.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_death - 2.ogg → Assets/Audio/Enemies/Fox/Fox_death - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_death - 2.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 1.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 2.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 3.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_hurt - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 1.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 2.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 3.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Fox_idle - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions Assets/NatureStarterKit/Animations.meta → Assets/Audio/Enemies/Wolf.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Assets/Audio/Enemies/Wolf_barks - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 4.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 4.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 5.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_barks - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 5.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_death.ogg → Assets/Audio/Enemies/Wolf/Wolf_death.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_death.ogg.meta → ...ts/Audio/Enemies/Wolf/Wolf_death.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 4.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 4.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 5.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 5.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 6.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 6.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_growl - 6.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 6.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 1.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 1.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 1.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 2.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 2.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 2.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 3.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 3.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 3.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 4.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 4.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 4.ogg.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 5.ogg
View file
Open in desktop
File renamed without changes.
0 Assets/Audio/Enemies/Wolf_hurt - 5.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 5.ogg.meta
View file
Open in desktop
File renamed without changes.
Binary file modified Assets/Audio/Music/Lose_music.mp3
View file
Open in desktop
Binary file not shown.
Loading