10 Years Ago
Merge branch 'master' of arcade into Unity5 Conflicts: Unity/Assets/Prefabs/LegacyCabinet.prefab Unity/Assets/Scenes/GameTest.unity Unity/Assets/Scenes/Test.unity Unity/Assets/Scripts/ClickToPlayTest.cs Unity/Assets/Scripts/Events/PlayerJoinRequest.asset Unity/Assets/Scripts/GameManager.cs Unity/Assets/Scripts/Networking/SharedCallbacks.cs Unity/Assets/bolt/assemblies/bolt.dll Unity/Assets/bolt/assemblies/bolt.dll.mdb Unity/Assets/bolt/assemblies/editor/bolt.editor.dll Unity/Assets/bolt/assemblies/editor/bolt.editor.dll.mdb Unity/Assets/bolt/assemblies/udpkit/udpkit.dll Unity/Assets/bolt/assemblies/udpkit/udpkit.dll.mdb Unity/Assets/bolt/scenes/BoltDebugScene.unity premake5.lua