0000000000000000000000000000000000000000 77402b7cabab927de063a878a203bb5efcf4cc30 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484941049 +0100	commit (initial): Add readme placeholder file
77402b7cabab927de063a878a203bb5efcf4cc30 5647a29e448c0c53ad4ecdc6c30572db8a278497 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484941190 +0100	pull origin master: Fast-forward
5647a29e448c0c53ad4ecdc6c30572db8a278497 3a3becf617ce1006916664c62cd97c994584e03c Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484952400 +0100	pull origin master: Fast-forward
3a3becf617ce1006916664c62cd97c994584e03c 781ed89f61010119c1506608d252d87b5e4c9ccf Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484985868 +0100	pull origin master: Fast-forward
781ed89f61010119c1506608d252d87b5e4c9ccf b5f949e21876a2cd4b74fc8e79cbeec6ff1cc31f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484986510 +0100	commit: Add placeholders for water assets purple monkey dishwasher
b5f949e21876a2cd4b74fc8e79cbeec6ff1cc31f 4b7d72a44d455e8fad4806e107dd4c4c06295422 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484989320 +0100	commit: Add wave information / assets
4b7d72a44d455e8fad4806e107dd4c4c06295422 e03079eafd7c385910c72e3642b9940e0cf8d993 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484992222 +0100	pull origin master: Fast-forward
e03079eafd7c385910c72e3642b9940e0cf8d993 fe61f2cadd6df48e0c6c447febcf952b8083755d Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484995873 +0100	pull origin master: Fast-forward
fe61f2cadd6df48e0c6c447febcf952b8083755d bda9962261bc1bf9354e6e9ac0e16ca6ebb26708 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484997040 +0100	pull origin master: Fast-forward
bda9962261bc1bf9354e6e9ac0e16ca6ebb26708 751b7e81d02bd175a8cbff693f1f85381314967c Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1484999863 +0100	pull origin master: Fast-forward
751b7e81d02bd175a8cbff693f1f85381314967c d9df2ce3450541e6448bcbc6c0f0cacffc868e57 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485000452 +0100	commit: Add water visuals
d9df2ce3450541e6448bcbc6c0f0cacffc868e57 be4d93dd0b7db46b4b5605db36e23734d1f5a5a8 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485001187 +0100	pull origin master: Fast-forward
be4d93dd0b7db46b4b5605db36e23734d1f5a5a8 0899d97987702d39982b4fcf72ebe634317b2342 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485001236 +0100	pull origin master: Fast-forward
0899d97987702d39982b4fcf72ebe634317b2342 b123a46be85bcc7870dde9c92b31f3dbaf08951a Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485001733 +0100	pull origin master: Fast-forward
b123a46be85bcc7870dde9c92b31f3dbaf08951a 98ee9d1701fd10e1c37eefd4db768b118a507f6b Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485002247 +0100	commit: Split up rendering front-back for ocean/boat
98ee9d1701fd10e1c37eefd4db768b118a507f6b 9be87f6b4f21b93a7ae4c8c456cefb2377688f6f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485002252 +0100	pull origin master: Merge made by the 'recursive' strategy.
9be87f6b4f21b93a7ae4c8c456cefb2377688f6f 44569edd25b6aabe948fc7e38a5c1b1fe8d9ca57 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485007580 +0100	pull origin master: Fast-forward
44569edd25b6aabe948fc7e38a5c1b1fe8d9ca57 c2c957b008c12230034a0f2cf2d1aa6bc6376333 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485007968 +0100	commit: Update naming for boats and new tug
c2c957b008c12230034a0f2cf2d1aa6bc6376333 a3a5736eb2157e12fbec1e716f81812ca761507f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485008144 +0100	commit: Clean up images, add fisherman
a3a5736eb2157e12fbec1e716f81812ca761507f c882b5bd59500f0da8b89de236a97a23e4c91701 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485008162 +0100	pull origin master: Merge made by the 'recursive' strategy.
c882b5bd59500f0da8b89de236a97a23e4c91701 8e9233957085d3d7e0299f82e738635192859230 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485009380 +0100	pull origin master: Fast-forward
8e9233957085d3d7e0299f82e738635192859230 db756f45d71fe142670c756fe846a7a6ae0378fa Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485009734 +0100	commit: Add boat cutup assets
db756f45d71fe142670c756fe846a7a6ae0378fa a7a418cf198529bf4a88ad05b89c533ebac811ce Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485010575 +0100	pull origin master: Fast-forward
a7a418cf198529bf4a88ad05b89c533ebac811ce b7bac5d731eab66a17fb83a0ad0ed998020859e1 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485011642 +0100	pull origin master: Fast-forward
b7bac5d731eab66a17fb83a0ad0ed998020859e1 fcc2a24d225cda847ae8d6d26f4a69479072606b Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485011690 +0100	pull origin master: Fast-forward
fcc2a24d225cda847ae8d6d26f4a69479072606b 321be1560e763387965dcb99fbbb3dacfd319f7b Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485012201 +0100	pull origin master: Fast-forward
321be1560e763387965dcb99fbbb3dacfd319f7b 3e2fa3d77fcd0832be063625a47ae467fe286b9f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485012212 +0100	commit: Separate config from boat
3e2fa3d77fcd0832be063625a47ae467fe286b9f 3c267b0ecd0985427f77ccb6e3c81a1196a9cbef Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485012616 +0100	commit: Add barrel boat to config
3c267b0ecd0985427f77ccb6e3c81a1196a9cbef f5c1fc4beea2a2e04b86d1b6032f40683a2773d6 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485012642 +0100	pull origin master: Merge made by the 'recursive' strategy.
f5c1fc4beea2a2e04b86d1b6032f40683a2773d6 c6fd1e8439c737811c9f728b065d298cf20bdba4 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485012699 +0100	pull origin master: Fast-forward
c6fd1e8439c737811c9f728b065d298cf20bdba4 8f384362fa7eaa59002c8a0b08ca837ea6ccc7fe Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485013270 +0100	pull origin master: Fast-forward
8f384362fa7eaa59002c8a0b08ca837ea6ccc7fe 424e839d7b4e0d8eba439fade6951ed61ca7c6ee Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485016824 +0100	commit: Add logic for sailors
424e839d7b4e0d8eba439fade6951ed61ca7c6ee dc070d8cddfc369bd38d88872b30a8c318a26c5f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485016877 +0100	commit (merge): Merge branch 'master' of https://github.com/nickolasmarouchos/shipit
dc070d8cddfc369bd38d88872b30a8c318a26c5f 3e9666a83b4a12083007f9713dd899f69a0be19b Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485017707 +0100	commit: Add mermaid and rock
3e9666a83b4a12083007f9713dd899f69a0be19b 972a2279fddee73a230670747b6084b16a073634 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485017711 +0100	pull origin master: Merge made by the 'recursive' strategy.
972a2279fddee73a230670747b6084b16a073634 17dcd743eb8b102acad9929d5fe716bc4408208f Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485018541 +0100	commit: Increase size of water tile
17dcd743eb8b102acad9929d5fe716bc4408208f be5c5b08f16b1ebbddf8a94869637df0ce5881ab Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485019042 +0100	pull origin master: Fast-forward
be5c5b08f16b1ebbddf8a94869637df0ce5881ab ae0b9b0970701c3946c4d8e6ef9f554860c6f7a3 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485024345 +0100	commit: Add sailor death
ae0b9b0970701c3946c4d8e6ef9f554860c6f7a3 ebfd1b14d9ba7e7a9d742a2d479ab1ab128c4dd0 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485024373 +0100	commit (merge): Merge branch 'master' of https://github.com/nickolasmarouchos/shipit
ebfd1b14d9ba7e7a9d742a2d479ab1ab128c4dd0 32eeef21225a0db659452a0270832fe93fa6085e Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485024413 +0100	commit: Add sailor render to index
32eeef21225a0db659452a0270832fe93fa6085e 91b8af28626b84981b7928a1294069d8071fe98c Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485024502 +0100	commit: Fix typo in tombstones array
91b8af28626b84981b7928a1294069d8071fe98c f59ba4840ff8c46ed4dfab1683119ac2ea2f2a8d Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485024949 +0100	commit: Add tombstones on sailor death
f59ba4840ff8c46ed4dfab1683119ac2ea2f2a8d d6a5749ad097bd488b81c578db782898e7cb60bd Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485026089 +0100	pull origin master: Fast-forward
d6a5749ad097bd488b81c578db782898e7cb60bd c82ba168b5572f4bc751bb6e579b96772945a94a Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485026097 +0100	commit: Add tube boat to config
c82ba168b5572f4bc751bb6e579b96772945a94a 67f58d4b2c388a4b923b8dbe9b00814a226abe99 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485026842 +0100	pull origin master: Fast-forward
67f58d4b2c388a4b923b8dbe9b00814a226abe99 cb67f71c69d09b22974b95e287a9a1c61810a253 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485031054 +0100	pull origin master: Fast-forward
cb67f71c69d09b22974b95e287a9a1c61810a253 4565c9c3922c19b56570b27608132941e2d14df6 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485031346 +0100	commit: Update definition of rowboat boat
4565c9c3922c19b56570b27608132941e2d14df6 5aa85f7e84a1be75faf8303ff9872f0bb0741389 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485033437 +0100	pull origin master: Fast-forward
5aa85f7e84a1be75faf8303ff9872f0bb0741389 32aa0ce2e681df918044af191e37b1dd52f126db Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485038181 +0100	commit: Update rendering order for boats by size
32aa0ce2e681df918044af191e37b1dd52f126db 9345b9de1a17cd0e431b21b022ba95e6b8af08b1 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485038410 +0100	commit: Update spawning frequencies and boat sensitivities
9345b9de1a17cd0e431b21b022ba95e6b8af08b1 7aea7dcae96b679db41003d98cbe7f5c135dfe19 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485073667 +0100	pull origin master: Fast-forward
7aea7dcae96b679db41003d98cbe7f5c135dfe19 e264c956fda06c530d68b9f5188a5404a0c980c7 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485081245 +0100	commit: Add audio to game + die effect (not stacking yet)
e264c956fda06c530d68b9f5188a5404a0c980c7 99cabefbb29fbc319e39401bde92282092fda3d0 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485084509 +0100	pull origin master: Fast-forward
99cabefbb29fbc319e39401bde92282092fda3d0 bc3d259b3b65343406ec753023cfce29bc968c47 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485086554 +0100	pull origin master: Fast-forward
bc3d259b3b65343406ec753023cfce29bc968c47 5abffd905c834a62d5b2d09b5ac88c79df6885cd Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485086564 +0100	commit: Update spawn logic for enemy waves
5abffd905c834a62d5b2d09b5ac88c79df6885cd 91ab0d99e80fb39dcf3327d8c78cc0572be92062 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485087544 +0100	pull origin master: Fast-forward
91ab0d99e80fb39dcf3327d8c78cc0572be92062 b431f339e05c7fd18fa9e4717acb9a172bfb51e4 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485087553 +0100	commit: Update balance configs
b431f339e05c7fd18fa9e4717acb9a172bfb51e4 431bd24a080d7958889db3085d55257c3686b239 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485087945 +0100	commit: Add death audio
431bd24a080d7958889db3085d55257c3686b239 3abb1b95dc87056bf821c20af50757daaddab896 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485089468 +0100	pull origin master: Fast-forward
3abb1b95dc87056bf821c20af50757daaddab896 b6a92689d64c09eaabc8cae01c958ccec33770c9 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485089501 +0100	commit: Add audio to wave generation and adjusted music volume
b6a92689d64c09eaabc8cae01c958ccec33770c9 f430adcb9e52a72c66c44dbc6fb69e04ad967ed8 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485089522 +0100	pull origin master: Merge made by the 'recursive' strategy.
f430adcb9e52a72c66c44dbc6fb69e04ad967ed8 9474b0d73de3307b63149e823358c8be8f25e268 Nickolas Marouchos <nickolasmarouchos@Nickolass-MacBook-Pro.local> 1485089668 +0100	commit: Update death sound
