{"push_id":848172227,"size":8,"distinct_size":3,"ref":"refs/heads/issue#100","head":"10b8b896fa7c579a4456a9e0ad433453e90c66c0","before":"2723094c878ba3e366415b241330ace21e8da65a","commits":[{"sha":"2a2cbf281ee1b42734c0193dbe177ba8c2fc6001","author":{"email":"56a3e2fe5781ae297cdbb31c9035a3b772230b0a@hotmail.com","name":"laianad"},"message":"game controller code fixes","distinct":false,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/2a2cbf281ee1b42734c0193dbe177ba8c2fc6001"},{"sha":"c76bff60551a0e7ae247f6504f918c9cf8867cbb","author":{"email":"56a3e2fe5781ae297cdbb31c9035a3b772230b0a@hotmail.com","name":"laianad"},"message":"reactive building construction and add units implementation","distinct":false,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/c76bff60551a0e7ae247f6504f918c9cf8867cbb"},{"sha":"aff4d02187f967b82e72231b380eb0750c2e7cff","author":{"email":"56a3e2fe5781ae297cdbb31c9035a3b772230b0a@hotmail.com","name":"laianad"},"message":"building construction improvements","distinct":false,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/aff4d02187f967b82e72231b380eb0750c2e7cff"},{"sha":"d6e6b0179b7cc444f3cc057fe452b0e83ff3491b","author":{"email":"56a3e2fe5781ae297cdbb31c9035a3b772230b0a@hotmail.com","name":"laianad"},"message":"troop option added","distinct":false,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/d6e6b0179b7cc444f3cc057fe452b0e83ff3491b"},{"sha":"2a7d8d4157267082ebf98be63e934de80623a655","author":{"email":"56a3e2fe5781ae297cdbb31c9035a3b772230b0a@hotmail.com","name":"laianad"},"message":"new construct script","distinct":false,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/2a7d8d4157267082ebf98be63e934de80623a655"},{"sha":"bbbb7cbbeed2922098ba0b1759b36132ae42f119","author":{"email":"e861b92070ace023e60c917f55db00a0f3520aa0@gmail.com","name":"bernatdelsanto"},"message":"Merge remote-tracking branch 'refs/remotes/origin/issue#100-1' into issue#100\n\nConflicts:\n\tRTS Dev Project/Assets/Animators/Egyptians.meta\n\tRTS Dev Project/Assets/Data/Terrain.asset\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_001__Untitled.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_001__Untitled_001.mat\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_001__Untitled_001.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_005__Untitled.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_005__Untitled_001.mat\n\tRTS Dev\nProject/Assets/Models/Characters/egipcians/Materials/Material_005__Untitled_001.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_001.mat\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_001.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_001__Untitled.mat\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_001__Untitled.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_005__Untitled.mat\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_005__Untitled.mat.meta\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_005__Untitled_001.mat\n\tRTS Dev\nProject/Assets/Models/Characters/various/Materials/Material_005__Untitled_001.mat.meta\n\tRTS Dev Project/Assets/Music.meta\n\tRTS Dev Project/Assets/Prefabs/Units/Greeks/greeks_knight.prefab\n\tRTS Dev Project/Assets/Scenes/Sprint 3.unity.meta\n\tRTS Dev Project/Assets/Scripts/Control/GameController.cs\n\tRTS Dev Project/ProjectSettings/ProjectSettings.asset","distinct":true,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/bbbb7cbbeed2922098ba0b1759b36132ae42f119"},{"sha":"730cc6f50598e2dc5830a3b4c88df567335912d0","author":{"email":"e861b92070ace023e60c917f55db00a0f3520aa0@gmail.com","name":"bernatdelsanto"},"message":"Fixing merge","distinct":true,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/730cc6f50598e2dc5830a3b4c88df567335912d0"},{"sha":"10b8b896fa7c579a4456a9e0ad433453e90c66c0","author":{"email":"e861b92070ace023e60c917f55db00a0f3520aa0@gmail.com","name":"bernatdelsanto"},"message":"Integration","distinct":true,"url":"https://api.github.com/repos/jgirald/ES2015F/commits/10b8b896fa7c579a4456a9e0ad433453e90c66c0"}]}