Commit Graph

449 Commits

Author SHA1 Message Date
wsh
8d612d8b30 1 2025-05-26 10:39:54 +09:00
jym
1ed10a5de6 Merge pull request 'STK,AGV' (#94) from njh/250525_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/94
2025-05-25 15:49:19 +09:00
0f40cfdbe7 merge 2025-05-25 15:30:08 +09:00
jym
23c51f94b0 Merge pull request '3D Factory 설정 기능 개선' (#93) from jym/250525_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/93
2025-05-25 15:27:55 +09:00
정영민
424ef63a79 3D Factory 설정 기능 개선 2025-05-25 15:27:25 +09:00
51936e7cd6 merge 2025-05-25 14:30:10 +09:00
8576a8f541 코드수정 2025-05-25 14:28:38 +09:00
f8c7e77019 Update README.md 2025-05-25 14:20:22 +09:00
wsh
222f9229e9 1 2025-05-25 14:19:46 +09:00
wsh
6e7f5fefbb MQTT 테스트 화면 추가 2025-05-25 14:19:35 +09:00
d644a32301 STK 2025-05-25 13:24:48 +09:00
7fd96a6d05 Merge pull request '배치된 오브젝트 저장 및 저장된 오브젝트 불러오기 기능 추가' (#91) from jym/250524_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/91
2025-05-24 17:04:11 +09:00
정영민
b0deccbd89 TopMenu 의 New Project, Open Project 기능 추가 2025-05-24 17:03:39 +09:00
4fa1a76ba5 Update README.md 2025-05-24 16:11:04 +09:00
wsh
831d0b17ae MQTTTestResult 모달 추가 2025-05-24 16:01:45 +09:00
aee8c0614f .. 2025-05-24 15:54:06 +09:00
9780c297e6 agv . mqtt 연동작업 2025-05-24 14:11:29 +09:00
정영민
fbf67a2f36 Merge branch 'jym/250524_00' into jym/250524_01
# Conflicts:
#	Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs
#	Assets/Scripts/Studio/Managers/AssetManager.cs
#	Assets/Scripts/Studio/Managers/ManagerHub.cs
#	Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs
#	Assets/Scripts/Studio/UI/Panel/Panel_AssetManager.cs
2025-05-24 12:59:08 +09:00
정영민
a751b7d0f3 에셋 저장, 불러오기 2025-05-24 12:51:30 +09:00
be2520a553 Update README.md 2025-05-24 11:19:18 +09:00
wsh
370b40ce88 TemporaryMQTTClient 추가 2025-05-24 11:18:34 +09:00
wsh
55f23c9f03 1 2025-05-24 09:36:09 +09:00
d37ffb6e2e Merge pull request 'sjm/250523_2' (#90) from sjm/250523_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/90
2025-05-24 09:33:19 +09:00
jmaniuvc
60d85a930b 충돌 2025-05-23 21:17:33 +09:00
jmaniuvc
1fefb2d384 불필요 코드 제거 2025-05-23 21:16:38 +09:00
jmaniuvc
b56dd00ee8 완료 2025-05-23 21:07:17 +09:00
jmaniuvc
b5bcfb4ca9 저장 2025-05-23 20:36:02 +09:00
jmaniuvc
e33a795d2d 저장 2025-05-23 20:26:03 +09:00
jmaniuvc
819ad4430d 저장 2025-05-23 20:18:26 +09:00
jmaniuvc
1e53ea3f54 저장 2025-05-23 20:12:44 +09:00
jmaniuvc
740427e9b3 저장 2025-05-23 20:05:19 +09:00
jmaniuvc
1be2d715d4 패널 활성화 2025-05-23 19:00:09 +09:00
1539a49b16 Merge pull request '자산 관리자 Local Assets Load 기능 개발' (#89) from jym/250523_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/89
2025-05-23 17:01:56 +09:00
정영민
fd42f2b11b 자산 관리자 Local Assets Load 기능 개발 2025-05-23 17:00:57 +09:00
060dc241b1 Update README.md 2025-05-23 16:48:02 +09:00
wsh
ffbced48c4 AssetDataService 삭제 2025-05-23 16:47:02 +09:00
wsh
e23391f955 1 2025-05-23 16:42:02 +09:00
wsh
71c62f9d64 Panel_OpenProjectInfo와 Panel_NewProjectInfo 의 위치를 Panel_Start.Content 하위로 변경 2025-05-23 15:09:12 +09:00
jmaniuvc
67af2fb862 패널 이동 2025-05-23 14:59:37 +09:00
wsh
a1c1844a5c 1 2025-05-23 14:58:01 +09:00
wsh
fac1ec9337 minimap 컴파일러 경고 수정 2025-05-23 14:56:32 +09:00
wsh
1fe0ef3d62 디자인 매우일부 적용 2025-05-23 14:54:24 +09:00
jmaniuvc
fa383fd85c 충돌 해결 2025-05-23 14:53:33 +09:00
jmaniuvc
0918ac3542 UI 수정 2025-05-23 14:52:29 +09:00
5ab0270392 agv 테스트중 2025-05-23 14:41:31 +09:00
wsh
bca4dc81bb Panel_QuickStart -> Panel_Start 2025-05-23 14:28:46 +09:00
wsh
79ea12b702 NewStudioPGD 삭제 !!!! ^^... 2025-05-23 14:06:32 +09:00
jmaniuvc
7f9dd3ad57 MQTTData 버튼 추가 2025-05-23 13:59:45 +09:00
wsh
fce0546697 Canvas_Component 삭제 2025-05-23 13:52:09 +09:00
wsh
b7aeec020b Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-23 13:32:26 +09:00