0000000000000000000000000000000000000000 d17fab1a0e9871fafb4daf2d4859dea7c735fb39 Brian Bartram <bbartram@fablelabs.com> 1390628678 -0800	clone: from https://github.com/laaph/candy.git
d17fab1a0e9871fafb4daf2d4859dea7c735fb39 a475b4532cc9b11724651b0efb324b81172fcc51 Brian Bartram <bbartram@fablelabs.com> 1390629042 -0800	commit: added SimplePath and created directory structure
a475b4532cc9b11724651b0efb324b81172fcc51 5ce672337ade9f3661738729abf889ef26be4fd1 Brian Bartram <bbartram@fablelabs.com> 1390630531 -0800	pull --progress --prune: Fast-forward
5ce672337ade9f3661738729abf889ef26be4fd1 01d8e903abeabd473d48818d83934d2cb40ebf19 Brian Bartram <bbartram@fablelabs.com> 1390632967 -0800	commit: Level1 - Spawner and Nav implemented
01d8e903abeabd473d48818d83934d2cb40ebf19 00d769261eae540cb3f48507cbce27043c77f5d1 Brian Bartram <bbartram@fablelabs.com> 1390680292 -0800	pull --progress --rebase --prune: checkout 00d769261eae540cb3f48507cbce27043c77f5d1
00d769261eae540cb3f48507cbce27043c77f5d1 00d769261eae540cb3f48507cbce27043c77f5d1 Brian Bartram <bbartram@fablelabs.com> 1390680293 -0800	rebase finished: returning to refs/heads/master
00d769261eae540cb3f48507cbce27043c77f5d1 828f2faadf31ab9b8ac840d8b43589f20b2e3579 Brian Bartram <bbartram@fablelabs.com> 1390684907 -0800	commit: AI Nav, Spawner, Creeps
828f2faadf31ab9b8ac840d8b43589f20b2e3579 3c97b3ac9bda0f300b70f7c8566b8903c1918e41 Brian Bartram <bbartram@fablelabs.com> 1390684915 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
3c97b3ac9bda0f300b70f7c8566b8903c1918e41 d590f7d8d5b4d8fa07fd05a14cf47b329286ae14 Brian Bartram <bbartram@fablelabs.com> 1390687367 -0800	commit: Added Player prefab
d590f7d8d5b4d8fa07fd05a14cf47b329286ae14 03b4f98df5cf6e2b3538cfc200e5771586ce70f7 Brian Bartram <bbartram@fablelabs.com> 1390687374 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
03b4f98df5cf6e2b3538cfc200e5771586ce70f7 a5940120e43c8ffee8e83186bfa875c8a45b72a9 Brian Bartram <bbartram@fablelabs.com> 1390687855 -0800	commit: Level tweaked
a5940120e43c8ffee8e83186bfa875c8a45b72a9 1fd34cc6ffc8a0e025dcb3536c6e8695507ebb21 Brian Bartram <bbartram@fablelabs.com> 1390688086 -0800	commit: fix to Creep
1fd34cc6ffc8a0e025dcb3536c6e8695507ebb21 6034ee46de15c0c66102b679f0b0611b237a7b09 Brian Bartram <bbartram@fablelabs.com> 1390688092 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
6034ee46de15c0c66102b679f0b0611b237a7b09 b253f36391a14c2d5437ba3955133dd1c43fb091 Brian Bartram <bbartram@fablelabs.com> 1390688293 -0800	commit: quick fix for bool = 0
b253f36391a14c2d5437ba3955133dd1c43fb091 aeed551bdbcb8f7c2befd73aec4da1e76add45c3 Brian Bartram <bbartram@fablelabs.com> 1390688992 -0800	commit: Level borders
aeed551bdbcb8f7c2befd73aec4da1e76add45c3 2b4cd54b0d9322111435d85813d75ce59b793e3d Brian Bartram <bbartram@fablelabs.com> 1390689016 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
2b4cd54b0d9322111435d85813d75ce59b793e3d 1ec7e6f1643f0fddc4d509db7c9534cefd34fe7e Brian Bartram <bbartram@fablelabs.com> 1390691554 -0800	commit: switched PlayerMovement to use physics and tuned.
1ec7e6f1643f0fddc4d509db7c9534cefd34fe7e e7fd7e33df05957bd30d5f9e74c7ddf49b7249b5 Brian Bartram <bbartram@fablelabs.com> 1390691564 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
e7fd7e33df05957bd30d5f9e74c7ddf49b7249b5 d5f42c0ac4d48eb4e0b5983e77d237dd6b62f6d8 Brian Bartram <bbartram@fablelabs.com> 1390695078 -0800	commit: added v1 UI, adjusted Melee Attack
d5f42c0ac4d48eb4e0b5983e77d237dd6b62f6d8 f3234575b3cb2bae67b50d55f61daa084a727930 Brian Bartram <bbartram@fablelabs.com> 1390696456 -0800	commit: setup GameMaster to put player HP on UI
f3234575b3cb2bae67b50d55f61daa084a727930 90c89917b7520a67a50471a514a5aeacc3379dd3 Brian Bartram <bbartram@fablelabs.com> 1390696474 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
90c89917b7520a67a50471a514a5aeacc3379dd3 0f67f597fd241f862dfd12201f37760e45a65226 Brian Bartram <bbartram@fablelabs.com> 1390697633 -0800	commit: GM and other fixes.
0f67f597fd241f862dfd12201f37760e45a65226 308e8dae8fd6c816ca3f752b3ebfd60880f453ac Brian Bartram <bbartram@fablelabs.com> 1390697649 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
308e8dae8fd6c816ca3f752b3ebfd60880f453ac f037c78a25457d6b7cc0221f301d5e27c70146c2 Brian Bartram <bbartram@fablelabs.com> 1390698133 -0800	commit: added fish to playerprefab
f037c78a25457d6b7cc0221f301d5e27c70146c2 3eafe651a552434732fafc25c08b5da4e8254968 Brian Bartram <bbartram@fablelabs.com> 1390698141 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
3eafe651a552434732fafc25c08b5da4e8254968 2937ac369914c8996e644461c7fb88569129953f Brian Bartram <bbartram@fablelabs.com> 1390700224 -0800	commit: player attack sync'ing
2937ac369914c8996e644461c7fb88569129953f 0efefdc44acdbecf7d23c0973303ec8e09cd1acb Brian Bartram <bbartram@fablelabs.com> 1390700230 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
0efefdc44acdbecf7d23c0973303ec8e09cd1acb 9a07ee48e967f1a0b7bcfe774644cfd656e22ec1 Brian Bartram <bbartram@fablelabs.com> 1390702169 -0800	pull --progress --prune: Fast-forward
9a07ee48e967f1a0b7bcfe774644cfd656e22ec1 3b97b095a9963813f9d537cf65919e19bb3b84bf Brian Bartram <bbartram@fablelabs.com> 1390707282 -0800	commit: Prefab and Level fixes.
3b97b095a9963813f9d537cf65919e19bb3b84bf e19f2bd401358a1be9e14f577db71e0c85dc985f Brian Bartram <bbartram@fablelabs.com> 1390707288 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
e19f2bd401358a1be9e14f577db71e0c85dc985f 25b570e45853e8db41a1e02c2eb3ea7c27ef5565 Brian Bartram <bbartram@fablelabs.com> 1390709579 -0800	commit: Player - sword art, attack code, score to UI
25b570e45853e8db41a1e02c2eb3ea7c27ef5565 6c786891448d99085ad09ee785935a0e90fd98d4 Brian Bartram <bbartram@fablelabs.com> 1390709597 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
6c786891448d99085ad09ee785935a0e90fd98d4 3b53746003dd3f5bb86c1ef582674e34e1c42728 Brian Bartram <bbartram@fablelabs.com> 1390712388 -0800	commit: Adjusted level boundary, v1 BG art, spawner tweak
3b53746003dd3f5bb86c1ef582674e34e1c42728 77c536647acd3f0873c7694952097d94716ca5e7 Brian Bartram <bbartram@fablelabs.com> 1390713444 -0800	commit: sound assets added
77c536647acd3f0873c7694952097d94716ca5e7 1a61bf731faed011d2484101e3512d67d042e5ae Brian Bartram <bbartram@fablelabs.com> 1390713461 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
1a61bf731faed011d2484101e3512d67d042e5ae e3211d60c2921460685cd40d7278d4425c5506c0 Brian Bartram <bbartram@fablelabs.com> 1390714827 -0800	commit: added red team
e3211d60c2921460685cd40d7278d4425c5506c0 b4ae8588b62ab6be3a6c04b2d355841851582eb3 Brian Bartram <bbartram@fablelabs.com> 1390714833 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
b4ae8588b62ab6be3a6c04b2d355841851582eb3 615e25bdd01ad0d9beb3e25e081b830fb7ab2ece Brian Bartram <bbartram@fablelabs.com> 1390715854 -0800	commit: Level1 fix.  PlayerMovement left out.
615e25bdd01ad0d9beb3e25e081b830fb7ab2ece af46a0c67ff03948b86c4b880090d4b92dafeaae Brian Bartram <bbartram@fablelabs.com> 1390767524 -0800	pull --progress --prune: Fast-forward
af46a0c67ff03948b86c4b880090d4b92dafeaae 8792977d199d4d692f65ec43708ed7c34b7531e7 Brian Bartram <bbartram@fablelabs.com> 1390767700 -0800	pull --progress --prune: Fast-forward
8792977d199d4d692f65ec43708ed7c34b7531e7 f45416e23d0a8655ae7de3298c3223b6ac7708fc Brian Bartram <bbartram@fablelabs.com> 1390769257 -0800	commit: added Audio, BG and Hits
f45416e23d0a8655ae7de3298c3223b6ac7708fc 8e22d9a8a8f95ec87a00b50dc6b1d8c53b42a5fb Brian Bartram <bbartram@fablelabs.com> 1390769523 -0800	commit: added wall texture
8e22d9a8a8f95ec87a00b50dc6b1d8c53b42a5fb 819dbc40b4e787d354e548a7054d87b425b1e4ba Brian Bartram <bbartram@fablelabs.com> 1390769533 -0800	pull --progress --prune: Merge made by the 'recursive' strategy.
819dbc40b4e787d354e548a7054d87b425b1e4ba 460d80b7e1815becbda2abcc5b2f876f1159abcb Brian Bartram <bbartram@fablelabs.com> 1390772288 -0800	pull --progress --prune: Fast-forward
460d80b7e1815becbda2abcc5b2f876f1159abcb 054652f4a184f3db9dd5cfc8f6bf2b0f0513726d Brian Bartram <bbartram@fablelabs.com> 1390772292 -0800	commit: Hearts UI, new BG
054652f4a184f3db9dd5cfc8f6bf2b0f0513726d f4db8805d12f6ac09a534b01e2b56031b8b36b69 Brian Bartram <bbartram@fablelabs.com> 1390774655 -0800	commit: level tweaks and creep fixes
f4db8805d12f6ac09a534b01e2b56031b8b36b69 b2a21dfd4fcca4d90b40a22012d82fa2889a1c1c Brian Bartram <bbartram@fablelabs.com> 1390775689 -0800	commit: build settings
