unity
opened unity
doctor winking, start of character reaction
Juice Day

worked on water bottle but it’s not resetting properly
added shadow/collider to character
opened unity
synchronizing two computers
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
a looooot of changes, check descrip

-Added Shadows to all animals and obstacles except infections (pending
animation changes)
-Added Rotation to Soccer Ball
-Added colliders to animals to prevent leaving the scene vertically
-Minor changes to dialog animator (currently dialog box is
malfunctioning)
-Fixed aspect ratio problem in level selector
-Updated bystanders (there are only two)
-Added Water Bottle “blow up” Animation
-Added Pain Killer +/- 1 animations
-Made Hospitals as well as some other obstacles more “bouncy” in order
to prevent getting stuck
-Added Sprite Zoo Tile
-Added Sprite Sand Tile
-Added GUI Camera Prefab, needs to be added to each level as main
camera has been modified
-Updated Wave animation to be sprite crossfade
-Updated Dialog Box sprite with shadow (need to resize for level
complete menu)
Merge branch 'master' into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
started slider for sensitivity select
Multiple changes, Game Options changed

- Changed some physics interactions
- Nets stay in the scene after launched
- Game Options menu changes to include sensitivity and section to test
it’s effects, added left and right arrows for character selection
Merge pull request #189 from ebbyw/Ebby

Ebby