resolution de conflit
Showing
- Description.md 5 additions, 1 deletionDescription.md
- Images/readme/autoRoad.png 0 additions, 0 deletionsImages/readme/autoRoad.png
- Images/readme/placeEnd.png 0 additions, 0 deletionsImages/readme/placeEnd.png
- Images/readme/placeStart.png 0 additions, 0 deletionsImages/readme/placeStart.png
- Images/readme/runnerGif.gif 0 additions, 0 deletionsImages/readme/runnerGif.gif
- Images/readme/searchZone.png 0 additions, 0 deletionsImages/readme/searchZone.png
- README.md 29 additions, 17 deletionsREADME.md
- T3-Unity/Assets/Mapbox/Examples/Resources/maki/bin_img.png 0 additions, 0 deletionsT3-Unity/Assets/Mapbox/Examples/Resources/maki/bin_img.png
- T3-Unity/Assets/Mapbox/Examples/Resources/maki/bin_img.png.meta 88 additions, 0 deletions...ty/Assets/Mapbox/Examples/Resources/maki/bin_img.png.meta
- T3-Unity/Assets/Prefabs/normal_obj.prefab 114 additions, 0 deletionsT3-Unity/Assets/Prefabs/normal_obj.prefab
- T3-Unity/Assets/Prefabs/normal_obj.prefab.meta 7 additions, 0 deletionsT3-Unity/Assets/Prefabs/normal_obj.prefab.meta
- T3-Unity/Assets/Prefabs/strong_obj .prefab 114 additions, 0 deletionsT3-Unity/Assets/Prefabs/strong_obj .prefab
- T3-Unity/Assets/Prefabs/strong_obj .prefab.meta 7 additions, 0 deletionsT3-Unity/Assets/Prefabs/strong_obj .prefab.meta
- T3-Unity/Assets/Prefabs/weak_obj.prefab 114 additions, 0 deletionsT3-Unity/Assets/Prefabs/weak_obj.prefab
- T3-Unity/Assets/Prefabs/weak_obj.prefab.meta 7 additions, 0 deletionsT3-Unity/Assets/Prefabs/weak_obj.prefab.meta
- T3-Unity/Assets/Resources/T3_logo-discord.png 0 additions, 0 deletionsT3-Unity/Assets/Resources/T3_logo-discord.png
- T3-Unity/Assets/Resources/T3_logo-discord.png.meta 88 additions, 0 deletionsT3-Unity/Assets/Resources/T3_logo-discord.png.meta
- T3-Unity/Assets/Resources/rainbow-pointer.png 0 additions, 0 deletionsT3-Unity/Assets/Resources/rainbow-pointer.png
- T3-Unity/Assets/Resources/rainbow-pointer.png.meta 88 additions, 0 deletionsT3-Unity/Assets/Resources/rainbow-pointer.png.meta
- T3-Unity/Assets/Scenes/Map_Tests1.unity 453 additions, 128 deletionsT3-Unity/Assets/Scenes/Map_Tests1.unity
Please register or sign in to comment