Nukie 78abb88a17 Merge branch 'miasto' ... # Conflicts: # Assets/Miasto_kapi/Scenes/SampleScene.unity.meta # Assets/Scenes/SampleScene.unity # Assets/Scenes/SampleScene.unity.meta # Assets/Scenes/bank.unity # Assets/Scenes/bank.unity.meta # Assets/Scenes/miasto kapi merge.unity # Assets/TextMesh Pro.meta # Assets/TextMesh Pro/Examples & Extras.meta # Assets/TextMesh Pro/Examples & Extras/Prefabs.meta # Assets/TextMesh Pro/Examples & Extras/Prefabs/Text Popup.prefab # Assets/TextMesh Pro/Examples & Extras/Scripts.meta # Assets/TextMesh Pro/Fonts.meta # Assets/TextMesh Pro/Resources.meta # Assets/TextMesh Pro/Resources/Fonts & Materials.meta # Assets/TextMesh Pro/Shaders.meta		2024-09-18 00:36:35 +02:00
..
Editor	test	2024-08-02 06:41:41 +02:00
img	test	2024-08-02 07:03:09 +02:00
Input	test	2024-08-02 06:41:41 +02:00
Miasto_kapi	Merge branch 'miasto'	2024-09-18 00:36:35 +02:00
Prefabs	City	2024-09-11 18:46:05 +02:00
Scenes	Merge branch 'miasto'	2024-09-18 00:36:35 +02:00
scripts	bank	2024-09-11 18:59:01 +02:00
Settings	City	2024-09-11 18:46:05 +02:00
TextMesh Pro	Merge branch 'miasto'	2024-09-18 00:36:35 +02:00
TutorialInfo	City	2024-09-11 18:46:05 +02:00
UI Toolkit	test	2024-08-02 07:03:09 +02:00
Editor.meta	test	2024-08-02 06:41:41 +02:00
grass.mat	City	2024-09-11 18:46:05 +02:00
grass.mat.meta	City	2024-09-11 18:46:05 +02:00
img.meta	test	2024-08-02 06:41:41 +02:00
Input.meta	test	2024-08-02 06:41:41 +02:00
Miasto_kapi.meta	City	2024-09-11 18:46:05 +02:00
New Terrain 1.asset	Merge branch 'miasto'	2024-09-18 00:36:35 +02:00
New Terrain 1.asset.meta	City	2024-09-11 18:46:05 +02:00
New Terrain 2.asset	test	2024-08-02 06:41:41 +02:00
New Terrain 2.asset.meta	test	2024-08-02 06:41:41 +02:00
New Terrain.asset	test	2024-08-02 06:41:41 +02:00
New Terrain.asset.meta	test	2024-08-02 06:41:41 +02:00
Prefabs.meta	test	2024-08-02 06:41:41 +02:00
Scenes.meta	test	2024-08-02 06:41:41 +02:00
scripts.meta	test	2024-08-02 06:41:41 +02:00
Settings.meta	City	2024-09-11 18:46:05 +02:00
TextMesh Pro.meta	bank	2024-09-11 18:59:01 +02:00
TutorialInfo.meta	City	2024-09-11 18:46:05 +02:00
UI Toolkit.meta	test	2024-08-02 06:41:41 +02:00
Unicorn_horn.fbx	test	2024-08-02 07:03:09 +02:00
Unicorn_horn.fbx.meta	test	2024-08-02 06:41:41 +02:00
UniversalRenderPipelineGlobalSettings.asset	City	2024-09-11 18:46:05 +02:00
UniversalRenderPipelineGlobalSettings.asset.meta	City	2024-09-11 18:46:05 +02:00