0000000000000000000000000000000000000000 633d311643b13814b2f5265a49f208fd761f80a9 Oscar <dabomb4eve@gmail.com> 1422081797 -0800	branch: Created from HEAD
633d311643b13814b2f5265a49f208fd761f80a9 329637f1e8f0ac45a09874883e04c1ca3d366bf5 Oscar <dabomb4eve@gmail.com> 1422082052 -0800	commit: Adding movement files.
329637f1e8f0ac45a09874883e04c1ca3d366bf5 e34bd9b2b868c2e448a29858a68f93f29355513f Oscar <dabomb4eve@gmail.com> 1422082623 -0800	commit: Updating movement scripts.
e34bd9b2b868c2e448a29858a68f93f29355513f de9bdeada9dfdea376c46d7225a6827afbc5603f Oscar <dabomb4eve@gmail.com> 1422085014 -0800	merge master: Fast-forward
de9bdeada9dfdea376c46d7225a6827afbc5603f 166045c40975c7a181e2b4014e5c96f7a037d0a4 Oscar <dabomb4eve@gmail.com> 1422085318 -0800	commit: Updating motors, reversing Z movement and making chase motor work.
166045c40975c7a181e2b4014e5c96f7a037d0a4 57b851f7ff49374e70a742337ef30f74ec97edc0 Oscar <dabomb4eve@gmail.com> 1422085415 -0800	merge master: Fast-forward
57b851f7ff49374e70a742337ef30f74ec97edc0 7f52cfb5c4630c0e77ab881396c52e45ca1b1160 Oscar <dabomb4eve@gmail.com> 1422086509 -0800	merge master: Fast-forward
7f52cfb5c4630c0e77ab881396c52e45ca1b1160 5a58905ff13cab328b36d56197392458ec509ff7 Oscar <dabomb4eve@gmail.com> 1422091883 -0800	commit: Fixing method of doing character movement.
5a58905ff13cab328b36d56197392458ec509ff7 1e9e85a0c5cad55bdefcfa711c58bb0f03214427 Oscar <dabomb4eve@gmail.com> 1422122790 -0800	merge master: Fast-forward
1e9e85a0c5cad55bdefcfa711c58bb0f03214427 2b888ea51eb4db18eef2def898cfbc4fc03a26ed Oscar <dabomb4eve@gmail.com> 1422125307 -0800	merge master: Fast-forward
2b888ea51eb4db18eef2def898cfbc4fc03a26ed f2e57b6c82460f82e18366ecc222e98ad8053ff8 Oscar <dabomb4eve@gmail.com> 1422126139 -0800	reset: moving to HEAD~1
f2e57b6c82460f82e18366ecc222e98ad8053ff8 2b888ea51eb4db18eef2def898cfbc4fc03a26ed Oscar <dabomb4eve@gmail.com> 1422126271 -0800	merge master: Fast-forward
2b888ea51eb4db18eef2def898cfbc4fc03a26ed 34f87b7bba433dd6008b0fce21db9be4a992ecea Oscar <dabomb4eve@gmail.com> 1422126723 -0800	merge master: Fast-forward
34f87b7bba433dd6008b0fce21db9be4a992ecea 56bb2d2f5b3d4433bfbe89ea7d955f4ab302099c Oscar <dabomb4eve@gmail.com> 1422127360 -0800	commit: Fixing prefabs to not constrain Y axes.
56bb2d2f5b3d4433bfbe89ea7d955f4ab302099c e59ee8293056615d2408912dfe3b4af21f9e8383 Oscar <dabomb4eve@gmail.com> 1422137661 -0800	commit: Adding HealthController and Attack type scripts.
e59ee8293056615d2408912dfe3b4af21f9e8383 4357f69c6e081b10ed52299bf214bb4180609406 Oscar <dabomb4eve@gmail.com> 1422137985 -0800	commit: Updating Character and Enemy prefabs to use health.
4357f69c6e081b10ed52299bf214bb4180609406 2bcba2726367c45c4e491fd4eebaba8669e4dbd4 Oscar <dabomb4eve@gmail.com> 1422139681 -0800	commit: Updating ContactAttack to work in seconds instead of milliseconds. Removing Melee attack; it's just a specialized contact attack.
2bcba2726367c45c4e491fd4eebaba8669e4dbd4 7b113ae56702b1149a76e261232dee44f6e42641 Oscar <dabomb4eve@gmail.com> 1422139809 -0800	merge master: Fast-forward
7b113ae56702b1149a76e261232dee44f6e42641 1fd1dc36ea2dfea9e35edf6065c8814570f234e8 Oscar <dabomb4eve@gmail.com> 1422140572 -0800	merge master: Fast-forward
1fd1dc36ea2dfea9e35edf6065c8814570f234e8 0888ba478dec3d8036f3b2eae20cb6707f23c899 Oscar <dabomb4eve@gmail.com> 1422142716 -0800	merge master: Fast-forward
0888ba478dec3d8036f3b2eae20cb6707f23c899 bc16ad0ad733e2905aa5a9105a2713ee637387da Oscar <dabomb4eve@gmail.com> 1422143155 -0800	merge master: Fast-forward
bc16ad0ad733e2905aa5a9105a2713ee637387da 06abcc13ab4cbfe87a9deb3c584312621adf239f Oscar <dabomb4eve@gmail.com> 1422143412 -0800	commit: Readding player prefab.
06abcc13ab4cbfe87a9deb3c584312621adf239f 01733ae35d5d7e74a15120f8f34440949e447775 Oscar <dabomb4eve@gmail.com> 1422149642 -0800	merge master: Fast-forward
01733ae35d5d7e74a15120f8f34440949e447775 a33151b104e07b963f0e5568b138752ca47b7c91 Oscar <dabomb4eve@gmail.com> 1422151780 -0800	merge master: Fast-forward
a33151b104e07b963f0e5568b138752ca47b7c91 58829304ef29f22340945dc6d804f4b48499c5ea Oscar <dabomb4eve@gmail.com> 1422152482 -0800	commit: Creating different enemy types with different motors. Creating new enemy prefabs for those. Creating enemy factory.
58829304ef29f22340945dc6d804f4b48499c5ea e8d680aa2c76b9e2bf71e9826824a40ad23988fb Oscar <dabomb4eve@gmail.com> 1422152767 -0800	commit (merge): Merge branch 'dev' of bitbucket.org:GamersOA/gamejam2015 into dev
e8d680aa2c76b9e2bf71e9826824a40ad23988fb 6c2a01dfddee5b10481c623aed7a1af42972814d Oscar <dabomb4eve@gmail.com> 1422154508 -0800	merge master: Fast-forward
6c2a01dfddee5b10481c623aed7a1af42972814d 3734c670a9f6c7518adbf7cf69687ca5f684612a Oscar <dabomb4eve@gmail.com> 1422154605 -0800	commit: Creating 2 types of enemy factories, one based on probality, one on random time. Creating prefabs for each of those.
3734c670a9f6c7518adbf7cf69687ca5f684612a 07f3f5c2aef745c89bf295924cc9d08145785128 Oscar <dabomb4eve@gmail.com> 1422155007 -0800	merge master: Fast-forward
07f3f5c2aef745c89bf295924cc9d08145785128 eb3293cd7e405b546762bd9fa4299d52b3310a99 Oscar <dabomb4eve@gmail.com> 1422155248 -0800	merge master: Fast-forward
eb3293cd7e405b546762bd9fa4299d52b3310a99 b33fbf12d0b291f07665d10b4cdabb6422a5eeb8 Oscar <dabomb4eve@gmail.com> 1422156235 -0800	merge master: Fast-forward
b33fbf12d0b291f07665d10b4cdabb6422a5eeb8 a5d7be4d3933628966e9b197a76bcfe3eb13d903 Oscar <dabomb4eve@gmail.com> 1422156265 -0800	commit: Updating colliders in enemy prefabs.
a5d7be4d3933628966e9b197a76bcfe3eb13d903 4dd831f860d8c3bf4f0eb7a5ac6063fd608ff337 Oscar <dabomb4eve@gmail.com> 1422157571 -0800	merge master: Fast-forward
4dd831f860d8c3bf4f0eb7a5ac6063fd608ff337 8fc9ffce21624c9219d50be50121263980de3129 Oscar <dabomb4eve@gmail.com> 1422163751 -0800	merge master: Fast-forward
8fc9ffce21624c9219d50be50121263980de3129 1e083720f3f0317784bebe5ebdc1970067b594be Oscar <dabomb4eve@gmail.com> 1422165528 -0800	merge master: Fast-forward
1e083720f3f0317784bebe5ebdc1970067b594be 7b39eef836366fd2ced11cb622f0f10e1ac7fc00 Oscar <dabomb4eve@gmail.com> 1422165594 -0800	commit: Adding death to robot's fists.
7b39eef836366fd2ced11cb622f0f10e1ac7fc00 5f28b24c0bf8cf1e8d8041c509dcc9f1499991d6 Oscar <dabomb4eve@gmail.com> 1422166815 -0800	merge master: Fast-forward
5f28b24c0bf8cf1e8d8041c509dcc9f1499991d6 e93646eded458af06267fda2bca61cb4b8782401 Oscar <dabomb4eve@gmail.com> 1422168459 -0800	commit: Tweaking hitboxes and collisions for player and zombies. Fixing animations for diagonal zombies.
e93646eded458af06267fda2bca61cb4b8782401 220e25cf969ad38efca1b785a76d1ac53b6658f6 Oscar <dabomb4eve@gmail.com> 1422169846 -0800	merge master: Fast-forward
220e25cf969ad38efca1b785a76d1ac53b6658f6 f5eb096e785f7fe4a21fc3b3f75939a2b4c8b05d Oscar <dabomb4eve@gmail.com> 1422170140 -0800	commit: Fixing Diagonal Zombie Target, and fixing collision for melee attack.
f5eb096e785f7fe4a21fc3b3f75939a2b4c8b05d 385d6cf9436cfb69fc0ed18f87482ff615e2ef56 Oscar <dabomb4eve@gmail.com> 1422171205 -0800	commit: Adding zombie factories
385d6cf9436cfb69fc0ed18f87482ff615e2ef56 9954f7639ee07dcc2cfd4cbf8c0b5f764c94bf06 Oscar <dabomb4eve@gmail.com> 1422171264 -0800	merge master: Fast-forward
9954f7639ee07dcc2cfd4cbf8c0b5f764c94bf06 809d0ab6ff71dee0758b4630c0facef7c3b43f88 Oscar <dabomb4eve@gmail.com> 1422172830 -0800	merge master: Fast-forward
809d0ab6ff71dee0758b4630c0facef7c3b43f88 bd9995cfb588e34d178c6847df415be55668e166 Oscar <dabomb4eve@gmail.com> 1422172923 -0800	commit: Freezing Y Positions, and adding target to the dumb zombie.
bd9995cfb588e34d178c6847df415be55668e166 86b78734350baf7b0d3a2c443d9fc1334cf76d19 Oscar <dabomb4eve@gmail.com> 1422212125 -0800	merge master: Fast-forward
86b78734350baf7b0d3a2c443d9fc1334cf76d19 2b7b409097c96fb00a9688d96ff299d24171d23f Oscar <dabomb4eve@gmail.com> 1422213544 -0800	commit: Making magical hitboxes for player, which helps attack enemies and helps enemies attack.
2b7b409097c96fb00a9688d96ff299d24171d23f e7e71593a8bd3bf044ac579815369e8f6d2d5ba4 Oscar <dabomb4eve@gmail.com> 1422215575 -0800	merge master: Fast-forward
e7e71593a8bd3bf044ac579815369e8f6d2d5ba4 ba54e8da089f6b050266fc6fbdd72237d0637fdf Oscar <dabomb4eve@gmail.com> 1422215845 -0800	merge master: Fast-forward
ba54e8da089f6b050266fc6fbdd72237d0637fdf 305f701ddbb9b4f404f881444c353fc6aec33b44 Oscar <dabomb4eve@gmail.com> 1422217882 -0800	pull origin dev: Fast-forward
305f701ddbb9b4f404f881444c353fc6aec33b44 c701b23040023b8c688131ddd381a18c222d71a3 Oscar <dabomb4eve@gmail.com> 1422218461 -0800	pull origin dev: Fast-forward
c701b23040023b8c688131ddd381a18c222d71a3 df75751d2b55be708c908479251a3356807e1cc4 Oscar <dabomb4eve@gmail.com> 1422218514 -0800	merge oc: Merge made by the 'recursive' strategy.
df75751d2b55be708c908479251a3356807e1cc4 7b9ced39a31bfbca3d7160009da353c8d5db5a0f Oscar <dabomb4eve@gmail.com> 1422219838 -0800	commit: Making sure to read from correct axis when reading vertical. Removing debugs.
7b9ced39a31bfbca3d7160009da353c8d5db5a0f d84452f853d5e07026a99d6efc7fe9994bab39aa Oscar <dabomb4eve@gmail.com> 1422219983 -0800	commit (merge): Merge branch 'dev' of bitbucket.org:GamersOA/gamejam2015 into dev
d84452f853d5e07026a99d6efc7fe9994bab39aa c551bb3c268d807d6765a9c8ede07616b7dad0db Oscar <dabomb4eve@gmail.com> 1422220319 -0800	commit (merge): Merge branch 'dev' of bitbucket.org:GamersOA/gamejam2015 into dev
c551bb3c268d807d6765a9c8ede07616b7dad0db d72eab6c3c2feb898f1dd48aba0300b3f74ae493 Oscar <dabomb4eve@gmail.com> 1422221713 -0800	commit (merge): Merge branch 'dev' of bitbucket.org:GamersOA/gamejam2015 into dev
d72eab6c3c2feb898f1dd48aba0300b3f74ae493 01689aae26ab95dfa78fa857e1c1caf83be9bc63 Oscar <dabomb4eve@gmail.com> 1422222588 -0800	pull origin dev: Merge made by the 'recursive' strategy.
01689aae26ab95dfa78fa857e1c1caf83be9bc63 30c15f49e1e0a4683bd3061ee242c104d57282a1 Oscar <dabomb4eve@gmail.com> 1422222591 -0800	merge master: Merge made by the 'recursive' strategy.
30c15f49e1e0a4683bd3061ee242c104d57282a1 9bfd16aac31fa5b7f2f0285ca400ed81fbe90bcb Oscar <dabomb4eve@gmail.com> 1422223578 -0800	merge master: Merge made by the 'recursive' strategy.
9bfd16aac31fa5b7f2f0285ca400ed81fbe90bcb f371f0997b9d05027708fd617450e1a566d9c19d Oscar <dabomb4eve@gmail.com> 1422223932 -0800	commit: Adding segways to zombie factories from right side, and tightening factories up. Adding 4th fire button.
f371f0997b9d05027708fd617450e1a566d9c19d b2a947d46e1531fc10be3b6120a5d7d3508c9d63 Oscar <dabomb4eve@gmail.com> 1422224110 -0800	commit: Fixing punch button inputs.
b2a947d46e1531fc10be3b6120a5d7d3508c9d63 f22ef84f937f4d48c16e5c5d56431181a41b3f35 Oscar <dabomb4eve@gmail.com> 1422225140 -0800	merge master: Fast-forward
f22ef84f937f4d48c16e5c5d56431181a41b3f35 7a84893ace3a0da8759d15aa6799d84f2399cb90 Oscar <dabomb4eve@gmail.com> 1422225875 -0800	merge master: Fast-forward
7a84893ace3a0da8759d15aa6799d84f2399cb90 dd9a873a05d826b1af657813f847acc6783ee6ab Oscar <dabomb4eve@gmail.com> 1422226015 -0800	merge master: Fast-forward
dd9a873a05d826b1af657813f847acc6783ee6ab 7b809cfda3fd8d0e05e552ff492e30c1549038fb Oscar <dabomb4eve@gmail.com> 1422227129 -0800	merge master: Fast-forward
7b809cfda3fd8d0e05e552ff492e30c1549038fb 167d1ee717fff797f48c295e105c750630a7b2ed Oscar <dabomb4eve@gmail.com> 1422227698 -0800	merge master: Fast-forward
