Compare commits

...

8 Commits

Author SHA1 Message Date
dea21e2af5 Merge pull request 'find-the-sweet-spot' (#25) from find-the-sweet-spot into main
Reviewed-on: #25
2026-05-21 20:14:38 +02:00
4f9aa12cad Merge pull request 'Eda minigame but new branch' (#22) from EdaSweeSpotMinigame into main
Reviewed-on: #22
2026-05-21 20:00:31 +02:00
gravitrax-bublina
f427dbb6e7 Move minigame audio into Assets 2026-05-21 19:57:39 +02:00
gravitrax-bublina
2d5b6fae60 Remove unused placeholder model assets 2026-05-21 19:45:22 +02:00
e776b9476e Revert "merge conflict"
This reverts commit 37797d5f7d.
2026-05-18 20:57:27 +02:00
37797d5f7d merge conflict
psl co tam mám změnit?
2026-05-18 18:06:56 +02:00
fed08d08ad Merge pull request 'Package patch' (#23) from Pajka into main
Reviewed-on: #23
2026-05-17 22:23:23 +02:00
843c121666 Package patch 2026-05-17 22:21:36 +02:00
7 changed files with 2 additions and 34 deletions

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 5d7070679a02c0f478502a9eac088352
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a9886d0962880e14fb8072fee41dc9b5 guid: 22ca1d6a0bb686a409e5f1fc1164b686
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 8a3ae6902f1c0f640a60306c36bf7976
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2e89477d2c2cb534988b1a3912bf69dd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -12,7 +12,6 @@
"com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.remote-config": "4.2.5", "com.unity.remote-config": "4.2.5",
"com.unity.render-pipelines.universal": "17.2.0", "com.unity.render-pipelines.universal": "17.2.0",
"com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.toolchain.linux-x86_64": "2.0.11", "com.unity.toolchain.linux-x86_64": "2.0.11",
"com.unity.ugui": "2.0.0", "com.unity.ugui": "2.0.0",
>>>>>>> origin/main >>>>>>> origin/main

View File

@@ -135,16 +135,6 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.nuget.newtonsoft-json": {
"version": "3.2.2",
"depth": 0,
"com.unity.sysroot": {
"version": "2.0.10",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": { "com.unity.sysroot.linux-x86_64": {
"version": "2.0.9", "version": "2.0.9",
"depth": 1, "depth": 1,
@@ -237,7 +227,7 @@
"dependencies": { "dependencies": {
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.modules.unitywebrequest": "1.0.0" "com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.sysroot": "2.0.10" "com.unity.sysroot": "2.0.10"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"