GitHub PushEvent at 2014-06-12 09:37:58
Repository: UOP-Gamejam-2014
Actor: aidanoleary
Payload: {"shas":[["c42a77ed232a6119ea387b18ef59431a39b61b9c","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge pull request #19 from aidanoleary/master\n\nAdded sprites and textures","race122",true],["c34d311791be146166edf4a22f5dfbf1b5d61209","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Commit.","race122",true],["4c5780668d736858a15226fc85eca22651c0c83b","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014\n\nConflicts:\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/assetDatabase3\n\tUOP-Gamejam-2014.userprefs","race122",true],["b7f110c0058641a998c643c7294d4b4e8e7ed9ef","762849ec471d6d224df6750a041dc3bcd5891abe@gmail.com","Backup push before fixing the game","floorman",true],["97c3c006e507c3c8db987cf556c27bffa5a86e9a","762849ec471d6d224df6750a041dc3bcd5891abe@gmail.com","Backup push before fixing the game","floorman",true],["b0cc16705e2ff3f96e74683b72172ba72142c69d","762849ec471d6d224df6750a041dc3bcd5891abe@gmail.com","Merge branch 'master' of github.com:race122/UOP-Gamejam-2014\n\nConflicts:\n\tAssets/Code/Player.cs\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/assetDatabase3\n\tLibrary/guidmapper","floorman",true],["51beca4429bf69162a6ae1df9760cb3377f1b3cf","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge pull request #20 from floorman/master\n\nBackup push before fixing the game","race122",true],["846aed7dec285d3a1d9e1e338305136c38facad4","c3e8cc3033f2c781f833ba38e5d458df86c76c2b@users.noreply.github.com","merging again","Kierz",true],["e6386b94f028a13f33262b4090c450206ddd4193","c3e8cc3033f2c781f833ba38e5d458df86c76c2b@users.noreply.github.com","still merging","Kierz",true],["88217051f02a9361dea9cdd2cd7c3dc03b9929da","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Added UI to dansTest.unity.","race122",true],["c858aba0f0a1e747bf7149a931689b2123844590","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014\n\nConflicts:\n\tAssets/Scenes/DansTest.unity","race122",true],["8ac24ead2f126611d9d5edbb0b00a181497d042f","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Fixing dansTest.unity.","race122",true],["feaf47adeb48ba61350d48de700d055989c1678a","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014\n\nConflicts:\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/assetDatabase3","race122",true],["f29de7eb78580c6aa65251ebd7c3fd55a610d86b","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Commit.x","race122",true],["2bfdbd6333e804de6beb0b413cb9da064e8d8ea6","c3e8cc3033f2c781f833ba38e5d458df86c76c2b@users.noreply.github.com","still merging","Kierz",true],["19f65462690a4da1a51e8fc4f01063d83101d6e4","c3e8cc3033f2c781f833ba38e5d458df86c76c2b@users.noreply.github.com","still merging","Kierz",true],["58d354284a0ff85ae74cdb015355aa4fab81eb55","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge pull request #21 from Kierz/master\n\nMerge #6","race122",true],["4483732b647ad2a4690931326b020ac9e83c73cc","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","UI implementation take 2.","race122",true],["947c986def7083a297374fd6d36ff011f0c7e251","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014\n\nConflicts:\n\tAssets/Code/HudScript.cs\n\tAssets/Code/Rock.cs\n\tAssets/Scenes/DansTest.unity\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/assetDatabase3\n\tLibrary/expandedItems\n\tLibrary/guidmapper\n\tUOP-Gamejam-2014.userprefs","race122",true],["d188560f3e33e3144bdeae0358563157e451025e","acb2bd2a5357c8eca01e2a40ef3fab49e0588af3@hotmail.com","commit.","race122",true]],"size":43,"ref":"refs/heads/master","head":"538a8bb85c7bda1246d0526139096a739f6166f2"}