{"push_id":658450522,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"c3f6ec04ee719d7fbcc16a3816bf6ded51de128d","before":"326406148b5824e79c3d31cc2d7ec9273197b888","commits":[{"sha":"e904f56902076b60823c76fc974558c0e3767655","author":{"email":"024731c7513d40b6473302ae2379e1cb16689176@nyu.edu","name":"Alex Lau"},"message":"Optimized Corpses further (Removed Instantiation)\nEnlarged Portraits\nWorking on formations/allies","distinct":true,"url":"https://api.github.com/repos/TarlSS/Spacecats/commits/e904f56902076b60823c76fc974558c0e3767655"},{"sha":"c3f6ec04ee719d7fbcc16a3816bf6ded51de128d","author":{"email":"024731c7513d40b6473302ae2379e1cb16689176@nyu.edu","name":"Alex Lau"},"message":"Merge branch 'master' of https://github.com/TarlSS/Spacecats\n\nConflicts:\n\tSpacecats/Assets/2DShooterWeaponSystem/Prefabs/SparkParticleSystemPrefab.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/ChaserCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/DroneCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/FighterCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/LightFighterCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/LightTurretCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/StubbleHauserCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Enemies/Corpses/TurretCorpse.prefab\n\tSpacecats/Assets/Resources/Prefabs/Props/Corpses/BuildingCorpse.prefab\n\tSpacecats/Assets/Resources/Scenes/BehaviourTests.unity\n\tSpacecats/Assets/Resources/Scenes/Level1.unity\n\tSpacecats/Assets/Resources/Scenes/Level2.unity\n\tSpacecats/Assets/Resources/Scripts/Physics/PhysicsWhenVisible.cs","distinct":true,"url":"https://api.github.com/repos/TarlSS/Spacecats/commits/c3f6ec04ee719d7fbcc16a3816bf6ded51de128d"}]}