0000000000000000000000000000000000000000 7397a232c2647b21b57079f089b048dca24ab107 Evan Cheng <dr.frolicks@gmail.com> 1548486276 -0800	clone: from https://github.com/tubigervie/hearth.git
7397a232c2647b21b57079f089b048dca24ab107 3df98df21b355f942aa520029bbb816485373e78 Evan Cheng <dr.frolicks@gmail.com> 1548533458 -0800	commit: Fire Prefab
3df98df21b355f942aa520029bbb816485373e78 1893e6c41801ba14046efa9dbe01684ed0c4dd06 Evan Cheng <dr.frolicks@gmail.com> 1548535759 -0800	pull --no-commit origin master: Fast-forward
1893e6c41801ba14046efa9dbe01684ed0c4dd06 21f02e16d04a6627786d82558e5fbfe46f4da123 Evan Cheng <dr.frolicks@gmail.com> 1548535839 -0800	commit: Torch Duration and 'cheat code' toggle for testing
21f02e16d04a6627786d82558e5fbfe46f4da123 c8573a4f117d052f7f8dacba60807628a58eef6b Evan Cheng <dr.frolicks@gmail.com> 1548542905 -0800	pull --no-commit origin master: Fast-forward
c8573a4f117d052f7f8dacba60807628a58eef6b b4f780bb78c34d379764355651ff2aaaa9df94ac Evan Cheng <dr.frolicks@gmail.com> 1548550185 -0800	pull --no-commit origin master: Fast-forward
b4f780bb78c34d379764355651ff2aaaa9df94ac c68e46b2890fcea6315b8d1d0968ea7f27297ace Evan Cheng <dr.frolicks@gmail.com> 1548550255 -0800	commit: Implemented animation controller and animation clip for torch
c68e46b2890fcea6315b8d1d0968ea7f27297ace 1f29996b529202336ee148e2c5f64ae7d4ad9ee0 Evan Cheng <dr.frolicks@gmail.com> 1548553041 -0800	pull --no-commit origin master: Fast-forward
1f29996b529202336ee148e2c5f64ae7d4ad9ee0 c560382c00ca34d6d105f0b06145508ef124818e Evan Cheng <dr.frolicks@gmail.com> 1548553175 -0800	commit: Obelisk Fire implemented
c560382c00ca34d6d105f0b06145508ef124818e c560382c00ca34d6d105f0b06145508ef124818e Evan Cheng <dr.frolicks@gmail.com> 1548553871 -0800	reset: moving to c560382c00ca34d6d105f0b06145508ef124818e
c560382c00ca34d6d105f0b06145508ef124818e 1a69b541afedc31484185de4616c42f38843fa49 Evan Cheng <dr.frolicks@gmail.com> 1548555658 -0800	pull --no-commit origin master: Fast-forward
1a69b541afedc31484185de4616c42f38843fa49 feba3feeb5ef5d3fb59e414b95c8d43af5289813 Evan Cheng <dr.frolicks@gmail.com> 1548556185 -0800	commit: Updated Fire PS Light prefab
feba3feeb5ef5d3fb59e414b95c8d43af5289813 7ed54629de718e8f3f19aaaa9d339e52123bee74 Evan Cheng <dr.frolicks@gmail.com> 1548557288 -0800	commit: Put FMod related folders into a folder called "FMOD Top Level" and updated prefabs
7ed54629de718e8f3f19aaaa9d339e52123bee74 7382858795701dff65d415f5cd843eae09a3e374 Evan Cheng <dr.frolicks@gmail.com> 1548557320 -0800	commit (merge): no message
7382858795701dff65d415f5cd843eae09a3e374 8e8d5392a2baf0cb85061eeef93dc51a02db464c Evan Cheng <dr.frolicks@gmail.com> 1548558708 -0800	commit: press O to simulate obelisk adding fire
8e8d5392a2baf0cb85061eeef93dc51a02db464c a85ac6fc03c87b69a20e9a02229566b1b73571fd Evan Cheng <dr.frolicks@gmail.com> 1548558841 -0800	commit (merge): Merging fmod file changes
a85ac6fc03c87b69a20e9a02229566b1b73571fd ea744bc6acb1290b232751afbec5c70cf1cfd012 Evan Cheng <dr.frolicks@gmail.com> 1548560610 -0800	pull --no-commit origin master: Fast-forward
ea744bc6acb1290b232751afbec5c70cf1cfd012 dd4a37534f8dcdf749fe63661fe8071006921ee3 Evan Cheng <dr.frolicks@gmail.com> 1548562056 -0800	pull --no-commit origin master: Fast-forward
dd4a37534f8dcdf749fe63661fe8071006921ee3 9d7cf8c91f439124112e830d76fcf03680f37026 Evan Cheng <dr.frolicks@gmail.com> 1548564293 -0800	commit: Starting sequence prefab implemented
9d7cf8c91f439124112e830d76fcf03680f37026 b4160967bbeb19869acb42f18c37e2b98fa24fa1 Evan Cheng <dr.frolicks@gmail.com> 1548564339 -0800	commit (merge): Starting sequence prefab implemented now merged with everything else
b4160967bbeb19869acb42f18c37e2b98fa24fa1 2994a0dccf3ef6bc66cec2812cf1dec09365e52a Evan Cheng <dr.frolicks@gmail.com> 1548570726 -0800	pull --no-commit origin master: Fast-forward
2994a0dccf3ef6bc66cec2812cf1dec09365e52a 7c2241b676beb4f2b708e758a42e8c39749898dd Evan Cheng <dr.frolicks@gmail.com> 1548575289 -0800	commit: Torch now has min and max emission rate values to change in the inspector
7c2241b676beb4f2b708e758a42e8c39749898dd 1de64b3dfc1b737aab6c0b3ddeec37348078276f Evan Cheng <dr.frolicks@gmail.com> 1548575374 -0800	commit (merge): no message
1de64b3dfc1b737aab6c0b3ddeec37348078276f 99b7541292785d6b252d2c136b58b9f7d1cbc09d Evan Cheng <dr.frolicks@gmail.com> 1548580501 -0800	pull --no-commit origin master: Fast-forward
99b7541292785d6b252d2c136b58b9f7d1cbc09d d64c8afe0f5bd5048e49b813ad713eff995004ce Evan Cheng <dr.frolicks@gmail.com> 1548620592 -0800	pull --no-commit origin master: Fast-forward
d64c8afe0f5bd5048e49b813ad713eff995004ce 5600d37c474cf8dd0912c39e1a426a17f975a946 Evan Cheng <dr.frolicks@gmail.com> 1548622922 -0800	revert: Revert "added 4gems over map"
5600d37c474cf8dd0912c39e1a426a17f975a946 8c7270b78a9b3f0d50782fdbe779fe461228d159 Evan Cheng <dr.frolicks@gmail.com> 1548622947 -0800	reset: moving to 8c7270b78a9b3f0d50782fdbe779fe461228d159
8c7270b78a9b3f0d50782fdbe779fe461228d159 bb2903b7cf8beaa2055a101ccfedc494ae7ab096 Evan Cheng <dr.frolicks@gmail.com> 1548626186 -0800	pull --no-commit origin master: Fast-forward
bb2903b7cf8beaa2055a101ccfedc494ae7ab096 05c1c98140540118f9ff71255d0a66dcd1c04376 Evan Cheng <dr.frolicks@gmail.com> 1548626914 -0800	commit: Canvas Scaled and credits rewritten
05c1c98140540118f9ff71255d0a66dcd1c04376 79e842fb5a57765c812be3a7ede6cb0f26271892 Evan Cheng <dr.frolicks@gmail.com> 1548627388 -0800	commit (merge): no message
79e842fb5a57765c812be3a7ede6cb0f26271892 a8bc49e78db335d8f56cc2e40328ee7c707006bb Evan Cheng <dr.frolicks@gmail.com> 1548628346 -0800	commit (merge): Intro Sequence updated
a8bc49e78db335d8f56cc2e40328ee7c707006bb bcfa12885edfc891003b9168c8f96d759239bf52 Evan Cheng <dr.frolicks@gmail.com> 1548628417 -0800	commit (merge): no message
bcfa12885edfc891003b9168c8f96d759239bf52 39d91ea4f52a8b17745090d4450d389b87a57da5 Evan Cheng <dr.frolicks@gmail.com> 1548628680 -0800	commit: no message
39d91ea4f52a8b17745090d4450d389b87a57da5 55c45bcfd4912609c2182c17fabbf9d188bae512 Evan Cheng <dr.frolicks@gmail.com> 1548628839 -0800	commit (merge): Merge branch 'master' of https://github.com/tubigervie/hearth
55c45bcfd4912609c2182c17fabbf9d188bae512 0f13923128362b6e55b1ffcfad95cffca4865b6c Evan Cheng <dr.frolicks@gmail.com> 1548630459 -0800	commit (merge): sticks adjusted
0f13923128362b6e55b1ffcfad95cffca4865b6c b97516a04ed5caa6fd781affc562d6abb9bcb734 Evan Cheng <dr.frolicks@gmail.com> 1548630634 -0800	reset: moving to b97516a04ed5caa6fd781affc562d6abb9bcb734
b97516a04ed5caa6fd781affc562d6abb9bcb734 6ecd44a228c245c5d8948b7f53e124b41633c4e2 Evan Cheng <dr.frolicks@gmail.com> 1548631540 -0800	commit: new intro sequence with new composition
