There was an error fetching the commit references. Please try again later.
Merge branch 'main' into 'main'
# Conflicts: # T3-Unity/Assets/Scenes/Map_Tests.unity # T3-Unity/Assets/test.json
Showing
- T3-Unity/Assets/Prefabs/Runner.prefab 230 additions, 0 deletionsT3-Unity/Assets/Prefabs/Runner.prefab
- T3-Unity/Assets/Prefabs/Runner.prefab.meta 7 additions, 0 deletionsT3-Unity/Assets/Prefabs/Runner.prefab.meta
- T3-Unity/Assets/Runners.cs 42 additions, 0 deletionsT3-Unity/Assets/Runners.cs
- T3-Unity/Assets/Runners.cs.meta 11 additions, 0 deletionsT3-Unity/Assets/Runners.cs.meta
- T3-Unity/Assets/RunnersFactory.cs 37 additions, 0 deletionsT3-Unity/Assets/RunnersFactory.cs
- T3-Unity/Assets/RunnersFactory.cs.meta 11 additions, 0 deletionsT3-Unity/Assets/RunnersFactory.cs.meta
- T3-Unity/Assets/Scenes/Main_Menu.unity 13 additions, 0 deletionsT3-Unity/Assets/Scenes/Main_Menu.unity
- T3-Unity/Assets/Scenes/Map_Tests.unity 20 additions, 73 deletionsT3-Unity/Assets/Scenes/Map_Tests.unity
- T3-Unity/Assets/Scenes/ui.unity 20 additions, 6 deletionsT3-Unity/Assets/Scenes/ui.unity
- T3-Unity/Assets/Scripts/ExitScene.cs 12 additions, 0 deletionsT3-Unity/Assets/Scripts/ExitScene.cs
- T3-Unity/Assets/Scripts/ExitScene.cs.meta 11 additions, 0 deletionsT3-Unity/Assets/Scripts/ExitScene.cs.meta
- T3-Unity/Assets/Scripts/MenuToggle.cs 7 additions, 2 deletionsT3-Unity/Assets/Scripts/MenuToggle.cs
- T3-Unity/Assets/Scripts/RouteTracer.cs 10 additions, 2 deletionsT3-Unity/Assets/Scripts/RouteTracer.cs
- T3-Unity/Assets/Scripts/SceneChanger.cs 14 additions, 0 deletionsT3-Unity/Assets/Scripts/SceneChanger.cs
- T3-Unity/Assets/Scripts/SceneChanger.cs.meta 11 additions, 0 deletionsT3-Unity/Assets/Scripts/SceneChanger.cs.meta
- T3-Unity/Assets/Scripts/changeplus.cs 1 addition, 1 deletionT3-Unity/Assets/Scripts/changeplus.cs
- T3-Unity/Assets/test.json 988 additions, 184 deletionsT3-Unity/Assets/test.json
Please register or sign in to comment