Commit Graph

467 Commits

Author SHA1 Message Date
dab794e479 agvmanager .임시수정 2025-05-26 20:22:01 +09:00
d814eedc5a megre 2025-05-26 20:21:53 +09:00
23a2394e58 Connection 연결 기능,Component 연결 기능
Inspector 모달
2025-05-26 20:14:19 +09:00
3f0fa7bb59 Merge pull request 'Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정' (#101) from jym/250526_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/101
2025-05-26 17:45:36 +09:00
정영민
1310ce1823 Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정 2025-05-26 17:39:10 +09:00
a6746e5272 Merge pull request '라인 렌더러 버그 수정' (#100) from sjm/250526 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/100
2025-05-26 14:26:01 +09:00
c463877bb1 Merge pull request '불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정' (#99) from jym/250526_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/99
2025-05-26 14:25:47 +09:00
jmaniuvc
b2cd3621fc 거리측정 라인 두께 조절 2025-05-26 12:06:08 +09:00
jmaniuvc
9fd0f759cd 라인 렌더러가 정상적으로 사라지지 않는 버그 수정 2025-05-26 11:47:47 +09:00
정영민
df2140212b 불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정 2025-05-26 11:41:17 +09:00
9ede173f77 Merge pull request 'jym/250526_02' (#98) from jym/250526_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/98
2025-05-26 11:01:02 +09:00
정영민
57397f956a 충돌 해결 2025-05-26 11:00:28 +09:00
wsh
1d9279a4af Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-26 10:39:57 +09:00
wsh
8d612d8b30 1 2025-05-26 10:39:54 +09:00
jym
73d75a0c7b Merge branch 'main' into dev/jym/250526_00 2025-05-26 10:15:13 +09:00
7e3081c4fc Merge pull request '에셋불러오기 후 agv 자동생성.' (#95) from njh/250526_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/95
2025-05-26 10:10:18 +09:00
정영민
ee12425aca AssetManager 에서 발생하는 에러 수정 2025-05-26 10:07:48 +09:00
ed1c4d4c20 Merge branch 'njh/250525_01' into njh/250526_00 2025-05-26 09:23:12 +09:00
7e1667ac1b fbx.. 2025-05-26 09:22:08 +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