vladislove 89d4eb33b5 Merge remote-tracking branch 'malina/GOPA' ... # Conflicts: # Unity3_lab/Assembly-CSharp.csproj # Unity3_lab/Assets/Scenes/MainScene.unity # Unity3_lab/Assets/Scripts/BallController.cs # Unity3_lab/Library/ArtifactDB # Unity3_lab/Library/Artifacts/3b/3ba6e432b17cae6417863fce6431fe7a # Unity3_lab/Library/Artifacts/3b/3bbc336f3f4cdafa3a6d424711473b61 # Unity3_lab/Library/Artifacts/3d/3dcc96f8377998b50699c15e0cea58fb # Unity3_lab/Library/Artifacts/f3/f3b3b06a2d00b1e61380f9f0d92d01d8 # Unity3_lab/Library/Artifacts/f7/f7d248ef6f1ec005a753320a97d84e68 # Unity3_lab/Library/Bee/1900b0aE-inputdata.json # Unity3_lab/Library/Bee/1900b0aE.dag # Unity3_lab/Library/Bee/1900b0aE.dag.json # Unity3_lab/Library/Bee/1900b0aE.dag.payloads # Unity3_lab/Library/Bee/2400b0aEDbg.dag_derived # Unity3_lab/Library/Bee/TundraBuildState.state # Unity3_lab/Library/Bee/TundraBuildState.state.map # Unity3_lab/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.dll # Unity3_lab/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.ref.dll # Unity3_lab/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.rsp # Unity3_lab/Library/Bee/artifacts/1900b0aE.dag/post-processed/Assembly-CSharp.dll # 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/Bee/tundra.log.json # Unity3_lab/Library/BurstCache/JIT/BurstCacheManifest.cm # Unity3_lab/Library/BurstCache/JIT/Hashes/a110ffe6b760e4b56cb86ae44bc7857d.bhc # Unity3_lab/Library/EditorUserBuildSettings.asset # 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/com.unity.ide.rider/PersistedState.asset # 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/Logs/AssetImportWorker2.log # Unity3_lab/Logs/AssetImportWorker5-prev.log # Unity3_lab/Logs/shadercompiler-UnityShaderCompiler.exe-0.log # Unity3_lab/Logs/shadercompiler-UnityShaderCompiler.exe-1.log # Unity3_lab/Logs/shadercompiler-UnityShaderCompiler.exe-2.log # Unity3_lab/Unity3_lab.sln # Unity3_lab/UserSettings/Layouts/default-6000.dwlt		2025-11-13 11:31:09 +03:00
..
985f6db058cfa099abe4b36b44fc33f4	Main commit	2025-11-11 23:10:37 +03:00
987651f85745716800a591e73da5b102	Main commit	2025-11-11 23:10:37 +03:00