8 Years Ago
Merge branch 'master' into ovr Conflicts: Unity/Game/Assets/Materials/CabinetChassis.mat Unity/Game/Assets/Prefabs/LegacyCabinet.prefab Unity/Game/Assets/Shaders/ScreenReflect.cginc Unity/Game/Assets/Shaders/ScreenReflect.shader