0000000000000000000000000000000000000000 bde6c7533cc37e0bbb43f5622ea5b84f5b63b0b5 Troy Sanders <troyjsanders@gmail.com> 1390703475 -0600	clone: from https://ThunderAwesome@bitbucket.org/seflopod/theworldfallsapart.git
bde6c7533cc37e0bbb43f5622ea5b84f5b63b0b5 fa618c3bf82505e5b01613f483ca3eb6858cd9ec Troy Sanders <troyjsanders@gmail.com> 1390708793 -0600	commit: Assets in and placed. Need animations.
fa618c3bf82505e5b01613f483ca3eb6858cd9ec 129f80f20b3ab99c9f103c2da42d7f06651c0c82 Troy Sanders <troyjsanders@gmail.com> 1390708846 -0600	checkout: moving from master to Troy
129f80f20b3ab99c9f103c2da42d7f06651c0c82 dbff4871387cf2c05450c5f14a448d6d7913642d Troy Sanders <troyjsanders@gmail.com> 1390708850 -0600	merge master: Merge made by the 'recursive' strategy.
dbff4871387cf2c05450c5f14a448d6d7913642d fa618c3bf82505e5b01613f483ca3eb6858cd9ec Troy Sanders <troyjsanders@gmail.com> 1390708861 -0600	checkout: moving from Troy to master
fa618c3bf82505e5b01613f483ca3eb6858cd9ec dbff4871387cf2c05450c5f14a448d6d7913642d Troy Sanders <troyjsanders@gmail.com> 1390713079 -0600	checkout: moving from master to troy
dbff4871387cf2c05450c5f14a448d6d7913642d dbff4871387cf2c05450c5f14a448d6d7913642d Troy Sanders <troyjsanders@gmail.com> 1390713255 -0600	checkout: moving from troy to troy
dbff4871387cf2c05450c5f14a448d6d7913642d c98b9df583305da220ddb30d95f4862ef0cedd83 Troy Sanders <troyjsanders@gmail.com> 1390713340 -0600	commit: Asset anchor point changes and position changes..
c98b9df583305da220ddb30d95f4862ef0cedd83 c98b9df583305da220ddb30d95f4862ef0cedd83 Troy Sanders <troyjsanders@gmail.com> 1390713364 -0600	checkout: moving from troy to Troy
c98b9df583305da220ddb30d95f4862ef0cedd83 fa618c3bf82505e5b01613f483ca3eb6858cd9ec Troy Sanders <troyjsanders@gmail.com> 1390713447 -0600	checkout: moving from Troy to master
fa618c3bf82505e5b01613f483ca3eb6858cd9ec c98b9df583305da220ddb30d95f4862ef0cedd83 Troy Sanders <troyjsanders@gmail.com> 1390713647 -0600	checkout: moving from master to troy
c98b9df583305da220ddb30d95f4862ef0cedd83 c98b9df583305da220ddb30d95f4862ef0cedd83 Troy Sanders <troyjsanders@gmail.com> 1390713669 -0600	checkout: moving from troy to Troy
c98b9df583305da220ddb30d95f4862ef0cedd83 c98b9df583305da220ddb30d95f4862ef0cedd83 Troy Sanders <troyjsanders@gmail.com> 1390714066 -0600	checkout: moving from Troy to Troy
c98b9df583305da220ddb30d95f4862ef0cedd83 5ff9b33e117d4c7e27350bb66027fab1581b3e26 Troy Sanders <troyjsanders@gmail.com> 1390714135 -0600	commit: Assets anchors and positions changed.
5ff9b33e117d4c7e27350bb66027fab1581b3e26 5ff9b33e117d4c7e27350bb66027fab1581b3e26 Troy Sanders <troyjsanders@gmail.com> 1390730140 -0600	checkout: moving from Troy to Troy
5ff9b33e117d4c7e27350bb66027fab1581b3e26 e91e7d746764c5f22c5ba5b589b6e7dfe013640e Troy Sanders <troyjsanders@gmail.com> 1390730255 -0600	commit: Asset layer check to stack items on others. Like a lamp can go on a table.
e91e7d746764c5f22c5ba5b589b6e7dfe013640e fa618c3bf82505e5b01613f483ca3eb6858cd9ec Troy Sanders <troyjsanders@gmail.com> 1390730653 -0600	checkout: moving from Troy to master
fa618c3bf82505e5b01613f483ca3eb6858cd9ec e91e7d746764c5f22c5ba5b589b6e7dfe013640e Troy Sanders <troyjsanders@gmail.com> 1390730685 -0600	checkout: moving from master to Troy
e91e7d746764c5f22c5ba5b589b6e7dfe013640e 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731152 -0600	commit (merge): Merge branch 'master' of https://ThunderAwesome@bitbucket.org/seflopod/theworldfallsapart.git into Troy
5d74b9d8391623acfe98f129b4e46b636034fb14 fa618c3bf82505e5b01613f483ca3eb6858cd9ec Troy Sanders <troyjsanders@gmail.com> 1390731226 -0600	checkout: moving from Troy to master
fa618c3bf82505e5b01613f483ca3eb6858cd9ec 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731233 -0600	merge Troy: Fast-forward
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731267 -0600	checkout: moving from master to Troy
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731298 -0600	checkout: moving from Troy to master
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731309 -0600	checkout: moving from master to Troy
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731319 -0600	checkout: moving from Troy to master
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731357 -0600	checkout: moving from master to Troy
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390731417 -0600	checkout: moving from Troy to master
5d74b9d8391623acfe98f129b4e46b636034fb14 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390737536 -0600	checkout: moving from master to Troy
5d74b9d8391623acfe98f129b4e46b636034fb14 13439425bbeb57a091e3107a1e14dd480ea205d4 Troy Sanders <troyjsanders@gmail.com> 1390737559 -0600	commit: Signed-off-by: Troy Sanders <troyjsanders@gmail.com>
13439425bbeb57a091e3107a1e14dd480ea205d4 f86b9898dbeebbbfdc4005cfe128e14353aaae0d Troy Sanders <troyjsanders@gmail.com> 1390745793 -0600	commit: Added "heap" sprites.
f86b9898dbeebbbfdc4005cfe128e14353aaae0d 5d74b9d8391623acfe98f129b4e46b636034fb14 Troy Sanders <troyjsanders@gmail.com> 1390750359 -0600	checkout: moving from Troy to master
5d74b9d8391623acfe98f129b4e46b636034fb14 ad69006cf18c8d85726eb5050b84acd8ae9dce20 Troy Sanders <troyjsanders@gmail.com> 1390750983 -0600	commit: Heap Sprites again...not sure why they disappeared.
ad69006cf18c8d85726eb5050b84acd8ae9dce20 f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd Troy Sanders <troyjsanders@gmail.com> 1390751119 -0600	commit (merge): Merge branch 'Troy'
f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd f86b9898dbeebbbfdc4005cfe128e14353aaae0d Troy Sanders <troyjsanders@gmail.com> 1390751137 -0600	checkout: moving from master to Troy
f86b9898dbeebbbfdc4005cfe128e14353aaae0d f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd Troy Sanders <troyjsanders@gmail.com> 1390751283 -0600	merge master: Fast-forward
f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd Troy Sanders <troyjsanders@gmail.com> 1390751532 -0600	checkout: moving from Troy to master
f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd a462379f46b60e8f92c9bae9a164c19f4d792d61 Troy Sanders <troyjsanders@gmail.com> 1390751544 -0600	commit: Signed-off-by: Troy Sanders <troyjsanders@gmail.com>
a462379f46b60e8f92c9bae9a164c19f4d792d61 5d8874a20c2b2a4b5dc5eee9b44dcb7f3b05ecb2 Troy Sanders <troyjsanders@gmail.com> 1390752420 -0600	commit (merge): Merge branch 'master' of https://ThunderAwesome@bitbucket.org/seflopod/theworldfallsapart.git
5d8874a20c2b2a4b5dc5eee9b44dcb7f3b05ecb2 60b59ff3489583745c1c3a456a1b4ddfa7c8081d Troy Sanders <troyjsanders@gmail.com> 1390761602 -0600	commit: Placing items on tables is finnicky...
60b59ff3489583745c1c3a456a1b4ddfa7c8081d de085087c52989555b8776c95a0244e39d18ce45 Peter Bartosch <bartoschp@gmail.com> 1390763558 -0600	commit: pre-merge
de085087c52989555b8776c95a0244e39d18ce45 f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd Peter Bartosch <bartoschp@gmail.com> 1390763564 -0600	checkout: moving from master to Troy
f58b06c48d4d1c9f0d101d0ef34fbbba4130e2bd 8ed1235d257c185865070dc52a65a8b40224af2e Peter Bartosch <bartoschp@gmail.com> 1390763572 -0600	checkout: moving from Troy to Peter
8ed1235d257c185865070dc52a65a8b40224af2e 8ed1235d257c185865070dc52a65a8b40224af2e Peter Bartosch <bartoschp@gmail.com> 1390763581 -0600	checkout: moving from Peter to peter
0000000000000000000000000000000000000000 8ed1235d257c185865070dc52a65a8b40224af2e Peter Bartosch <bartoschp@gmail.com> 1390763605 -0600	initial pull
8ed1235d257c185865070dc52a65a8b40224af2e de085087c52989555b8776c95a0244e39d18ce45 Peter Bartosch <bartoschp@gmail.com> 1390763639 -0600	checkout: moving from peter to master
