{"push_id":956116512,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d2c3808e9a4a8b0f39744992c59c567d68a35767","before":"959ca655cdba536cc9ae5dde85f634208edaff2a","commits":[{"sha":"0ff5e5cac41c7c6c35856364a64a5a787330f076","author":{"email":"8dfc93471fcc95a9c1c3c189207f6053f712e7c2@web.de","name":"danielbosselmann"},"message":"updated ringmenu with actual sprites added animations","distinct":true,"url":"https://api.github.com/repos/danielbosselmann/towerDefense/commits/0ff5e5cac41c7c6c35856364a64a5a787330f076"},{"sha":"d2c3808e9a4a8b0f39744992c59c567d68a35767","author":{"email":"8dfc93471fcc95a9c1c3c189207f6053f712e7c2@web.de","name":"danielbosselmann"},"message":"Merge branch 'master' of https://github.com/danielbosselmann/towerDefense\n\n# Conflicts:\n#\tTowerDefense/Assets/3DModels/enemies/Anim.meta\n#\tTowerDefense/Assets/3DModels/enemies/Anim/anim_spider.fbx.meta\n#\tTowerDefense/Assets/3DModels/enemies/Anim/anim_tank.fbx.meta\n#\tTowerDefense/Assets/3DModels/tower/Anim.meta\n#\tTowerDefense/Assets/3DModels/tower/Anim/MS_T_base_tower_anim.FBX.meta\n#\tTowerDefense/Assets/3DModels/tower/Anim/MS_T_optician_Anim.FBX.meta\n#\tTowerDefense/Assets/3DModels/tower/Anim/MS_construct_Anim.FBX.meta\n#\tTowerDefense/Assets/3DModels/tower/Anim/MS_electro_Anim.FBX.meta\n#\tTowerDefense/Assets/Particles.meta\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Partcile_Attack_PoisonDot.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Partcile_Robot_Bolt.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Partcile_Tower_OpticianAura.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Attack_LightningChain.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_RobotExplosion.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Robot_Shield.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Robot_Shield2.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Tower_BuildingSmoke.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Tower_Laboratory.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Tower_MuzzleFire.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particle_Tower_RocketFire.prefab\n#\tTowerDefense/Assets/Particles/AllParticleSystems/Particles_Tower_Electrician.prefab\n#\tTowerDefense/Assets/Particles/Particle_png/anim_lightning_cutoff.anim\n#\tTowerDefense/Assets/Particles/Particle_png/explosiveparticles.mat\n#\tTowerDefense/Assets/Particles/material/Clowd.mat\n#\tTowerDefense/Assets/Particles/material/Crack.mat\n#\tTowerDefense/Assets/Particles/material/Crack_2.mat\n#\tTowerDefense/Assets/Particles/material/Crack_3.mat\n#\tTowerDefense/Assets/Particles/material/Crack_4.mat\n#\tTowerDefense/Assets/Particles/material/New Material.mat\n#\tTowerDefense/Assets/Particles/material/chainbolt_mat.mat\n#\tTowerDefense/Assets/Particles/material/forcefield.mat\n#\tTowerDefense/Assets/Particles/material/ground.mat\n#\tTowerDefense/Assets/Particles/material/groundswirl.mat\n#\tTowerDefense/Assets/Particles/material/lightning_mat.mat\n#\tTowerDefense/Assets/Particles/material/mat_alphaCutoff_test.mat\n#\tTowerDefense/Assets/Particles/material/mat_cloud.mat\n#\tTowerDefense/Assets/Particles/material/mat_shiel.mat\n#\tTowerDefense/Assets/Particles/material/mat_shield.mat\n#\tTowerDefense/Assets/Particles/material/mat_sparkle.mat\n#\tTowerDefense/Assets/Particles/material/poison_mat.mat\n#\tTowerDefense/Assets/Particles/material/shield.mat\n#\tTowerDefense/Assets/Scenes/level_1_desert.unity\n#\tTowerDefense/Assets/Textures/tower/T_construc_decal_diffuse.png.meta\n#\tTowerDefense/Assets/UI/UI_Nextwave.png.meta\n#\tTowerDefense/Assets/UI/UI_Nextwave_Hover.png.meta\n#\tTowerDefense/Assets/UI/UI_Ring_BaseTower.png.meta\n#\tTowerDefense/Assets/UI/UI_Ring_BaseTower_Hover.png.meta\n#\tTowerDefense/Library/CurrentLayout.dwlt\n#\tTowerDefense/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tTowerDefense/Library/assetDatabase3\n#\tTowerDefense/Library/expandedItems\n#\tTowerDefense/Library/metadata/00/00000000000000004000000000000000\n#\tTowerDefense/Library/metadata/00/00000000000000007100000000000000\n#\tTowerDefense/Library/metadata/00/0000000000000000a100000000000000\n#\tTowerDefense/Library/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tTowerDefense/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tTowerDefense/Library/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tTowerDefense/Library/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tTowerDefense/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tTowerDefense/Library/metadata/85/852e56802eb941638acbb491814497b0\n#\tTowerDefense/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tTowerDefense/Library/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tTowerDefense/Library/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tTowerDefense/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tTowerDefense/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8\n#\tTowerDefense/TowerDefense.sln","distinct":true,"url":"https://api.github.com/repos/danielbosselmann/towerDefense/commits/d2c3808e9a4a8b0f39744992c59c567d68a35767"}]}