GitHub PushEvent at 2014-10-06 16:27:57
Repository: UVU_CyberDino
Actor: thefarnz83
Payload: {"shas":[["387666d5bfc8e06c4134407b5208ba6a06b29086","b9ec723103afc67870209b36d5c400a924112d71@gmail.com","updated vfx materials","Michael Farnsworth",true],["0fa511dcf07e3f98f37ebd9420b6f02a71adcd29","b9ec723103afc67870209b36d5c400a924112d71@gmail.com","Merge branch 'Michael'\n\nConflicts:\n\tUnityProject-CyberDino/Assets/Resources/LucasWeapons.meta~HEAD.meta\n\tUnityProject-CyberDino/Assets/Resources/LucasWeapons.meta~PickUps.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Material.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Material/StartCore.mat.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/EpicSonicScream/Prefab/EpicSonicScream.prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower/Prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/FlameThrower/Prefab/fireBreath.prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash/Prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/MadDash/Prefab/MadDash.prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Materials.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Materials/saliva2.mat.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Prefab.meta\n\tUnityProject-CyberDino/Assets/Resources/VFX/LucasWeapons/TeleportSlam/Prefab/TeleSlam.prefab.meta","Michael Farnsworth",true]],"size":2,"ref":"refs/heads/master","head":"0fa511dcf07e3f98f37ebd9420b6f02a71adcd29"}