Commit Graph

9 Commits

Author SHA1 Message Date
Nukie
0aa613f41f
fix 2024-09-18 00:51:13 +02:00
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
Nukie
6861a075b5
mergeable
terrain nie działa jak coś
2024-09-18 00:29:20 +02:00
Nukie
bf08be0cdf
mergeable 2024-09-18 00:10:24 +02:00
adamwi1000
e4f8167dd7 bank
bank
2024-09-11 18:59:01 +02:00
KapiKapowaty
ec0f80f01e City 2024-09-11 18:46:05 +02:00
Nukie
5d85961dbd
bump: unity version 2024-08-02 16:13:34 +02:00
Nukie
cd1bd87e70
test 2024-08-02 07:03:09 +02:00
adamwi1000
b854205dcb test 2024-08-02 06:41:41 +02:00