Merge branch 'develop' into 'jacco-2'
# Conflicts: # Vrij II/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset # Vrij II/Assets/Scripts/Weapon Scripts/Shoot.cs # Vrij II/fmod_editor.log
Showing
- Vrij II/Assets/AllSkyFree/AllSkyFree_Menu.cs 2 additions, 2 deletionsVrij II/Assets/AllSkyFree/AllSkyFree_Menu.cs
- Vrij II/Assets/Allsorts Native.meta 1 addition, 1 deletionVrij II/Assets/Allsorts Native.meta
- Vrij II/Assets/Allsorts Native/Materials.meta 1 addition, 1 deletionVrij II/Assets/Allsorts Native/Materials.meta
- Vrij II/Assets/Allsorts Native/Materials/New Material.mat 31 additions, 0 deletionsVrij II/Assets/Allsorts Native/Materials/New Material.mat
- Vrij II/Assets/Allsorts Native/Materials/New Material.mat.meta 8 additions, 0 deletions...II/Assets/Allsorts Native/Materials/New Material.mat.meta
- Vrij II/Assets/Allsorts Native/allsorts.physicMaterial 14 additions, 0 deletionsVrij II/Assets/Allsorts Native/allsorts.physicMaterial
- Vrij II/Assets/Allsorts Native/allsorts.physicMaterial.meta 8 additions, 0 deletionsVrij II/Assets/Allsorts Native/allsorts.physicMaterial.meta
- Vrij II/Assets/Allsorts Native/table.physicMaterial 14 additions, 0 deletionsVrij II/Assets/Allsorts Native/table.physicMaterial
- Vrij II/Assets/Allsorts Native/table.physicMaterial.meta 8 additions, 0 deletionsVrij II/Assets/Allsorts Native/table.physicMaterial.meta
- Vrij II/Assets/Animation.meta 8 additions, 0 deletionsVrij II/Assets/Animation.meta
- Vrij II/Assets/Animation/NPC Animation.meta 8 additions, 0 deletionsVrij II/Assets/Animation/NPC Animation.meta
- Vrij II/Assets/Animation/NPC Animation/Animations.meta 8 additions, 0 deletionsVrij II/Assets/Animation/NPC Animation/Animations.meta
- Vrij II/Assets/Animation/NPC Animation/Animations/Caught in trap loop.anim 198395 additions, 0 deletions...imation/NPC Animation/Animations/Caught in trap loop.anim
- Vrij II/Assets/Animation/NPC Animation/Animations/Caught in trap loop.anim.meta 8 additions, 0 deletions...on/NPC Animation/Animations/Caught in trap loop.anim.meta
- Vrij II/Assets/Animation/NPC Animation/Animations/Caught in trap.anim 24215 additions, 0 deletions...ts/Animation/NPC Animation/Animations/Caught in trap.anim
- Vrij II/Assets/Animation/NPC Animation/Animations/Caught in trap.anim.meta 8 additions, 0 deletions...imation/NPC Animation/Animations/Caught in trap.anim.meta
- Vrij II/Assets/Animation/NPC Animation/Animations/Child drowning.anim 11102 additions, 0 deletions...ts/Animation/NPC Animation/Animations/Child drowning.anim
- Vrij II/Assets/Animation/NPC Animation/Animations/Child drowning.anim.meta 8 additions, 0 deletions...imation/NPC Animation/Animations/Child drowning.anim.meta
- Vrij II/Assets/Animation/NPC Animation/Animations/Child eating.anim 69422 additions, 0 deletions...sets/Animation/NPC Animation/Animations/Child eating.anim
- Vrij II/Assets/Animation/NPC Animation/Animations/Child eating.anim.meta 8 additions, 0 deletions...Animation/NPC Animation/Animations/Child eating.anim.meta
Please register or sign in to comment