{"push_id":1295507996,"size":10,"distinct_size":2,"ref":"refs/heads/master","head":"93f186e3f6f0107dbd4645831e66d59708b1dd46","before":"9ec44a73e0b8c13054a2a34a35b59539485fc5f4","commits":[{"sha":"ca3735a1e92c611d41645e543ed4120a3b7c2b4d","author":{"name":"Dylan McMahon","email":"d269bd2a7d0baecacaf7155911b29b81f6228323@ad.aie.edu"},"message":"Pre Pull","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/ca3735a1e92c611d41645e543ed4120a3b7c2b4d"},{"sha":"434fac0cb027e501ceba7094e580436bad626c3f","author":{"name":"Dylan McMahon","email":"d269bd2a7d0baecacaf7155911b29b81f6228323@ad.aie.edu"},"message":"Merge branch 'David' of https://github.com/DavidAzouz29/Food-Fight-2016-Prototype-Unity into Dylan\n\n# Conflicts:\n#\tAssets/Prefabs/ScenePrefabs/LevelCanvas.prefab\n#\tAssets/Scenes/L1_Kitchen.unity\n#\tAssets/Scripts/PlayerProperties.cs","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/434fac0cb027e501ceba7094e580436bad626c3f"},{"sha":"ab9b9aaa2dc474f28d1e0b4501a2dc259898a376","author":{"name":"Dylan McMahon","email":"d269bd2a7d0baecacaf7155911b29b81f6228323@ad.aie.edu"},"message":"Monday final commit\nWorking Build","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/ab9b9aaa2dc474f28d1e0b4501a2dc259898a376"},{"sha":"08f841f8951bc8b1b825c0d7d275675b70fc18d3","author":{"name":"unknown","email":"e49c064be93d24c6de012f1a0554feba4279e206@MELB-38AED0.ad.aie.edu"},"message":"+ renamed mats and adjusted levels","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/08f841f8951bc8b1b825c0d7d275675b70fc18d3"},{"sha":"387ae7d74a08a997a3ab2b81fa43f5dfb2d1dcd7","author":{"name":"unknown","email":"e49c064be93d24c6de012f1a0554feba4279e206@MELB-38AED0.ad.aie.edu"},"message":"Merge branch 'master' of https://github.com/DavidAzouz29/Food-Fight-2016-Prototype-Unity into Dylan\n\n# Conflicts:\n#\tAssets/Models/Characters/RockyRoad/Boss/Materials.meta\n#\tAssets/Models/Characters/RockyRoad/Boss/Materials/lambert1.mat.meta\n#\tAssets/Prefabs/ScenePrefabs/LevelCanvas.prefab\n#\tAssets/Scripts/Player.meta","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/387ae7d74a08a997a3ab2b81fa43f5dfb2d1dcd7"},{"sha":"4f717abcf4b40c7efe15004b33003bd73d0ae9e9","author":{"name":"unknown","email":"e49c064be93d24c6de012f1a0554feba4279e206@MELB-38AED0.ad.aie.edu"},"message":"Merge?","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/4f717abcf4b40c7efe15004b33003bd73d0ae9e9"},{"sha":"98cf95933879c23078fe7915ee52264e02c3e1a5","author":{"name":"Dylan McMahon","email":"d269bd2a7d0baecacaf7155911b29b81f6228323@ad.aie.edu"},"message":"WIP Combat tweaks\nWIP Animations\nStarted emerssive maps","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/98cf95933879c23078fe7915ee52264e02c3e1a5"},{"sha":"3fe78d4117e57b840b15c24812760a81500acce9","author":{"name":"Duncan Wilson","email":"c44f87f74fd0bd6067f6d6204e744969e97ac6d7@ad.aie.edu"},"message":"Build 1.4","distinct":false,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/3fe78d4117e57b840b15c24812760a81500acce9"},{"sha":"d1db43c471cfc6626b6ae836649db566257625c8","author":{"name":"Duncan Wilson","email":"c44f87f74fd0bd6067f6d6204e744969e97ac6d7@ad.aie.edu"},"message":"Merge branch 'Dylan' of https://github.com/DavidAzouz29/Food-Fight-2016-Prototype-Unity\n\n# Conflicts:\n#\tAssets/Animation/T-Shape Rig/TShape_LQuickAttack_Anim (1).fbx.meta\n#\tAssets/Animation/T-Shape Rig/TShape_UpperCut_Anim (1).fbx.meta\n#\tAssets/Animation/UI.meta\n#\tAssets/Editor/CustPropertyDrawer.cs.meta~5be3db6b03652bd608ace1c72555e59b33f7aedc.meta\n#\tAssets/Editor/CustPropertyDrawer.cs.meta~HEAD\n#\tAssets/Editor/CustPropertyDrawer.cs.meta~HEAD.meta\n#\tAssets/Materials/Materials_VC/VC_A.mat\n#\tAssets/Materials/RockyRoad_Boss_Mat.mat.meta\n#\tAssets/Materials/RockyRoad_Neut_Mat.mat\n#\tAssets/Materials/envMAt.meta\n#\tAssets/Materials/lambert1.mat\n#\tAssets/Models/Blobs & Projectiles/Materials/BroccoLion Textures_vcols.mat\n#\tAssets/Models/Blobs & Projectiles/Materials/PrincessCake_Blob_Diff.mat.meta\n#\tAssets/Models/Blobs & Projectiles/Materials/RockyroadLittle_vcols.mat.meta\n#\tAssets/Models/Characters/BroccoLION/BASE_BROCCOLION.fbm.meta\n#\tAssets/Models/Characters/BroccoLION/BASE_BROCCOLION.fbm/Ambient Occlusion Document.png.meta\n#\tAssets/Models/Characters/BroccoLION/BASE_BROCCOLION.fbm/BroccoLion Textures_normals.bmp.meta\n#\tAssets/Models/Characters/BroccoLION/BASE_BROCCOLION.fbm/BroccoLion Textures_vcols.tga.meta\n#\tAssets/Models/Characters/BroccoLION/Materials.meta\n#\tAssets/Models/Characters/BroccoLION/Materials/BroccoLion Textures_vcols.mat\n#\tAssets/Models/Characters/BroccoLION/Materials/BroccoLion Textures_vcols.mat.meta\n#\tAssets/Models/Characters/Materials.meta\n#\tAssets/Models/Characters/RockyRoad/Boss/Materials.meta\n#\tAssets/Models/Characters/RockyRoad/Neut/Materials.meta\n#\tAssets/Models/Characters/RockyRoad/Weak/Materials.meta\n#\tAssets/Models/Characters/WaterMelomon/Materials.meta\n#\tAssets/Models/Enviroment Models/Kitchen/BlueBook.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/Bread.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/Bread2.fbx.meta\n#\tAssets/Models/Enviroment Models/Kitchen/CuttingBoard.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/Materials.meta\n#\tAssets/Models/Enviroment Models/Kitchen/Materials/lambert6.mat.meta\n#\tAssets/Models/Enviroment Models/Kitchen/Materials/lambert7.mat.meta\n#\tAssets/Models/Enviroment Models/Kitchen/Materials/unwrapChekcerShader.mat.meta\n#\tAssets/Models/Enviroment Models/Kitchen/PinkBook.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/RedBook.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/Toaster.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/coffeeJar.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/kettle.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/milkCarton.fbx\n#\tAssets/Models/Enviroment Models/Kitchen/window2.fbx.meta\n#\tAssets/Prefabs/Blobs/CoLeo blob.prefab\n#\tAssets/Prefabs/Blobs/CoLeo blob.prefab.meta\n#\tAssets/Prefabs/Blobs/broccoli blob.prefab\n#\tAssets/Prefabs/Blobs/broccoli blob.prefab.meta\n#\tAssets/Prefabs/Blobs/water melon blob.prefab\n#\tAssets/Prefabs/Blobs/water melon blob.prefab.meta\n#\tAssets/Prefabs/Character/BroccoLION.prefab\n#\tAssets/Prefabs/Character/BroccoLION.prefab.meta\n#\tAssets/Prefabs/Character/CauiliLION.prefab\n#\tAssets/Prefabs/Character/CauiliLION.prefab.meta\n#\tAssets/Prefabs/Character/Watermelomon.prefab\n#\tAssets/Prefabs/Character/Watermelomon.prefab.meta\n#\tAssets/Prefabs/Effects/GroundPound.prefab\n#\tAssets/Prefabs/Effects/Stun.prefab\n#\tAssets/Prefabs/SceneStuff/BackgroundImage.prefab\n#\tAssets/Prefabs/SceneStuff/CanvasUI.prefab\n#\tAssets/Scenes/L1_Kitchen.unity\n#\tAssets/Sprites & effects/Back_Button.png.meta\n#\tAssets/Sprites & effects/BubblePA/BubbleMaterial.mat.meta\n#\tAssets/Sprites & effects/Credits_Button.png.meta\n#\tAssets/Sprites & effects/Meshes/Jump.meta\n#\tAssets/Sprites & effects/Meshes/Jump/Jump.mat\n#\tAssets/Sprites & effects/Meshes/Jump/Jump.mat.meta\n#\tAssets/Sprites & effects/Meshes/Jump/JumpTrail_geo_effect.fbx\n#\tAssets/Sprites & effects/Meshes/Jump/JumpTrail_geo_effect.fbx.meta\n#\tAssets/Sprites & effects/Meshes/Jump/test 1.tga\n#\tAssets/Sprites & effects/Meshes/Jump/test 1.tga.meta\n#\tAssets/Sprites & effects/Meshes/Jump/test2.tga\n#\tAssets/Sprites & effects/Meshes/Jump/test2.tga.meta\n#\tAssets/Sprites & effects/Next_button.png.meta\n#\tAssets/Sprites & effects/Options_button.png.meta\n#\tAssets/Sprites & effects/Particles/Flinch.mat\n#\tAssets/Sprites & effects/Particles/Flinch.mat.meta\n#\tAssets/Sprites & effects/Particles/SheildBreak_material.mat\n#\tAssets/Sprites & effects/Player1_Bottle.png.meta\n#\tAssets/Sprites & effects/Start_Button.png.meta\n#\tAssets/Sprites & effects/UI/Back_Button.png\n#\tAssets/Sprites & effects/UI/Back_Button.png.meta\n#\tAssets/Sprites & effects/UI/MilkCarton.png\n#\tAssets/Sprites & effects/UI/MilkCarton.png.meta\n#\tAssets/Sprites & effects/UI/Next_button.png\n#\tAssets/Sprites & effects/UI/Next_button.png.meta\n#\tAssets/Sprites & effects/UI/Player1_Bottle.png\n#\tAssets/Sprites & effects/UI/Player1_Bottle.png.meta\n#\tAssets/Sprites & effects/UI/Player2_Bottle.png\n#\tAssets/Sprites & effects/UI/Player2_Bottle.png.meta\n#\tAssets/Sprites & effects/UI/Player3_Bottle.png\n#\tAssets/Sprites & effects/UI/Player3_Bottle.png.meta\n#\tAssets/Sprites & effects/UI/WhiteBackground.png\n#\tAssets/Sprites & effects/UI/WhiteBackground.png.meta\n#\tAssets/Sprites & effects/UI/player4_Bottle.png\n#\tAssets/Sprites & effects/UI/player4_Bottle.png.meta\n#\tAssets/Sprites & effects/UI/scroll.cs\n#\tAssets/Sprites & effects/UI/scroll.cs.meta\n#\tAssets/Sprites & effects/uv set/Jump/JumpTrail_geo_effect.fbx.meta\n#\tAssets/Sprites & effects/uv set/Jump/scroll.cs.meta\n#\tAssets/Sprites & effects/uv set/Jump/test 1.tga.meta\n#\tAssets/Sprites & effects/uv set/Jump/test2.tga.meta\n#\tAssets/Sprites & effects/uv set/Stun/Flinch.tga.meta\n#\tAssets/Textures/Flinch.tga\n#\tAssets/Textures/Flinch.tga.meta\n#\tAssets/Textures/PrincessCake_Boss_NRML.png.meta\n#\tAssets/XTUtilities/Editor.meta","distinct":true,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/d1db43c471cfc6626b6ae836649db566257625c8"},{"sha":"93f186e3f6f0107dbd4645831e66d59708b1dd46","author":{"name":"Duncan Wilson","email":"c44f87f74fd0bd6067f6d6204e744969e97ac6d7@ad.aie.edu"},"message":"Fixed mismatched GUIDs. Imported assets that weren't previously imported.","distinct":true,"url":"https://api.github.com/repos/DavidAzouz29/Food-Fight-2016-Prototype-Unity/commits/93f186e3f6f0107dbd4645831e66d59708b1dd46"}]}
{"actor":{"display_login":"DuncanKWilson"}}