0000000000000000000000000000000000000000 054c4a2b21d91dc3bbeb0241aa67ca9ca72e7fd5 Alex Solano <solan102@mail.chapman.edu> 1422130226 -0800	initial pull
054c4a2b21d91dc3bbeb0241aa67ca9ca72e7fd5 a055b5693e4537b43257ebc4a532f6cdfc7bd9a4 Alex Solano <solan102@mail.chapman.edu> 1422150843 -0800	commit: - Added Health and Lives
a055b5693e4537b43257ebc4a532f6cdfc7bd9a4 e688c124125a8b602161460f52b71b41bae6fac8 Alex Solano <solan102@mail.chapman.edu> 1422150908 -0800	commit (merge): Merge branch 'master' of https://bitbucket.org/Alman279/antishmup
e688c124125a8b602161460f52b71b41bae6fac8 994b2f98070c75fbf3660a3fb464a5421e94177d Alex Solano <solan102@mail.chapman.edu> 1422153338 -0800	pull --no-commit origin master: Fast-forward
994b2f98070c75fbf3660a3fb464a5421e94177d 2263cd2333c38c1b130bc37ec6d74a5718469f46 Alex Solano <solan102@mail.chapman.edu> 1422159156 -0800	commit: Added method for ship to fire
2263cd2333c38c1b130bc37ec6d74a5718469f46 f21581854d9a6c6d1f0f951103b144b2cda1f303 Alex Solano <solan102@mail.chapman.edu> 1422159437 -0800	commit (merge): Merge branch 'master' of https://bitbucket.org/Alman279/antishmup
f21581854d9a6c6d1f0f951103b144b2cda1f303 23add6bf725673270120ad9b011dc9eed9f2e76b Alex Solano <solan102@mail.chapman.edu> 1422165565 -0800	pull --no-commit origin master: Fast-forward
23add6bf725673270120ad9b011dc9eed9f2e76b 8095b9f2dda0f5c18c0b117f1e03135cdd5c2f52 Alex Solano <solan102@mail.chapman.edu> 1422167268 -0800	pull --no-commit origin master: Fast-forward
8095b9f2dda0f5c18c0b117f1e03135cdd5c2f52 06ee2f2cd70c3736cd5e0f52a89a7ae2510fb4a4 Alex Solano <solan102@mail.chapman.edu> 1422167462 -0800	commit: created gitignore file
06ee2f2cd70c3736cd5e0f52a89a7ae2510fb4a4 d15d9b85643ced56a45ea37a0085059daebccb64 Alex Solano <solan102@mail.chapman.edu> 1422167535 -0800	commit: more gitignore
d15d9b85643ced56a45ea37a0085059daebccb64 229fc424beb3453263a20fa553eb184f155acf86 Alex Solano <solan102@mail.chapman.edu> 1422173493 -0800	commit: Added destruction of enemies, bullets, and ships on collision
229fc424beb3453263a20fa553eb184f155acf86 60802592f81f7d370640f660af98db795f374b1b Alex Solano <solan102@mail.chapman.edu> 1422173516 -0800	commit: Updated gitignore file
60802592f81f7d370640f660af98db795f374b1b cd711e42523834d3c8b6ddb6c8f43d8998550387 Alex Solano <solan102@mail.chapman.edu> 1422174556 -0800	commit: Updated gameplay scene file
cd711e42523834d3c8b6ddb6c8f43d8998550387 970d16ba3cf9f74d02e9df8ccfafec0547487025 Alex Solano <solan102@mail.chapman.edu> 1422210843 -0800	pull --no-commit origin master: Fast-forward
970d16ba3cf9f74d02e9df8ccfafec0547487025 6d46631332282aefb47ebaffeaa088639055ea6c Alex Solano <solan102@mail.chapman.edu> 1422210932 -0800	commit: Updated Gitignore
6d46631332282aefb47ebaffeaa088639055ea6c 45f79433a7251be0a58fec8db177109c78c0a736 Alex Solano <solan102@mail.chapman.edu> 1422211369 -0800	commit: fixed stuff that was messed up by previous commits
45f79433a7251be0a58fec8db177109c78c0a736 ebde7cf25311024a4f5897e2f47bcc621e6b0bc4 Tony Opp <tonyopp311@gmail.com> 1422230307 -0800	commit: - Enemy ship movement (all 3)
ebde7cf25311024a4f5897e2f47bcc621e6b0bc4 54b0397483ac715ab058f506acd6ee2e53e9b818 Tony Opp <tonyopp311@gmail.com> 1422230633 -0800	commit (merge): Merge branch 'master' of https://bitbucket.org/Alman279/antishmup
54b0397483ac715ab058f506acd6ee2e53e9b818 1618c072a30b7de720cc2aee362cbb90a8c7c30a Tony Opp <tonyopp311@gmail.com> 1422230647 -0800	commit (merge): Merge branch 'master' of https://bitbucket.org/Alman279/antishmup
1618c072a30b7de720cc2aee362cbb90a8c7c30a d9bf39133af45485bcf774328a9be597964fa90e Tony Opp <tonyopp311@gmail.com> 1422233924 -0800	commit: - Fixed firing and collisions
d9bf39133af45485bcf774328a9be597964fa90e 874835be0d4504061a59bc1535425e0b6e5cbcbe Tony Opp <tonyopp311@gmail.com> 1422234472 -0800	reset: moving to 874835be0d4504061a59bc1535425e0b6e5cbcbe
