0000000000000000000000000000000000000000 08aad47830da21407bfdb272c3b5b7f74b4d8e5f Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454103657 +0100	commit (initial): Added first .gitignore spec
08aad47830da21407bfdb272c3b5b7f74b4d8e5f f6011f35da7db17b2fd857349c7ddf63180e3a9e Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454103825 +0100	commit: First push
f6011f35da7db17b2fd857349c7ddf63180e3a9e 86e67dea4a2d51886216573fa5ba33e2d534e0ad Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454107750 +0100	commit: Added test scene
86e67dea4a2d51886216573fa5ba33e2d534e0ad 8f2a5d5cedea0d50261c01137c0dcd0a028287b8 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454107840 +0100	commit (merge): Fixed conflict?
8f2a5d5cedea0d50261c01137c0dcd0a028287b8 27f74ba303a62c94359180e78f85f8b830c22847 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454108139 +0100	commit: Serialized all .assets file
27f74ba303a62c94359180e78f85f8b830c22847 4797f65007998f85964a9637b8a52cc83b755397 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454108270 +0100	commit: Testing changes
4797f65007998f85964a9637b8a52cc83b755397 163be43b5db96f32624ef06a8012f09e9741c26e Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454109650 +0100	commit: Self-induced pull
163be43b5db96f32624ef06a8012f09e9741c26e 6d4468cc82ed4476974f6f8e85eb20378155681b Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454109658 +0100	pull: Merge made by the 'recursive' strategy.
6d4468cc82ed4476974f6f8e85eb20378155681b 7c182d6482a8845ca1b323aaef72fa46ca9e7ddf Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454144188 +0100	commit: Drafted controller
7c182d6482a8845ca1b323aaef72fa46ca9e7ddf b33e751e1adb7531c072de2e3ecf1de11a38f21b Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454144197 +0100	pull: Merge made by the 'recursive' strategy.
b33e751e1adb7531c072de2e3ecf1de11a38f21b e69651d7938f8e0b7ef24fe6d0845afb485ff732 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454147443 +0100	pull: Fast-forward
e69651d7938f8e0b7ef24fe6d0845afb485ff732 78666c93abf0cc07e09b86a7a4a1edec0d36d39b Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454154154 +0100	pull: Fast-forward
78666c93abf0cc07e09b86a7a4a1edec0d36d39b 496ca7811432c67c9c8b253e524ee2baef587fd2 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454159053 +0100	commit: Drafted game controller manaer
496ca7811432c67c9c8b253e524ee2baef587fd2 6b409fc7b196d5a71dcbfe6f23f1c158858af04e Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454167096 +0100	pull: Fast-forward
6b409fc7b196d5a71dcbfe6f23f1c158858af04e 3eb871b5b1e2cadbd6746458842746ae7d54506f Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454167774 +0100	commit: Cleaned previous pull
3eb871b5b1e2cadbd6746458842746ae7d54506f c8be725b2c6e2823bfd6728a8313321a1e9bc854 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454174995 +0100	commit: Drafted base lighting
c8be725b2c6e2823bfd6728a8313321a1e9bc854 570da96fb2523fa046168b67c654bc62ede8b245 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454183099 +0100	commit: Drafted lighting
570da96fb2523fa046168b67c654bc62ede8b245 d85c0ef9d869ca7e1fa8d67cb68de012a6180931 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454187936 +0100	commit: Drafted gems
d85c0ef9d869ca7e1fa8d67cb68de012a6180931 1d93b3cae25c6b940fd4c8e49f2fac5d37919b7f Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454190198 +0100	commit: Redrawn gems
1d93b3cae25c6b940fd4c8e49f2fac5d37919b7f 7f5984b1444a0fbd2c0630438c4839daa4754a74 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454190650 +0100	commit (merge): Solving conflicts
7f5984b1444a0fbd2c0630438c4839daa4754a74 27fc527a52484262049d6ecc26ee8fa8f7a260a1 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454191105 +0100	commit: Fixed lost references due to merge
27fc527a52484262049d6ecc26ee8fa8f7a260a1 2985cab0c7c1ecff6d8e1f858d7a9c33300fbd59 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454191969 +0100	commit: Assigned materials to gems
2985cab0c7c1ecff6d8e1f858d7a9c33300fbd59 d23b272d37740f5966387df963c072ef01e74d93 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454192585 +0100	commit: Added particles and trail. Renamed to main scene
d23b272d37740f5966387df963c072ef01e74d93 42135526c5f3964326b16f302ad31e9c52efdb54 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454193068 +0100	commit: Cleaned workspace
42135526c5f3964326b16f302ad31e9c52efdb54 40a17d7eeb993bc9807efa1cbd926ef821f422cd Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454203866 +0100	pull: Fast-forward
40a17d7eeb993bc9807efa1cbd926ef821f422cd 9af5189b4365684507d4c77b5d4cc9c08e71db19 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454230574 +0100	pull: Fast-forward
9af5189b4365684507d4c77b5d4cc9c08e71db19 64a0625c31b407202544818e63f2ca9b7ade2d0e Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454231178 +0100	commit: Fixed bug that prevented gem to refresh when combo was done
64a0625c31b407202544818e63f2ca9b7ade2d0e d6cac38849d1c562cd8781a4d3a8bf567f0a846d Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454231388 +0100	commit: Fixed project settings
d6cac38849d1c562cd8781a4d3a8bf567f0a846d 3a939a1acd45be2a640bc6004120fe5024bd572e Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454235019 +0100	commit: Implemented sillabe manager
3a939a1acd45be2a640bc6004120fe5024bd572e 10af13c1666f35d973e4148e1436f839c8163c80 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454237606 +0100	commit: Reworked gameplay
10af13c1666f35d973e4148e1436f839c8163c80 c2262c58762369d023eaabd83276a2bde8a9b688 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454238404 +0100	commit: Added sentences display according to selected gems
c2262c58762369d023eaabd83276a2bde8a9b688 d82641a27c608f4ccc8763522daa5e57345ae78c Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454238513 +0100	commit: Uppercase to sentences
d82641a27c608f4ccc8763522daa5e57345ae78c fb233e6dfc605eb13af7cd669900c839f6ea3849 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454239128 +0100	commit: Fixed collider reset
fb233e6dfc605eb13af7cd669900c839f6ea3849 76c75e9da52cfb15924d9d709df0cdfcaf8a3989 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454247446 +0100	commit: Added text coloring when success
76c75e9da52cfb15924d9d709df0cdfcaf8a3989 b7d1a86631addff16d851a93d0bfc615f081bdc2 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454247861 +0100	pull: Merge made by the 'recursive' strategy.
b7d1a86631addff16d851a93d0bfc615f081bdc2 f67839c635af0c187651471cd1357be708d2237d Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454248336 +0100	commit (merge): Merge
f67839c635af0c187651471cd1357be708d2237d 663f27b404344ae692f23d6d7a9f47149797c8d7 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454248645 +0100	commit: Added lights and trails to main scene
663f27b404344ae692f23d6d7a9f47149797c8d7 e6d845ae3baf26fbe131a91aa55ddda2f38de21b Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454248764 +0100	pull: Fast-forward
e6d845ae3baf26fbe131a91aa55ddda2f38de21b 0bc56bbf21096ab9b7be673a3dbd77bd5e3ddc20 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454249267 +0100	commit: Added sounds
0bc56bbf21096ab9b7be673a3dbd77bd5e3ddc20 9ea78df9bc5289a0a6bf752f421732334e8991bd Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454251016 +0100	commit: Changed background
9ea78df9bc5289a0a6bf752f421732334e8991bd 1a03a46ecaa05c64a34eaf4e0d8924173e3f9120 Distudio-dev01 <distudio-dev01@Distudio-dev01s-Mac-Pro.local> 1454255216 +0100	commit: Final release
