{"push_id":1502202841,"size":6,"distinct_size":2,"ref":"refs/heads/FreddiesMasterBranch","head":"f9a8a7dfc9a1fb80d28283331c1cbe406b073101","before":"d8c5423782c6d2eb64085c04400a2513b654ebce","commits":[{"sha":"c9c608968202c161c724f4352964ac0516365bed","author":{"name":"Frederic Babord","email":"0d004c21e0b43f0310b61ff90b8a13d836a907fa@gmail.com"},"message":"Merged branch FreddiesMasterBranch into Sam2","distinct":false,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/c9c608968202c161c724f4352964ac0516365bed"},{"sha":"167c2941b3a7fa1ba0d088349d2d76fc2f6b8099","author":{"name":"Frederic Babord","email":"0d004c21e0b43f0310b61ff90b8a13d836a907fa@gmail.com"},"message":"Something","distinct":false,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/167c2941b3a7fa1ba0d088349d2d76fc2f6b8099"},{"sha":"7efbf9ec5dd24ad0aca81fad7c62d8e999243702","author":{"name":"Frederic Babord","email":"0d004c21e0b43f0310b61ff90b8a13d836a907fa@gmail.com"},"message":"reverse?","distinct":false,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/7efbf9ec5dd24ad0aca81fad7c62d8e999243702"},{"sha":"7d86b910527bc14fd0c504788a3718af020924f0","author":{"name":"Sam Groves","email":"64cfe5e646d537924854fc0efd391a0f0cb5d29d@hotmail.co.uk"},"message":"Added the final ghost bits that work.\n<Note:> ONLY use Large Ghost, Normal Ghost and Charge Ghost. Couldn't test if anims were working properly as I had no way to aim... Duplicate and change aforementioned ghost prefabs for variety.","distinct":false,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/7d86b910527bc14fd0c504788a3718af020924f0"},{"sha":"bf87c90a7e53bab8b14c913bced4c088453d49c0","author":{"name":"Frederic Babord","email":"0d004c21e0b43f0310b61ff90b8a13d836a907fa@gmail.com"},"message":"Merge remote-tracking branch 'origin/Sam2' into FreddiesMasterBranch\n\n# Conflicts:\n#\tAGD/AGD.userprefs\n#\tAGD/Assembly-CSharp-Editor-firstpass.csproj\n#\tAGD/Assembly-CSharp-Editor.csproj\n#\tAGD/Assembly-CSharp-firstpass.csproj\n#\tAGD/Assembly-CSharp.csproj\n#\tAGD/Assembly-UnityScript.unityproj\n#\tAGD/Assets/Anims/Purple Ghost Model/Purple Ghost Model Controller.controller\n#\tAGD/Assets/Resources/Prefabs/Alex.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Charge Ghost.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Ghost 2.0 (Local).prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Ghost 2.0.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Large Ghost.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/NewGhost.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Normal Ghost.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Teleport Ghost.prefab\n#\tAGD/Assets/Resources/Prefabs/Enemies/Throwing Ghost.prefab\n#\tAGD/Assets/Resources/Scenes/NewMenu/Menu.unity\n#\tAGD/Assets/Resources/Scenes/TestScene.unity\n#\tAGD/Assets/Scripts/Networking/NetworkedThirdPersonCharacter.cs\n#\tAGD/Assets/Scripts/Rooms/Room.cs","distinct":true,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/bf87c90a7e53bab8b14c913bced4c088453d49c0"},{"sha":"f9a8a7dfc9a1fb80d28283331c1cbe406b073101","author":{"name":"Frederic Babord","email":"0d004c21e0b43f0310b61ff90b8a13d836a907fa@gmail.com"},"message":"~ Stairs fixed\n~ Proton pack rotated\n+ 15 second match countdown\n+ Ghost info and control in match countdown\n~ Damage text now showing actual damage delt\n+ Currnt Wave indicator\n+ 4x player and mast textures assigned by playerid\n+ fixed player jumping\n+ Ghost animations & animator\n+ Ghost screen SFX\n~ Reverse / Teleport now work\n~ Charge subtracts points more reliably and systematically\n+ Executable fixed due to game manager bug\n~ Damage Increaded and recharge rate increased\n+ Stone pillar base","distinct":true,"url":"https://api.github.com/repos/dmfreddie/AdvancedGamesDevelopment/commits/f9a8a7dfc9a1fb80d28283331c1cbe406b073101"}]}
{"actor":{"display_login":"dmfreddie"}}