0000000000000000000000000000000000000000 19787b960bb0f31eae211f989f847aadc6f5c89c Cole Rudniski <coleunites@shaw.ca> 1484943214 -0800	clone: from https://github.com/coleunites/GameJam2017
19787b960bb0f31eae211f989f847aadc6f5c89c 805fd64ab4a95417ba37c9c9c258a17d89158725 Cole Rudniski <coleunites@shaw.ca> 1484943739 -0800	commit: Intial Commit
805fd64ab4a95417ba37c9c9c258a17d89158725 8628dd11aaf1056ca23caa551682c1b699003aec Cole Rudniski <coleunites@shaw.ca> 1484973062 -0800	commit: made testbed scen and implemetn ring scaling and roating
8628dd11aaf1056ca23caa551682c1b699003aec 5a6d13ee81d316208497037285668d477180f766 Cole Rudniski <coleunites@shaw.ca> 1484975732 -0800	commit: implemented perptaul ring motion and hermit survial detection
5a6d13ee81d316208497037285668d477180f766 f14fde27309afe1f8dfe145c03fb3ba47d939337 Cole Rudniski <coleunites@shaw.ca> 1484975740 -0800	pull: Merge made by the 'recursive' strategy.
f14fde27309afe1f8dfe145c03fb3ba47d939337 bfd44982a04a5345992b33fd767511154e25c7fa Cole Rudniski <coleunites@shaw.ca> 1484979587 -0800	commit: started on level managaer
bfd44982a04a5345992b33fd767511154e25c7fa b967d2503c1c2929f646741da6ee976829f47201 Cole Rudniski <coleunites@shaw.ca> 1484979636 -0800	pull: Merge made by the 'recursive' strategy.
b967d2503c1c2929f646741da6ee976829f47201 6e72ba83ba4ab8e6b6ee20388992e0df60755ebe Cole Rudniski <coleunites@shaw.ca> 1484982138 -0800	pull: Fast-forward
6e72ba83ba4ab8e6b6ee20388992e0df60755ebe 27edf28d1ca393aeb7cc564afa6e884f7c3c859e Cole Rudniski <coleunites@shaw.ca> 1484985429 -0800	commit: finshed levelMangaer implemeation
27edf28d1ca393aeb7cc564afa6e884f7c3c859e 135fdd1c3f9d2a02ee76a260b756624b8d64ba55 Cole Rudniski <coleunites@shaw.ca> 1484985454 -0800	pull: Merge made by the 'recursive' strategy.
135fdd1c3f9d2a02ee76a260b756624b8d64ba55 936df9578b158f20aa4e0ee0a443c97e46bd6dc6 Cole Rudniski <coleunites@shaw.ca> 1484986662 -0800	commit: add white versions of rings for color changing testing puposes
936df9578b158f20aa4e0ee0a443c97e46bd6dc6 24e635561a80e0e6c9ceff7ae647a1103213d01c Cole Rudniski <coleunites@shaw.ca> 1484987280 -0800	pull: Merge made by the 'recursive' strategy.
24e635561a80e0e6c9ceff7ae647a1103213d01c 3cb14519b71f2e5401457fc5bf2099b4334276b6 Cole Rudniski <coleunites@shaw.ca> 1484987960 -0800	pull: Fast-forward
3cb14519b71f2e5401457fc5bf2099b4334276b6 7ed9820b24b451287b511772e756abde394aaa20 Cole Rudniski <coleunites@shaw.ca> 1484988270 -0800	commit: fixed a Bug
7ed9820b24b451287b511772e756abde394aaa20 8c68cc008ad3eaa22e8ac60aa0cd1d8bc57ab32f Cole Rudniski <coleunites@shaw.ca> 1484988287 -0800	pull: Merge made by the 'recursive' strategy.
8c68cc008ad3eaa22e8ac60aa0cd1d8bc57ab32f 2bc38bdfa6a7521160e52d9ffd9d00e82bb890d0 Cole Rudniski <coleunites@shaw.ca> 1484988550 -0800	commit: pushing current progress on testbed
2bc38bdfa6a7521160e52d9ffd9d00e82bb890d0 9181dd3b8999270fbb26050355f91ae84f5ba767 Cole Rudniski <coleunites@shaw.ca> 1484988600 -0800	pull: Fast-forward
9181dd3b8999270fbb26050355f91ae84f5ba767 4b636e90196e9d27b78002a51620e49491b889fd Cole Rudniski <coleunites@shaw.ca> 1484992724 -0800	commit: Made hermit prefab
4b636e90196e9d27b78002a51620e49491b889fd 5cdcfdcef082a65b3f7767477ed761c99aef2514 Cole Rudniski <coleunites@shaw.ca> 1484992747 -0800	pull: Merge made by the 'recursive' strategy.
5cdcfdcef082a65b3f7767477ed761c99aef2514 e9feafab18513b91ab149761c837851193a18c30 Cole Rudniski <coleunites@shaw.ca> 1484993061 -0800	commit: added temp game over screen texture
e9feafab18513b91ab149761c837851193a18c30 17ca65937e9ba219c460e7608875c454d12cc020 Cole Rudniski <coleunites@shaw.ca> 1484994375 -0800	pull: Fast-forward
17ca65937e9ba219c460e7608875c454d12cc020 a2b56432a415db8b20db1d87e0e69e2169d7ac7c Cole Rudniski <coleunites@shaw.ca> 1484995273 -0800	pull: Fast-forward
a2b56432a415db8b20db1d87e0e69e2169d7ac7c eae21e916c50d040b89576be8a526e3548b1b80f Cole Rudniski <coleunites@shaw.ca> 1484995474 -0800	commit: moved to a 2d pysics system
eae21e916c50d040b89576be8a526e3548b1b80f 85908d0b5cf8b1bbd31433d6ee219c6b25533d9b Cole Rudniski <coleunites@shaw.ca> 1484996684 -0800	commit: 2d Colliders added to rings
85908d0b5cf8b1bbd31433d6ee219c6b25533d9b 6e5cfd687f30b3ff4dfb0a1bf9ecc199a04e3545 Cole Rudniski <coleunites@shaw.ca> 1484996687 -0800	pull: Merge made by the 'recursive' strategy.
6e5cfd687f30b3ff4dfb0a1bf9ecc199a04e3545 aa054f8229830abae47a9b895466944674ef3bbb Cole Rudniski <coleunites@shaw.ca> 1484997561 -0800	commit: fixed collision bug
aa054f8229830abae47a9b895466944674ef3bbb 43935a7a03d98862984e47fd88e5fc58d20beddf riley <rcole1337@gmail.com> 1485008246 -0800	commit: changed collision, prefab ring 4 created
43935a7a03d98862984e47fd88e5fc58d20beddf 0939aba746dd2f6f5c97a7efadc851f7efb6a621 riley <rcole1337@gmail.com> 1485009318 -0800	pull: Fast-forward
0939aba746dd2f6f5c97a7efadc851f7efb6a621 118a43fc086b54b462ffc593827b761e73bc9e6a riley <rcole1337@gmail.com> 1485010252 -0800	commit: added slow/medium/intense music, added art for textures ring1/2/4/6/8
118a43fc086b54b462ffc593827b761e73bc9e6a 455aba4b6625f5346128712a3ef946825a5367be riley <rcole1337@gmail.com> 1485013557 -0800	commit: added prefabs ring1-1/3, ring4-1
455aba4b6625f5346128712a3ef946825a5367be 4b74b0bad6dfeca0fa665f86554b9ad4ea461721 riley <rcole1337@gmail.com> 1485014349 -0800	commit: commitinig missing scene
4b74b0bad6dfeca0fa665f86554b9ad4ea461721 d24d538a94098ca82bbbadf8fae4d5b0002e54d4 riley <rcole1337@gmail.com> 1485015750 -0800	pull: Fast-forward
d24d538a94098ca82bbbadf8fae4d5b0002e54d4 4d863c702f27b50f970b9715cc753dbb71e10699 riley <rcole1337@gmail.com> 1485027151 -0800	pull: Fast-forward
4d863c702f27b50f970b9715cc753dbb71e10699 c9ef9980befc05aa55e3f7244ee1ab8b9435e41f Cole Rudniski <coleunites@shaw.ca> 1485035256 -0800	commit: Adding riley's work on the ring prefabs and patterns
c9ef9980befc05aa55e3f7244ee1ab8b9435e41f 37f61e59763cf79b87a6eb383b29b33ed8d9aba8 Cole Rudniski <coleunites@shaw.ca> 1485035460 -0800	pull: Merge made by the 'recursive' strategy.
37f61e59763cf79b87a6eb383b29b33ed8d9aba8 34c4389caed61b2f8531d9a299f33ab7689ecccd Cole Rudniski <coleunites@shaw.ca> 1485042753 -0800	commit: add ing rileys changes to the repo
34c4389caed61b2f8531d9a299f33ab7689ecccd f7bce52f5ab22f4b3139f526e167e991859c9f25 Cole Rudniski <coleunites@shaw.ca> 1485042759 -0800	pull: Merge made by the 'recursive' strategy.
37f61e59763cf79b87a6eb383b29b33ed8d9aba8 a6595ffe61eaca7cefcf84852fc1fe69038e752d Cole Rudniski <coleunites@shaw.ca> 1485052556 -0800	commit: add ing rileys work to repo
a6595ffe61eaca7cefcf84852fc1fe69038e752d e1b1323d1461f635d4efd4785078d8b26adf1723 Cole Rudniski <coleunites@shaw.ca> 1485053251 -0800	commit (merge): merge
e1b1323d1461f635d4efd4785078d8b26adf1723 56f8315603aca7766575ee85295de7abd2f34508 Cole Rudniski <coleunites@shaw.ca> 1485053584 -0800	pull: Fast-forward
56f8315603aca7766575ee85295de7abd2f34508 dc39df1ff7721f2b902f03faa62cf3e6b70bc148 Cole Rudniski <coleunites@shaw.ca> 1485053829 -0800	commit: made changes to rileys scene to bring his scen up to date
dc39df1ff7721f2b902f03faa62cf3e6b70bc148 8b140f3373d14a5f1b3c7e20c053e916ccd40d8d riley <rcole1337@gmail.com> 1485070927 -0800	commit: section 1/2 have 5 patterns, and settings set for them in level manager. Ring manager settings changed for optimal playing.
8b140f3373d14a5f1b3c7e20c053e916ccd40d8d 404c82ae9d64ccdcdb5e7ee300f3ad15027fbc93 riley <rcole1337@gmail.com> 1485070963 -0800	pull: Merge made by the 'recursive' strategy.
404c82ae9d64ccdcdb5e7ee300f3ad15027fbc93 f5053700e32464ef11b7fc1a2e8380ee0043bbf6 riley <rcole1337@gmail.com> 1485071689 -0800	pull: Fast-forward
f5053700e32464ef11b7fc1a2e8380ee0043bbf6 b9c5705e7d2bab1fb2f7bc6960fabe97d2c6ffa9 riley <rcole1337@gmail.com> 1485084248 -0800	commit: revisions made to ring assets
b9c5705e7d2bab1fb2f7bc6960fabe97d2c6ffa9 a3cc8cbf2e30a7f37120d3e1aaa6bcfd0af601bd riley <rcole1337@gmail.com> 1485086519 -0800	pull: Fast-forward
a3cc8cbf2e30a7f37120d3e1aaa6bcfd0af601bd dbb2ce27aae56167fb3de7365f422a4551733997 riley <rcole1337@gmail.com> 1485088820 -0800	pull: Fast-forward
dbb2ce27aae56167fb3de7365f422a4551733997 c8d4898863f1ea7e53107c6e340174e1c2605697 riley <rcole1337@gmail.com> 1485088990 -0800	commit: section 1 solved all issues.
c8d4898863f1ea7e53107c6e340174e1c2605697 1f2eb3b4f7d4973bfb4cb2617f9c563bcada6a7c riley <rcole1337@gmail.com> 1485093340 -0800	commit: sections 1-3 refined and updated
1f2eb3b4f7d4973bfb4cb2617f9c563bcada6a7c ef203ee4380f58db43c5e9e53876ae652bcb221c riley <rcole1337@gmail.com> 1485093362 -0800	pull: Merge made by the 'recursive' strategy.
ef203ee4380f58db43c5e9e53876ae652bcb221c 839463309d3c4cefe22010067bd6449cd13df2b6 riley <rcole1337@gmail.com> 1485094254 -0800	pull: Fast-forward
839463309d3c4cefe22010067bd6449cd13df2b6 4cb48d34bcc78321965cd431b4d01c4604a5979f riley <rcole1337@gmail.com> 1485098648 -0800	pull: Fast-forward
4cb48d34bcc78321965cd431b4d01c4604a5979f 53a7d6660c436d7cfa71f04abb2d391110fcbd32 riley <rcole1337@gmail.com> 1485100913 -0800	pull: Fast-forward
53a7d6660c436d7cfa71f04abb2d391110fcbd32 557f7253489cb4c2125157042311957eb8489302 riley <rcole1337@gmail.com> 1485102201 -0800	pull: Fast-forward
557f7253489cb4c2125157042311957eb8489302 a593b416b7b7cdb09bdf17da52298a8a89d66796 riley <rcole1337@gmail.com> 1485102950 -0800	pull: Fast-forward
a593b416b7b7cdb09bdf17da52298a8a89d66796 7972907561fbeda978ee6f209547beda2f82d1ca riley <rcole1337@gmail.com> 1485107343 -0800	pull: Fast-forward
7972907561fbeda978ee6f209547beda2f82d1ca dee38a33bb4e4448a0a7434450a82d8c17994d4c riley <rcole1337@gmail.com> 1485108156 -0800	pull: Fast-forward
dee38a33bb4e4448a0a7434450a82d8c17994d4c b821956e1368c58c5f6ee90d84b35faba526176a riley <rcole1337@gmail.com> 1485110450 -0800	pull: Fast-forward
b821956e1368c58c5f6ee90d84b35faba526176a 7dac2475bbef1a792a93a466ed3950e8838e7b6f riley <rcole1337@gmail.com> 1485111226 -0800	pull: Fast-forward
7dac2475bbef1a792a93a466ed3950e8838e7b6f a7c3a07fb17e45dc2066f7f2a52e26bca3b34287 Cole Rudniski <coleunites@shaw.ca> 1485112041 -0800	commit: Updated sections
a7c3a07fb17e45dc2066f7f2a52e26bca3b34287 0025177cbeec263586926ea87ec465a28595f301 Cole Rudniski <coleunites@shaw.ca> 1485112230 -0800	commit: mermaid now animante on unscaled time
0025177cbeec263586926ea87ec465a28595f301 bd1db9f905c070dc1a51722a112064bd538460e5 Adam Wiwcharuk <adamwiwc@stu.aii.edu> 1485116940 -0800	commit: uhh thing :turtle:
