Commit Graph

6 Commits

Author SHA1 Message Date
d8025fbc14 всё срослось 2025-11-14 01:06:29 +03:00
ed8e7aa235 1
хуй, ну платформы добавила, всякие фддоны, фул готово почти
2025-11-13 02:32:37 +03:00
d864f0db29 Merge remote-tracking branch 'malina/GOPA'
# Conflicts:
#	Unity3_lab/Assets/Scenes/MainScene.unity
#	Unity3_lab/Library/ArtifactDB
#	Unity3_lab/Library/Artifacts/0d/0dc5019e8ffbe484ffe49a45a97c3a47
#	Unity3_lab/Library/Artifacts/28/2891da42ed1baffa3184815f69419569
#	Unity3_lab/Library/Artifacts/76/76cfd87afc2516f8c733e007dee8ba8f
#	Unity3_lab/Library/Artifacts/9c/9cdc9440aa66116becd7b77038646ad6
#	Unity3_lab/Library/Artifacts/ac/ac9d5860e606d7678f19b61fe16a6182
#	Unity3_lab/Library/Artifacts/c5/c50c3275b8e1e75ea5343b31e0931ce7
#	Unity3_lab/Library/Bee/TundraBuildState.state
#	Unity3_lab/Library/Bee/TundraBuildState.state.map
#	Unity3_lab/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.dll
#	Unity3_lab/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.pdb
#	Unity3_lab/Library/Bee/artifacts/2400b0aE.dag/Assembly-CSharp.ref.dll
#	Unity3_lab/Library/Bee/artifacts/2400b0aE.dag/post-processed/Assembly-CSharp.dll
#	Unity3_lab/Library/Bee/artifacts/2400b0aE.dag/post-processed/Assembly-CSharp.pdb
#	Unity3_lab/Library/Bee/backend1.traceevents
#	Unity3_lab/Library/Bee/backend2.traceevents
#	Unity3_lab/Library/Bee/buildprogram0.traceevents
#	Unity3_lab/Library/Bee/fullprofile.json
#	Unity3_lab/Library/Bee/tundra.digestcache
#	Unity3_lab/Library/BurstCache/JIT/BurstCacheManifest.cm
#	Unity3_lab/Library/BurstCache/JIT/Hashes/8bd375117381c8f40ed1fc10f10e1697.bhc
#	Unity3_lab/Library/BurstCache/JIT/Hashes/a110ffe6b760e4b56cb86ae44bc7857d.bhc
#	Unity3_lab/Library/BurstCache/JIT/Hashes/eb5762c176c563408800b67be30a9bca.bhc
#	Unity3_lab/Library/InspectorExpandedItems.asset
#	Unity3_lab/Library/PreviousActionData.bin
#	Unity3_lab/Library/PreviousActionStack.bin
#	Unity3_lab/Library/SceneVisibilityState.asset
#	Unity3_lab/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Unity3_lab/Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Unity3_lab/Library/Search/98957a664bd18c47a3e41b2a0189ef53.33332.b.index
#	Unity3_lab/Library/Search/transactions.db
#	Unity3_lab/Library/ShaderCache.db
#	Unity3_lab/Library/ShaderCache/EditorEncounteredVariants
#	Unity3_lab/Library/SourceAssetDB
#	Unity3_lab/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json
#	Unity3_lab/Library/UndoData.bin
#	Unity3_lab/Library/UndoStack.bin
#	Unity3_lab/Library/ilpp.pid
#	Unity3_lab/Logs/AssetImportWorker0-prev.log
#	Unity3_lab/Logs/AssetImportWorker0.log
#	Unity3_lab/Logs/AssetImportWorker1-prev.log
#	Unity3_lab/Logs/AssetImportWorker1.log
#	Unity3_lab/UserSettings/Layouts/default-6000.dwlt
#	Unity3_lab/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
2025-11-12 23:06:32 +03:00
8946e6704d шлейф
более менее работает
2025-11-12 01:57:52 +03:00
fa1f74b15d +физика, не законченная 2025-11-12 01:29:42 +03:00
75ef02e1fa Main commit 2025-11-11 23:10:37 +03:00