DogModel

My first pass at the dog model, looks better in game than expected.
Merge remote-tracking branch 'origin/MoreModeling(Garrett)' into Monk-Path-Work

Conflicts:
	game/Content/LVL_HomeSegment.Level.data
Later Path Work

Created the mountainous part of the path along with stones, trees, and a
gap for the Monk's Cave.
Diviner Path Work

Added dead trees, mushrooms, and more scenery
Merge branch 'master' into Monk-Path-Work

Conflicts:
	game/Content/FamilyHouse.Archetype.data
	game/Content/FamilyHouse.Archetype.data.meta
	game/Content/FamilyHouse.fbx.meta
	game/Content/LVL_HomeSegment.Level.data
Revert "Merge branch 'master' into Monk-Path-Work"

This reverts commit 968089a71f0e1b290bba3e6e63b6126d849bee4e, reversing
changes made to 9ae5e38ce50fdf79f3c84552c8dc0cacb2c7d69a.
Test Commit
Merge branch 'master' into Monk-Path-Work
Geometry

So much geometry painting. Too much.
Also, changed water to be one large cube to make things easier.
Ghost bridge!
MonkPathWork

So much monking its insane.
path bounds
bridge collapse triggered by walking off path
home is a safe zone
more world details
Added diviner interior

It is to the left of the diviner map
Merge branch 'Monk-Path-Work'

Conflicts:
	assets/2d/ui-screens-template.ai
	assets/2d/ui/Thumbs.db
	assets/3d/FatManEnenemy.max
	concepts/characters/dialog-boxes-v01.ai
	concepts/ui/Thumbs.db
	concepts/ui/heart/heart-meter-v01.png
	concepts/ui/heart/heart-ui-v02.ai
	concepts/ui/heart/heart-ui-v02.png
	concepts/ui/heart/heart-ui-v03.ai
	concepts/ui/screens/screens-v01.ai
	concepts/ui/temp/ui-screens-template.ai
	concepts/ui/textboxes/textboxes-v01.ai
	concepts/ui/textboxes/textboxes-v02.ai
	concepts/ui/ui-screens-template.ai
	documents/diagram-xbox-controller-v01.png
	documents/weekly-logs/previous-weeks/Week 12/GAM205_WeeklyLog_TravisMoore_12.docx
	game/Content/BasicTree.Archetype.data
	game/Content/BirdController.z
	game/Content/BridgeCollisionMesh.Archetype.data
	game/Content/CustomEvents.z
	game/Content/EndSegment.z
	game/Content/EnemyAI_Manager.z
	game/Content/HUD.Level.data
	game/Content/LVL_Home.Level.data
	game/Content/LanternDemon.Archetype.data
	game/Content/OrbitCameraController.z
	game/Content/Player.Archetype.data
	game/Content/Rock1.Archetype.data
	game/Content/Rock2.Archetype.data
	game/Content/Rock3.Archetype.data
	game/Content/Rock4.Archetype.data
	game/Content/TestTextBlock.txt
	game/Content/TextBoxManager.z
	game/Content/TextBoxTester.z
	game/Content/TextScrollManager.z
	game/Content/TextScrollTester.z
	game/Content/TextTextBlock.txt
	game/Content/ThornArm.Archetype.data
	game/Content/ZoomZone.z
Second Commit
Merge branch 'ui-branch'

Conflicts:
	assets/2d/ui/heart/Thumbs.db
	assets/2d/ui/textboxes/Thumbs.db