0000000000000000000000000000000000000000 b2249b7deed3a2ae3d7e5e8ea67be0decb11962c Caleb Markley <cablay91@gmail.com> 1548473400 -0800	commit (initial): Initial commit
b2249b7deed3a2ae3d7e5e8ea67be0decb11962c 1ef45e97d6125e05dd914bc329c35ac2c1676b36 Caleb Markley <cablay91@gmail.com> 1548477696 -0800	commit: Create Unity Project
1ef45e97d6125e05dd914bc329c35ac2c1676b36 7bdcf17b3708da309607cdfe4f59906707560936 Caleb Markley <cablay91@gmail.com> 1548483853 -0800	commit: Initial Interactions
7bdcf17b3708da309607cdfe4f59906707560936 66ec7e2625bb2556acfa9710088aee61307036b4 Caleb Markley <cablay91@gmail.com> 1548483856 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
66ec7e2625bb2556acfa9710088aee61307036b4 a17b558f4d44e37848da117932d61bf0e45881bf Caleb Markley <cablay91@gmail.com> 1548484714 -0800	commit: Add interaction
a17b558f4d44e37848da117932d61bf0e45881bf cb0e45bcd41bb9bff84db5b739c39aaea3c95cfc Caleb Markley <cablay91@gmail.com> 1548484863 -0800	commit: Add prefabs folder
cb0e45bcd41bb9bff84db5b739c39aaea3c95cfc 48014bfc7e61eda116eb6adde4af7f48c6b38097 Caleb Markley <cablay91@gmail.com> 1548486271 -0800	commit: Add EventManager
48014bfc7e61eda116eb6adde4af7f48c6b38097 645d8116dd25881159a6c7c8069d37c368182bce Caleb Markley <cablay91@gmail.com> 1548491166 -0800	commit: Goals
645d8116dd25881159a6c7c8069d37c368182bce 28b49d3e1c3f489e869e48b2c6395a9714adb1e6 Caleb Markley <cablay91@gmail.com> 1548521661 -0800	commit: Add Zones
28b49d3e1c3f489e869e48b2c6395a9714adb1e6 3acd0e4a1385171146077db506e6c54860d33b04 Caleb Markley <cablay91@gmail.com> 1548521797 -0800	commit: Update ZoneManager.cs
3acd0e4a1385171146077db506e6c54860d33b04 7a481edeb2191daaf295ab08971344d8c2c8cfc5 Caleb Markley <cablay91@gmail.com> 1548522459 -0800	commit: Add self-registering zones
7a481edeb2191daaf295ab08971344d8c2c8cfc5 f1a5228d917ee0f4691ce7a383fded254ecdf60d Caleb Markley <cablay91@gmail.com> 1548523723 -0800	commit: GoalData refactor
f1a5228d917ee0f4691ce7a383fded254ecdf60d b5818c69af275a501ffaf50620f1c5c2b9b93a6e Caleb Markley <cablay91@gmail.com> 1548523883 -0800	commit: Update GoalData assets
b5818c69af275a501ffaf50620f1c5c2b9b93a6e dd1eb0b344d0b474ab6423a2be959c1af67dc485 Caleb Markley <cablay91@gmail.com> 1548534318 -0800	commit: Add Feedback UI
dd1eb0b344d0b474ab6423a2be959c1af67dc485 5c3b1b25b8e58b279ba94b34e644cecc68ed1273 Caleb Markley <cablay91@gmail.com> 1548534808 -0800	pull --no-rebase --progress origin: Fast-forward
5c3b1b25b8e58b279ba94b34e644cecc68ed1273 7d25b4731c92881d7b0f9d62b65cac63f607a274 Caleb Markley <cablay91@gmail.com> 1548538784 -0800	revert: Revert "Merge branch 'master' of github.com:cablay/GGJ2019"
7d25b4731c92881d7b0f9d62b65cac63f607a274 a3aed6a4b1e07f9120060c54481381ff32f131d5 Caleb Markley <cablay91@gmail.com> 1548538816 -0800	revert: Revert "Revert "Merge branch 'master' of github.com:cablay/GGJ2019""
a3aed6a4b1e07f9120060c54481381ff32f131d5 71e3ba6ad0f246ebb2fd231fdc4b51b24e1ea4dd Caleb Markley <cablay91@gmail.com> 1548540872 -0800	commit: Add Dog Idle
71e3ba6ad0f246ebb2fd231fdc4b51b24e1ea4dd ef7ee5b675bd64e2c540b6d4e8870bb4d8b1d89c Caleb Markley <cablay91@gmail.com> 1548541199 -0800	commit: Update Dog Movement
ef7ee5b675bd64e2c540b6d4e8870bb4d8b1d89c ed4b198fe5479d6364e2449d381283067e667d73 Caleb Markley <cablay91@gmail.com> 1548541961 -0800	commit: Add directional dog anims
ed4b198fe5479d6364e2449d381283067e667d73 ec9f3682133f45d8690d224fe1683951550772f4 Caleb Markley <cablay91@gmail.com> 1548542467 -0800	commit: Tune dog movement
ec9f3682133f45d8690d224fe1683951550772f4 d5636f4c2c932e83be50765010f4039e84ee4e55 Caleb Markley <cablay91@gmail.com> 1548549506 -0800	commit: Blocked out house
d5636f4c2c932e83be50765010f4039e84ee4e55 ef7229a1fa68a955e9c94ffd0e21bed8ecad804f Caleb Markley <cablay91@gmail.com> 1548549625 -0800	commit: Update walls
ef7229a1fa68a955e9c94ffd0e21bed8ecad804f c1f7c01c2749049a6f377028d6d0041cd2ea579e Caleb Markley <cablay91@gmail.com> 1548549690 -0800	commit: Update house
c1f7c01c2749049a6f377028d6d0041cd2ea579e 63413ff7ee687e9fb254713b0896cc4238267514 Caleb Markley <cablay91@gmail.com> 1548550385 -0800	commit: Add Zones
63413ff7ee687e9fb254713b0896cc4238267514 a0d4f137314a5ab7adb6433f348154af59a06001 Caleb Markley <cablay91@gmail.com> 1548555505 -0800	pull --no-rebase --progress origin: Fast-forward
a0d4f137314a5ab7adb6433f348154af59a06001 d1fe0d081017bde6d9987aab3e5403b8fcea0c5b Caleb Markley <cablay91@gmail.com> 1548555713 -0800	pull --no-rebase --progress origin: Fast-forward
d1fe0d081017bde6d9987aab3e5403b8fcea0c5b aaa6c01a1b9a4a46704deb42800003c306ec58be Caleb Markley <cablay91@gmail.com> 1548556845 -0800	commit: Fern
aaa6c01a1b9a4a46704deb42800003c306ec58be 767907d76d873e2833405ea33de6ce78e55f63cf Caleb Markley <cablay91@gmail.com> 1548557535 -0800	commit: Update Bone
767907d76d873e2833405ea33de6ce78e55f63cf 38b359925943a7d7f1dee0093a0c8ba741e126e9 Caleb Markley <cablay91@gmail.com> 1548558662 -0800	commit: Add wiggle frames
38b359925943a7d7f1dee0093a0c8ba741e126e9 759aef0440bb3f7d2a1f0826298a5dcf82dd00aa Caleb Markley <cablay91@gmail.com> 1548559972 -0800	commit: Update Hands
759aef0440bb3f7d2a1f0826298a5dcf82dd00aa 373c0515866adac683973c5a98f3f5099f2d3b9e Caleb Markley <cablay91@gmail.com> 1548563225 -0800	commit: Add fridge
373c0515866adac683973c5a98f3f5099f2d3b9e a9b2d7324203c2c0ab14a76bfd44502aebffeccc Caleb Markley <cablay91@gmail.com> 1548563306 -0800	commit: Update StickGoal
a9b2d7324203c2c0ab14a76bfd44502aebffeccc 4f408c03c62feaf23e1eebaa4b4c5c2620b8c536 Caleb Markley <cablay91@gmail.com> 1548564048 -0800	commit: Stick
4f408c03c62feaf23e1eebaa4b4c5c2620b8c536 9d627538ad28a335f87657996e07190e2612cbe6 Caleb Markley <cablay91@gmail.com> 1548564407 -0800	commit: Allow for multiple colliders per zoneId
9d627538ad28a335f87657996e07190e2612cbe6 c672c119b2f4254a2cb43acd243abee900d78b7a Caleb Markley <cablay91@gmail.com> 1548564693 -0800	commit: Tint hand outlines
c672c119b2f4254a2cb43acd243abee900d78b7a 1cdf6bcf56efbe43cdb86d21a5f6040668a45a60 Caleb Markley <cablay91@gmail.com> 1548565314 -0800	commit: Add new goals
1cdf6bcf56efbe43cdb86d21a5f6040668a45a60 23347fcf2cd8bdcc2f9399022c7a2086c8993ec3 Caleb Markley <cablay91@gmail.com> 1548567686 -0800	pull --no-rebase --progress origin: Fast-forward
23347fcf2cd8bdcc2f9399022c7a2086c8993ec3 14b016141cc47624e7d97da5f48ba3ba65f785fe Caleb Markley <cablay91@gmail.com> 1548567690 -0800	commit: Add in-scene items
14b016141cc47624e7d97da5f48ba3ba65f785fe 2ff686b35353ab5d9314ce3d971abd030c8093d3 Caleb Markley <cablay91@gmail.com> 1548567761 -0800	commit: Move dog assets
2ff686b35353ab5d9314ce3d971abd030c8093d3 25d564a8855a0b75d77e3efa6571fab753dd493b Caleb Markley <cablay91@gmail.com> 1548567856 -0800	commit: Update test scene
25d564a8855a0b75d77e3efa6571fab753dd493b 0a76fc739fee7c9b5b102c1d34b4f77b6098ab46 Caleb Markley <cablay91@gmail.com> 1548570314 -0800	commit: Hook up real assets
0a76fc739fee7c9b5b102c1d34b4f77b6098ab46 741f1f31dfa9b5cfa16bb518def78425cb1f3087 Caleb Markley <cablay91@gmail.com> 1548571398 -0800	pull --no-rebase --progress origin: Fast-forward
741f1f31dfa9b5cfa16bb518def78425cb1f3087 b9fe988b4f6507df12dbe6a3963609bd40c7245e Caleb Markley <cablay91@gmail.com> 1548572698 -0800	commit: Score and TImer
b9fe988b4f6507df12dbe6a3963609bd40c7245e f4e3c8a3f3c17511324f06164204171b0383cbd0 Caleb Markley <cablay91@gmail.com> 1548574464 -0800	commit: Game flow
f4e3c8a3f3c17511324f06164204171b0383cbd0 7cf89b089d149d913709ea945d8cfb9c304d5318 Caleb Markley <cablay91@gmail.com> 1548575053 -0800	pull --no-rebase --progress origin: Fast-forward
7cf89b089d149d913709ea945d8cfb9c304d5318 4c90541e1217ff2244193b2c0498d408fd6253b3 Caleb Markley <cablay91@gmail.com> 1548575526 -0800	commit: Add TItle Screen
4c90541e1217ff2244193b2c0498d408fd6253b3 c8b06e9eab824fc1355adec0c9ade4cd1dcb3442 Caleb Markley <cablay91@gmail.com> 1548576449 -0800	commit: Finish game start flow
c8b06e9eab824fc1355adec0c9ade4cd1dcb3442 2e98e7ae40b3acf81adc8d9b3194cdf0086079f2 Caleb Markley <cablay91@gmail.com> 1548577957 -0800	pull --no-rebase --progress origin: Fast-forward
2e98e7ae40b3acf81adc8d9b3194cdf0086079f2 f531bb7b301bd61dba874f3946f35d69ae733b07 Caleb Markley <cablay91@gmail.com> 1548578759 -0800	commit: Finish Game Logic Loop
f531bb7b301bd61dba874f3946f35d69ae733b07 ff7acefc0d91d2bddd025465ae4cabb0f5cfdbcf Caleb Markley <cablay91@gmail.com> 1548578951 -0800	commit: Add objects back into scene
ff7acefc0d91d2bddd025465ae4cabb0f5cfdbcf f03aeb742b4962664e606b8ae982f3b4c59a35be Caleb Markley <cablay91@gmail.com> 1548615035 -0800	pull --no-rebase --progress origin: Fast-forward
f03aeb742b4962664e606b8ae982f3b4c59a35be d055cb3fe86240786d6a24436189b4d89212142a Caleb Markley <cablay91@gmail.com> 1548615368 -0800	commit: Update test scenes
d055cb3fe86240786d6a24436189b4d89212142a d4cd1bef06ecaef74d86291a1c72dc11e5bfc531 Caleb Markley <cablay91@gmail.com> 1548617985 -0800	commit: Add action animation
d4cd1bef06ecaef74d86291a1c72dc11e5bfc531 d115cd119b18c21a1b3d722d609e4e8f93872718 Caleb Markley <cablay91@gmail.com> 1548618064 -0800	commit: Update audio mixer
d115cd119b18c21a1b3d722d609e4e8f93872718 870c91b2b6d6bec0fb48c83dd6a6f6f2f3469b9b Caleb Markley <cablay91@gmail.com> 1548618648 -0800	commit: Add temp wall asset
870c91b2b6d6bec0fb48c83dd6a6f6f2f3469b9b df05d6b9f6b0e37cc431fd86b216745486ae41fd Caleb Markley <cablay91@gmail.com> 1548620049 -0800	commit: Add beds
df05d6b9f6b0e37cc431fd86b216745486ae41fd 7b2cacdcbe160161a79c7734171b899c268dae42 Caleb Markley <cablay91@gmail.com> 1548620067 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
7b2cacdcbe160161a79c7734171b899c268dae42 39c9c92ad4994855cb87ff296be41ea88bec9cbe Caleb Markley <cablay91@gmail.com> 1548620137 -0800	commit: Update goals
39c9c92ad4994855cb87ff296be41ea88bec9cbe beb64cdba8e07f3943841713c8c866072d27b160 Caleb Markley <cablay91@gmail.com> 1548621002 -0800	commit: Add trees
beb64cdba8e07f3943841713c8c866072d27b160 dfb71f9a979b19165145d32ec6dee26515a5e15d Caleb Markley <cablay91@gmail.com> 1548621125 -0800	commit: Move trees
dfb71f9a979b19165145d32ec6dee26515a5e15d 3b9407a0413d4def810d21f9e730254a712e76b7 Caleb Markley <cablay91@gmail.com> 1548621136 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
3b9407a0413d4def810d21f9e730254a712e76b7 21ead265190da2e6ad9de6ef1cc91a9a750b181f Caleb Markley <cablay91@gmail.com> 1548622546 -0800	commit: Add TV and Bush
21ead265190da2e6ad9de6ef1cc91a9a750b181f 13cb24ccb82daeca8ad482298bf84373e73a921b Caleb Markley <cablay91@gmail.com> 1548622868 -0800	pull --no-rebase --progress origin: Fast-forward
13cb24ccb82daeca8ad482298bf84373e73a921b 08c6a5fd062f8ef3d65dd3e876e557bc296a7d0c Caleb Markley <cablay91@gmail.com> 1548623228 -0800	commit: Update main scene
08c6a5fd062f8ef3d65dd3e876e557bc296a7d0c a48caeb1a3c8480ba4276cc70f258ca6788cb5e9 Caleb Markley <cablay91@gmail.com> 1548623238 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a48caeb1a3c8480ba4276cc70f258ca6788cb5e9 65f0e64ac5ae39fe44a80b6e0dc0203d673d0ed3 Caleb Markley <cablay91@gmail.com> 1548623458 -0800	commit: Lose points on wrong guess
65f0e64ac5ae39fe44a80b6e0dc0203d673d0ed3 38fcb2894ed07f2090a87238d61289d73d09f5e3 Caleb Markley <cablay91@gmail.com> 1548623649 -0800	commit: Update bush and tv
38fcb2894ed07f2090a87238d61289d73d09f5e3 e0f56edd8c9d367c339f271abd88588e43ef49cf Caleb Markley <cablay91@gmail.com> 1548625740 -0800	commit: Camera and UI for goal complete
e0f56edd8c9d367c339f271abd88588e43ef49cf 070fc2c8a3223586b9abeb22a2fbb3df2ab29cc9 Caleb Markley <cablay91@gmail.com> 1548625746 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
070fc2c8a3223586b9abeb22a2fbb3df2ab29cc9 acc9b423f91b36841baf73f89273864b5d9c5562 Caleb Markley <cablay91@gmail.com> 1548626340 -0800	commit: Update Score
acc9b423f91b36841baf73f89273864b5d9c5562 c550d21d76fee950187bce02ed3b213da7fec327 Caleb Markley <cablay91@gmail.com> 1548626690 -0800	commit: Update score anim
c550d21d76fee950187bce02ed3b213da7fec327 ce4fe8523535178f7ec002eaa226c32ad889a580 Caleb Markley <cablay91@gmail.com> 1548626699 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
ce4fe8523535178f7ec002eaa226c32ad889a580 bd67cf6f36213d497bd8e99f05a72dffc9135efe Caleb Markley <cablay91@gmail.com> 1548627433 -0800	commit: Change title
bd67cf6f36213d497bd8e99f05a72dffc9135efe fe7e654f16d0b57ef947246f180da530871d5117 Caleb Markley <cablay91@gmail.com> 1548628072 -0800	commit: Add sound lines to bark
fe7e654f16d0b57ef947246f180da530871d5117 2df275623f1434c10b38b053ef8df242544bc913 Caleb Markley <cablay91@gmail.com> 1548628079 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
2df275623f1434c10b38b053ef8df242544bc913 a74635e52db10a8fdef20d9055434be247cabd2c Caleb Markley <cablay91@gmail.com> 1548628431 -0800	pull --no-rebase --progress origin: Fast-forward
a74635e52db10a8fdef20d9055434be247cabd2c fc9fdc5e8820439f547d7232dcc804d363be1d85 Caleb Markley <cablay91@gmail.com> 1548629036 -0800	commit: Update wall colors
fc9fdc5e8820439f547d7232dcc804d363be1d85 98f6fe8ed76cd5da2a9a1072b5d8ed406b4dc62a Caleb Markley <cablay91@gmail.com> 1548629473 -0800	commit: Update goals and couch
98f6fe8ed76cd5da2a9a1072b5d8ed406b4dc62a b904451b95fd28b24e585093852428b3eb6a052c Caleb Markley <cablay91@gmail.com> 1548629851 -0800	commit: Update GoodDog
b904451b95fd28b24e585093852428b3eb6a052c a1de0d1a0feda8745b7802a78d8d5854ffaffeeb Caleb Markley <cablay91@gmail.com> 1548630039 -0800	commit: update goodog
a1de0d1a0feda8745b7802a78d8d5854ffaffeeb d64d83aa93cd3630115202622159298c19fc13a9 Caleb Markley <cablay91@gmail.com> 1548630067 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
d64d83aa93cd3630115202622159298c19fc13a9 b36593672e9cd86af11d9cfb596febab61eace85 Caleb Markley <cablay91@gmail.com> 1548630351 -0800	commit: Update UI
b36593672e9cd86af11d9cfb596febab61eace85 95308bb608ffb3ba9dd4a267335578999da075b0 Caleb Markley <cablay91@gmail.com> 1548630548 -0800	commit: Update settings
95308bb608ffb3ba9dd4a267335578999da075b0 701c75a547da64dde8f441dbdd6c004a49797eb5 Caleb Markley <cablay91@gmail.com> 1548630633 -0800	commit: Add quit
701c75a547da64dde8f441dbdd6c004a49797eb5 16748a32f97e040d72accc48db6453cd82052b84 Caleb Markley <cablay91@gmail.com> 1548630658 -0800	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
16748a32f97e040d72accc48db6453cd82052b84 eebc2190b2172e8435a6f6e53540637a7b6a4a2a Caleb Markley <cablay91@gmail.com> 1548631250 -0800	pull --no-rebase --progress origin: Fast-forward
