30 Commits

Author SHA1 Message Date
1a896a85fe update 2026-01-19 14:33:40 +09:00
ccfd244efd 초기재고설정 2026-01-16 16:45:34 +09:00
086e61cfc2 Update InitializePopupWindow.cs 2026-01-16 11:38:20 +09:00
2d36b4247f 0116 2026-01-16 11:36:54 +09:00
6b78b68229 merge
merge and property
2025-12-24 17:36:01 +09:00
d4764e304f stack 2025-12-17 11:42:57 +09:00
3dba350fc2 versionUpdate,propertyView 2025-12-16 17:57:20 +09:00
7f1955e57a 축적 2025-12-15 10:07:26 +09:00
d600885302 3d complete 2025-12-11 18:26:09 +09:00
8a2ffed689 robotArm 2025-12-08 10:59:29 +09:00
d31408663b lightweighting 2025-11-11 19:00:24 +09:00
dbd841c3a0 complete 2025-11-11 17:13:17 +09:00
c8a86e9081 Merge branch 'freature/webgl' into OctopusSimulator/1111merged 2025-11-11 13:55:08 +09:00
b0d2ffc974 test 2025-11-11 13:51:47 +09:00
8fa250943a Merge branch 'freature/webgl' into OctopusSimulator/1111merged 2025-11-11 12:22:57 +09:00
e633c83fe0 clickable 2025-11-11 12:13:51 +09:00
5f58de3185 path mat change 2025-11-11 11:27:39 +09:00
79158576cf build update 2025-11-11 09:42:47 +09:00
0bea75fcd0 1105building 2025-11-06 10:14:50 +09:00
b6c7f163da trybuild 2025-11-05 11:53:37 +09:00
404865dca1 Merge branch 'OctopusSimulator/LH/ConveyorStation' into OctopusSimulator/LH/1104Merge 2025-11-04 19:17:06 +09:00
581cac7941 station 2025-11-04 19:07:37 +09:00
107da72dee bugfix 2025-11-04 19:02:01 +09:00
5956672127 Merge pull request 'ui 기본 개발' (#2) from OctopusSimulator/feature/UI into OctopusSimulator/Master
Reviewed-on: http://220.90.135.190:3000/khi/XRLib/pulls/2
2025-11-04 19:00:40 +09:00
logonkhi
bea3d4a804 ui 기본 개발 2025-11-04 18:58:04 +09:00
bb7ed2d6dc 1104 2025-11-04 11:02:02 +09:00
984e9188c1 modelimport 2025-10-16 10:24:29 +09:00
90fa689bce Merge branch 'master' into OctopusSimulator/LH/20250923 2025-09-30 12:14:42 +09:00
11dca464d9 20250930commit 2025-09-30 11:20:24 +09:00
607cedd782 20250925commit 2025-09-25 18:08:55 +09:00
3648 changed files with 270012 additions and 241120 deletions

View File

@@ -1,14 +0,0 @@
{
"permissions": {
"allow": [
"Bash(dir:*)",
"Bash(powershell -Command:*)",
"Bash(mkdir:*)",
"Bash(cat:*)",
"Bash(move:*)",
"Bash(find:*)"
],
"deny": [],
"ask": []
}
}

4
.gitignore vendored
View File

@@ -83,7 +83,3 @@ crashlytics-build.properties
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
.DS_Store
.idea/

View File

@@ -1,5 +0,0 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}

10
.vscode/launch.json vendored
View File

@@ -1,10 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}

70
.vscode/settings.json vendored
View File

@@ -1,70 +0,0 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.vs": true,
"**/.gitmodules": true,
"**/.vsconfig": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"Logs/": true,
"logs/": true,
"ProjectSettings/": true,
"UserSettings/": true,
"temp/": true,
"Temp/": true
},
"files.associations": {
"*.asset": "yaml",
"*.meta": "yaml",
"*.prefab": "yaml",
"*.unity": "yaml"
},
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.patterns": {
"*.sln": "*.csproj"
},
"dotnet.defaultSolution": "XRBase.slnx"
}

Some files were not shown because too many files have changed in this diff Show More