{"push_id":573394941,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"01b564f4bd3aa7b7a6d525e8243a5118242ddf91","before":"1354dad44bca2a9a56664038fc8c2ac8fd55708f","commits":[{"sha":"284c7d63b0d652bed1a710902bffc6d445085c08","author":{"email":"747602179f036608ca959d0ec48500d8242b96cd@gmail.com","name":"Marc Jarvis"},"message":"Added fractured objects and fixed camera ctrls.\n\nInukshuk and Tower prefabs exist with destruction thresholds. Free camera\non player now has camera controls working properly.\n\n\tnew file:   Assets/Models/Fractures/Inukshuk.fbx\n\tnew file:   Assets/Models/Fractures/Inukshuk_fractured.fbx\n\tnew file:   Assets/Models/Fractures/Tower.fbx\n\tnew file:   Assets/Models/Fractures/Tower_fractured.fbx\n\tnew file:   Assets/Prefabs/DestructableObjects/InukshukGrp.prefab\n\trenamed:    Library/expandedItems -> Assets/Prefabs/DestructableObjects/TowerGrp.prefab","distinct":true,"url":"https://api.github.com/repos/scarlethammergames/arena/commits/284c7d63b0d652bed1a710902bffc6d445085c08"},{"sha":"01b564f4bd3aa7b7a6d525e8243a5118242ddf91","author":{"email":"747602179f036608ca959d0ec48500d8242b96cd@gmail.com","name":"Marc Jarvis"},"message":"Merge branch 'master' of https://github.com/scarlethammergames/arena\n\nConflicts:\n\tAssembly-CSharp-Editor-vs.csproj\n\tAssets/Prefabs/DestructableObjects.meta\n\tAssets/Prefabs/DestructableObjects/TowerGrp.prefab\n\tAssets/Prefabs/enemyAI.meta\n\tAssets/Scenes/MarcTests/Models.meta\n\tLibrary/CurrentLayout.dwlt\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tLibrary/assetDatabase3\n\tLibrary/guidmapper\n\tarena-csharp.sln\n\tarena.sln","distinct":true,"url":"https://api.github.com/repos/scarlethammergames/arena/commits/01b564f4bd3aa7b7a6d525e8243a5118242ddf91"}]}