0000000000000000000000000000000000000000 5a13bebd4bafff5fb9f1771f467ac48dfe3088f4 robrappoport <rjr363@nyu.edu> 1517019764 -0500	clone: from https://github.com/apetersell/GGJ2018.git
5a13bebd4bafff5fb9f1771f467ac48dfe3088f4 903e0b1d3592cd68560a5998a2b3d0773da2d789 robrappoport <rjr363@nyu.edu> 1517067369 -0500	Fast forward branch master to branch master
903e0b1d3592cd68560a5998a2b3d0773da2d789 816c58edc52b56fa84386fea7d973c46350fae0f robrappoport <rjr363@nyu.edu> 1517075604 -0500	commit: camera kinda workin
816c58edc52b56fa84386fea7d973c46350fae0f 06b464bd40ad65efb71ed9e0bad24741b4cbf826 robrappoport <rjr363@nyu.edu> 1517076167 -0500	commit: Camera Working-ish
06b464bd40ad65efb71ed9e0bad24741b4cbf826 c3b8c371afc32844a539df0dc579a3ff6d8569c5 robrappoport <rjr363@nyu.edu> 1517080993 -0500	commit: nose man spritesheet in
c3b8c371afc32844a539df0dc579a3ff6d8569c5 637fdf2b719f21eeb17e1ae1bad84cc49ed9cb32 robrappoport <rjr363@nyu.edu> 1517080996 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
637fdf2b719f21eeb17e1ae1bad84cc49ed9cb32 92b8c9d73822f1a30113c641a22f92d41b44d13a robrappoport <rjr363@nyu.edu> 1517081671 -0500	commit: obstacle added
92b8c9d73822f1a30113c641a22f92d41b44d13a dbf8ba22e18e2979e13956ba6fe61d82504b9821 robrappoport <rjr363@nyu.edu> 1517086019 -0500	commit: houses in
dbf8ba22e18e2979e13956ba6fe61d82504b9821 b549e31039da3363ca6159d84d931eae51d5368e robrappoport <rjr363@nyu.edu> 1517086021 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
b549e31039da3363ca6159d84d931eae51d5368e 08b715b51bfa3e74cec00bd89df94e73ae8910f0 robrappoport <rjr363@nyu.edu> 1517088137 -0500	commit: coin in
08b715b51bfa3e74cec00bd89df94e73ae8910f0 4403e6b0abaab66e97ca09b35c293095e6f719cf robrappoport <rjr363@nyu.edu> 1517089103 -0500	Fast forward branch master to branch master
4403e6b0abaab66e97ca09b35c293095e6f719cf 870b56f343876c82b008e9084d9faa0263ac415c robrappoport <rjr363@nyu.edu> 1517089193 -0500	commit: Auto stash before merge of "master" and "origin/master"
870b56f343876c82b008e9084d9faa0263ac415c 9c3c75d87d061b81bd0328284026e704f194dcb5 robrappoport <rjr363@nyu.edu> 1517092041 -0500	commit: ring particle
9c3c75d87d061b81bd0328284026e704f194dcb5 504f3fc9c0dc5c7f395898473e53463596f18adb robrappoport <rjr363@nyu.edu> 1517094273 -0500	Fast forward branch master to branch master
504f3fc9c0dc5c7f395898473e53463596f18adb e773b506c8de1ea43fa3138b191f074b1e28334d robrappoport <rjr363@nyu.edu> 1517094593 -0500	commit: particleSys in
e773b506c8de1ea43fa3138b191f074b1e28334d 9782733c3b70bb7b3025b5a4ad148eeda7f6db4a robrappoport <rjr363@nyu.edu> 1517094700 -0500	commit: scene is in Scenes
9782733c3b70bb7b3025b5a4ad148eeda7f6db4a d5f46339a26d3ca52d81641332c78dcd609e3a33 robrappoport <rjr363@nyu.edu> 1517099827 -0500	commit: audioManager in
d5f46339a26d3ca52d81641332c78dcd609e3a33 021fd10e11a83f57de73c66020a8e3acd2581a9d robrappoport <rjr363@nyu.edu> 1517099835 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
021fd10e11a83f57de73c66020a8e3acd2581a9d 47631bf0ca1c1f4bc66a20b2423f9e03ba1cbe63 robrappoport <rjr363@nyu.edu> 1517101345 -0500	commit: audioManager attached???????
47631bf0ca1c1f4bc66a20b2423f9e03ba1cbe63 f490e27a9411bd08d255b21b24d874cdb7816acb robrappoport <rjr363@nyu.edu> 1517105132 -0500	Fast forward branch master to branch master
f490e27a9411bd08d255b21b24d874cdb7816acb e99726929612c32b7885f1b3f6f91368e09741d9 robrappoport <rjr363@nyu.edu> 1517107705 -0500	commit: Game has ending condition
e99726929612c32b7885f1b3f6f91368e09741d9 4ed55599e28437626ee8c00603eb9c653c323f3b robrappoport <rjr363@nyu.edu> 1517109743 -0500	commit: new houses
4ed55599e28437626ee8c00603eb9c653c323f3b c592af0dda74c2188a53f2c28b19d1d625b7113c robrappoport <rjr363@nyu.edu> 1517109748 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
c592af0dda74c2188a53f2c28b19d1d625b7113c 1aaa9bd998991303d51662abcc45bbdc9aab9063 robrappoport <rjr363@nyu.edu> 1517110797 -0500	commit: obstacles are white now
1aaa9bd998991303d51662abcc45bbdc9aab9063 6c8ad5fb2c90732f1c87c79fc921b7d9d2ea2dbb robrappoport <rjr363@nyu.edu> 1517111054 -0500	commit: other folks there
6c8ad5fb2c90732f1c87c79fc921b7d9d2ea2dbb 9a5f67e9dbf5383750b4053d4f110c17eb01c8f9 robrappoport <rjr363@nyu.edu> 1517111057 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
9a5f67e9dbf5383750b4053d4f110c17eb01c8f9 e936388c8ec7bd6e973990113e8173fe6ef017b5 robrappoport <rjr363@nyu.edu> 1517111130 -0500	commit: obstacle ACTUALLY updated
e936388c8ec7bd6e973990113e8173fe6ef017b5 0c90bf9d8c2251fd0724a69c7352974155cf163d robrappoport <rjr363@nyu.edu> 1517154684 -0500	commit: materials folder added and coin/spike emitter created
0c90bf9d8c2251fd0724a69c7352974155cf163d 937f9f56e76b2063775c03764464d6ad02472c3c robrappoport <rjr363@nyu.edu> 1517156903 -0500	Fast forward branch master to branch master
937f9f56e76b2063775c03764464d6ad02472c3c e1f3f45b9f3201e60e729da078b7e747a0144a71 robrappoport <rjr363@nyu.edu> 1517156951 -0500	commit: Auto stash before merge of "master" and "origin/master"
e1f3f45b9f3201e60e729da078b7e747a0144a71 027cd9fdaddf2e5641e3d499540d91f8f7b83a00 robrappoport <rjr363@nyu.edu> 1517156961 -0500	commit (amend): faces in
027cd9fdaddf2e5641e3d499540d91f8f7b83a00 9f2d199b19cd29852f759deff3ddf38983318b54 robrappoport <rjr363@nyu.edu> 1517157638 -0500	commit: title screen in
9f2d199b19cd29852f759deff3ddf38983318b54 867835610c92355da83088e73f652b15d6630b7d robrappoport <rjr363@nyu.edu> 1517158695 -0500	commit: win lose screens in
867835610c92355da83088e73f652b15d6630b7d 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517160909 -0500	commit: scenes in SFX in music in
162c78b5ddda4ff1a5faaccf24110b7b457188fc 1e13c94b800847782e00f20de02af2c69ed56ff4 robrappoport <rjr363@nyu.edu> 1517160974 -0500	commit (merge): scenes fixed
1e13c94b800847782e00f20de02af2c69ed56ff4 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517161085 -0500	reset: moving to 162c78b5ddda4ff1a5faaccf24110b7b457188fc
162c78b5ddda4ff1a5faaccf24110b7b457188fc edac103df8ab66c9fd973643ab4a0ddb2e33ebc1 robrappoport <rjr363@nyu.edu> 1517161165 -0500	commit: fixed actually
edac103df8ab66c9fd973643ab4a0ddb2e33ebc1 ad3df445bcc4de177135f4db5584699186ba959a robrappoport <rjr363@nyu.edu> 1517161169 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
ad3df445bcc4de177135f4db5584699186ba959a edac103df8ab66c9fd973643ab4a0ddb2e33ebc1 robrappoport <rjr363@nyu.edu> 1517161303 -0500	undo: commit (merge): Merge remote-tracking branch 'origin/master'
edac103df8ab66c9fd973643ab4a0ddb2e33ebc1 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517161307 -0500	undo: commit: fixed actually
162c78b5ddda4ff1a5faaccf24110b7b457188fc 1e13c94b800847782e00f20de02af2c69ed56ff4 robrappoport <rjr363@nyu.edu> 1517161309 -0500	undo: reset: moving to 162c78b5ddda4ff1a5faaccf24110b7b457188fc [a19791901cfd8c30eac30ddc1949f31c442bd828]
1e13c94b800847782e00f20de02af2c69ed56ff4 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517161318 -0500	undo: commit (merge): scenes fixed
162c78b5ddda4ff1a5faaccf24110b7b457188fc 867835610c92355da83088e73f652b15d6630b7d robrappoport <rjr363@nyu.edu> 1517161324 -0500	undo: commit: scenes in SFX in music in
867835610c92355da83088e73f652b15d6630b7d 9f2d199b19cd29852f759deff3ddf38983318b54 robrappoport <rjr363@nyu.edu> 1517161330 -0500	undo: commit: win lose screens in
9f2d199b19cd29852f759deff3ddf38983318b54 867835610c92355da83088e73f652b15d6630b7d robrappoport <rjr363@nyu.edu> 1517161333 -0500	commit: win lose screens in
867835610c92355da83088e73f652b15d6630b7d 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517161334 -0500	commit: scenes in SFX in music in
162c78b5ddda4ff1a5faaccf24110b7b457188fc 1e13c94b800847782e00f20de02af2c69ed56ff4 robrappoport <rjr363@nyu.edu> 1517161458 -0500	Fast forward branch master to branch master
1e13c94b800847782e00f20de02af2c69ed56ff4 162c78b5ddda4ff1a5faaccf24110b7b457188fc robrappoport <rjr363@nyu.edu> 1517161474 -0500	reset: moving to 162c78b5ddda4ff1a5faaccf24110b7b457188fc
162c78b5ddda4ff1a5faaccf24110b7b457188fc 5d6f41d4cb87ea553155c5b09867c8a0ba58d2c3 robrappoport <rjr363@nyu.edu> 1517163373 -0500	Fast forward branch master to branch master
5d6f41d4cb87ea553155c5b09867c8a0ba58d2c3 80d46dad9fe27826e19b1de47a25feab77e8f4c7 robrappoport <rjr363@nyu.edu> 1517166526 -0500	commit: lady characters added
80d46dad9fe27826e19b1de47a25feab77e8f4c7 de6fc8fdc35043a838d6f91a285c874c8d0945a5 robrappoport <rjr363@nyu.edu> 1517166530 -0500	commit (merge): Merge remote-tracking branch 'origin/master'
de6fc8fdc35043a838d6f91a285c874c8d0945a5 25d45287e5e7088d44abb99c42fc4cbebfd40082 robrappoport <rjr363@nyu.edu> 1517166850 -0500	Fast forward branch master to branch master
25d45287e5e7088d44abb99c42fc4cbebfd40082 ec624439710a251ae04c425e86b4a64db9718821 robrappoport <rjr363@nyu.edu> 1517169568 -0500	Fast forward branch master to branch master
ec624439710a251ae04c425e86b4a64db9718821 9fa93c6b20e4a42dc95614b2951f260da27f09cf robrappoport <rjr363@nyu.edu> 1517169624 -0500	commit: audio added
9fa93c6b20e4a42dc95614b2951f260da27f09cf f3354019e57b34734fb6ec298b81bbbb13fc2b15 robrappoport <rjr363@nyu.edu> 1517171944 -0500	Fast forward branch master to branch master
f3354019e57b34734fb6ec298b81bbbb13fc2b15 5877359cf7cc62b5be27842ef3a7f57245b9f069 robrappoport <rjr363@nyu.edu> 1517172635 -0500	commit: Arrows Remade
5877359cf7cc62b5be27842ef3a7f57245b9f069 837bb677ed92ebc7c170b180c706ab1856acf3a1 robrappoport <rjr363@nyu.edu> 1517174414 -0500	Fast forward branch master to branch master
837bb677ed92ebc7c170b180c706ab1856acf3a1 5c49d73197138eee900af8df8e583dc7532f19e0 robrappoport <rjr363@nyu.edu> 1517174629 -0500	Fast forward branch master to branch master
5c49d73197138eee900af8df8e583dc7532f19e0 dda4be381873c6db5a5a1d28270c80fa4fe7857b robrappoport <rjr363@nyu.edu> 1517175341 -0500	Fast forward branch master to branch master
dda4be381873c6db5a5a1d28270c80fa4fe7857b 014ece6a22f6a0c72960bb102e7fd37a7a731cc5 robrappoport <rjr363@nyu.edu> 1517175914 -0500	commit: fixed music
014ece6a22f6a0c72960bb102e7fd37a7a731cc5 dfe0063ffb783cde89d17ad37335af27c223320b robrappoport <rjr363@nyu.edu> 1517176725 -0500	Fast forward branch master to branch master
dfe0063ffb783cde89d17ad37335af27c223320b fa5aa8cbd54f4ef9bcb8e58cfbcb18f1a9cfd454 robrappoport <rjr363@nyu.edu> 1517178209 -0500	Fast forward branch master to branch master
