Commit Graph

Select branches

Hide Pull Requests

20250716merge

lh/20250527

lh/20250528

lh/20250529

lh/20250605

lh/20250610

lh/20250617

lh/20250624

lh/20250625

lh/20250707

lh/20250715

lh/20250716

lh/20250730

lwj/250619

lwj/250625

lwj/250716

lwj/250717

main

merge/250529

rjh/20250715_00

rjh/20250716_00

rjh/20250716_01

rjh/20250716_02

rjh/250716_03

simulator_khm_20250715

ssl/250527

websetting

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 8eb5cfe2bc asdf lh/20250730 UVCLimHun 2025-09-08 12:03:11 +09:00
• 8b873aa20d move UVCLimHun 2025-08-04 17:26:24 +09:00
• 34b1390d09 stash UVCLimHun 2025-07-31 16:08:23 +09:00
• 97a32e4285 position UVCLimHun 2025-07-31 12:18:57 +09:00
• 2dfa2b2eda rightweighting UVCLimHun 2025-07-31 12:06:16 +09:00
• 301b5d8d67 cutresource_1 UVCLimHun 2025-07-30 10:55:55 +09:00
• 07858a99b3 오브젝트 목록 할당 팝업메세지 추가 main 준학 노 2025-07-23 17:27:28 +09:00
• e6d842c89a 리셋 부분 수정 Long 값 처리 준학 노 2025-07-23 13:44:18 +09:00
• 87cfbba0cb fix window scrollbar remove fix ui text cannot click lwj 2025-07-23 11:24:24 +09:00
• 9915b30166 소수점처리 준학 노 2025-07-23 10:45:24 +09:00
• 05ae017731 fix conveyor move lwj 2025-07-23 10:28:20 +09:00
• 7d3e2c7a5f fix only fisrt lwj 2025-07-22 18:25:07 +09:00
• 261fbac539 fix UVCLimHun 2025-07-22 18:02:00 +09:00
• 0af1034974 deleteinterval UVCLimHun 2025-07-22 16:22:57 +09:00
• bde808b592 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-22 15:57:36 +09:00
• 4b7a07b5cf bubblecomplete UVCLimHun 2025-07-22 15:57:29 +09:00
• 2535ce4a1b fix save camera position lwj 2025-07-22 15:56:22 +09:00
• 04dc2468f7 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-22 14:36:31 +09:00
• 2a5e716c91 bubble UVCLimHun 2025-07-22 14:36:21 +09:00
• 497c559175 Editor에서 MQTT Manager Destroy 되면서 생기는 오류 제거 준학 노 2025-07-22 14:29:05 +09:00
• d2acc16c78 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-22 14:03:55 +09:00
• 95adb69ab0 bubble UVCLimHun 2025-07-22 14:03:40 +09:00
• 6858c66450 133번 132번 수정 완료 하이라이트 박스사이즈 1.1배로 확대 준학 노 2025-07-21 18:11:30 +09:00
• b7fa22f11a 집가고싶다 UVCLimHun 2025-07-21 17:18:32 +09:00
• 9ac566321e loadingfail UVCLimHun 2025-07-21 14:27:35 +09:00
• 0f38a1d780 summary UVCLimHun 2025-07-18 15:50:58 +09:00
• a233ea4f91 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-18 14:42:52 +09:00
• 65ca5c5f32 20250718_bugfix UVCLimHun 2025-07-18 14:42:37 +09:00
• eeb5ba03e2 콜라이더삭제 lwj 2025-07-18 14:24:39 +09:00
• 36ad26ae2a 불필요한 update 삭제 lwj 2025-07-18 13:28:19 +09:00
• c6ce6d2c18 namespace정리 폴더 위치 이동 준학 노 2025-07-18 11:35:21 +09:00
• e4f2f60388 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-18 10:37:34 +09:00
• c6c0b9186a conveyor fix UVCLimHun 2025-07-18 10:37:17 +09:00
• 758d80aff8 에러메세지 추가 lwj 2025-07-18 10:36:14 +09:00
• 058dd69f97 led수정 lwj 2025-07-18 10:32:58 +09:00
• 81e45788cc fix lwj 2025-07-17 18:28:24 +09:00
• 4ede5816de asdf UVCLimHun 2025-07-17 18:24:43 +09:00
• 9fefc31550 fix simulationmodel_agv's type fix rack product position's collider off lwj/250717 lwj 2025-07-17 16:12:52 +09:00
• a4f4f98538 push UVCLimHun 2025-07-17 16:12:11 +09:00
• 899f26474a Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-17 15:48:26 +09:00
• d7ee0c4b9a middle UVCLimHun 2025-07-17 15:47:48 +09:00
• 286e7f4a59 bubbleUI 준학 노 2025-07-17 15:39:12 +09:00
• a79f80ce1f request 시 try catch 추가 제이슨 파싱 실패시 에러팝업 생성 오브젝트 삭제시 기즈모 삭제 준학 노 2025-07-17 15:07:36 +09:00
• cf5db448ff update UVCLimHun 2025-07-17 14:53:40 +09:00
• 0aac6eeb82 update UVCLimHun 2025-07-17 11:41:03 +09:00
• f4143f90d2 Merge branch 'rjh/250716_03' 준학 노 2025-07-16 18:10:46 +09:00
• 96ce3ba5e4 logicdata item 생성 로직수정 rjh/250716_03 준학 노 2025-07-16 18:10:29 +09:00
• 44673137af Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-16 16:45:27 +09:00
• b84e0ee488 ui update UVCLimHun 2025-07-16 16:44:58 +09:00
• 8ab89edc18 add changes lwj/250716 lwj 2025-07-16 16:31:18 +09:00
• 7bb6891d44 add led action lwj 2025-07-16 16:25:17 +09:00
• 3704b2a7f1 파일위치이동 rjh/20250716_02 준학 노 2025-07-16 14:57:57 +09:00
• b274539e1c current UVCLimHun 2025-07-16 14:57:38 +09:00
• 174c81907a Merge branch 'simulator_khm_20250715' UVCLimHun 2025-07-16 12:13:22 +09:00
• 372cf7de6b asdf simulator_khm_20250715 UVCLimHun 2025-07-16 12:13:13 +09:00
• d140c86be0 pallet UVCLimHun 2025-07-16 12:10:57 +09:00
• 46770120cc Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-16 11:38:00 +09:00
• 0fd5e44401 process UVCLimHun 2025-07-16 11:37:49 +09:00
• e31ad735f3 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Simulation 준학 노 2025-07-16 11:37:00 +09:00
• bb9bddf34f 카메라위치저장수정 rjh/20250716_01 준학 노 2025-07-16 11:36:48 +09:00
• a09cb64ddf 1126 UVCLimHun 2025-07-16 11:27:00 +09:00
• 5cdf2b5413 resourceupdate UVCLimHun 2025-07-16 11:18:57 +09:00
• 43dc7b86bb Merge branch '20250716merge' UVCLimHun 2025-07-16 11:12:32 +09:00
• 70fc1f433f backup 20250716merge UVCLimHun 2025-07-16 11:12:19 +09:00
• 025ce1ec68 light UVCLimHun 2025-07-16 10:53:49 +09:00
• 75f387723d merge 준학 노 2025-07-16 10:46:07 +09:00
• d9c3a9f827 카메라디비저장완료 rjh/20250716_00 준학 노 2025-07-16 10:45:35 +09:00
• 5d21d6e11c Merge branch 'simulator_khm_20250715' into 20250716merge UVCLimHun 2025-07-16 10:40:55 +09:00
• 14b8c75785 sceneupdated UVCLimHun 2025-07-16 10:33:09 +09:00
• 7e7340717e bugfix lh/20250716 UVCLimHun 2025-07-16 09:40:18 +09:00
• 27ecc35708 Merge branch 'main' of http://220.90.135.190:3000/uvcxr/Simulation UVCLimHun 2025-07-15 18:21:00 +09:00
• a7a9ff1c2e UI적용 UVCLimHun 2025-07-15 18:20:51 +09:00
• 77944f951a mqtt 준학 노 2025-07-15 18:10:38 +09:00
• 14f65da8ff merge 준학 노 2025-07-15 18:10:34 +09:00
• 64c94474d2 merge rjh/20250715_00 준학 노 2025-07-15 18:07:24 +09:00
• 932f4c9611 Merge branch 'lh/20250715' UVCLimHun 2025-07-15 17:59:49 +09:00
• ddacb54484 정합성/ui lh/20250715 UVCLimHun 2025-07-15 17:35:53 +09:00
• ec93847c53 Update Simulation_0.0.1.unity uvckhm6376 2025-07-15 16:25:17 +09:00
• 24f1e86b28 박스 큐브 사이즈(1:1)로 제작 uvckhm6376 2025-07-15 16:23:07 +09:00
• 83db394a70 카메라 제한 기본디폴트값 추가 준학 노 2025-07-15 11:17:08 +09:00
• 755df45cfa 깃이그노에어 에셋셋팅있는거제거후 테스트 준학 노 2025-07-15 11:12:01 +09:00
• 39b47928f3 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Simulation 준학 노 2025-07-15 11:01:15 +09:00
• 7d55b3190a MERGE 준학 노 2025-07-15 11:01:10 +09:00
• 4c33c97ad1 temp UVCLimHun 2025-07-15 11:00:21 +09:00
• 0be41c12cd 카메라 이동범위 설정 -0.2(노준학) 기즈모 고정 -0.5(노준학) 완료 MQTT 재연결 로직 -0.2(노준학) - 작업중 준학 노 2025-07-15 11:00:11 +09:00
• 6aa4a7978b comit UVCLimHun 2025-07-14 17:50:13 +09:00
• e92778f77b why UVCLimHun 2025-07-14 12:10:34 +09:00
• a9159cb508 cube UVCLimHun 2025-07-14 09:36:53 +09:00
• 8e97f43011 update lh/20250707 UVCLimHun 2025-07-14 09:35:27 +09:00
• 8a5e3b28ba 중간안정화 UVCLimHun 2025-07-08 13:42:26 +09:00
• 89364d9f0a commit UVCLimHun 2025-07-07 09:57:13 +09:00
• f780b0fabb lightingupdate UVCLimHun 2025-07-01 09:57:16 +09:00
• 664d32c24f merge main devs lwj/250625 lwj 2025-06-26 15:56:32 +09:00
• e855f49513 add resources add worker fix process logic lwj 2025-06-26 15:55:03 +09:00
• 506aa54e91 quality UVCLimHun 2025-06-26 15:53:13 +09:00
• 7dadb75ed8 envirment lh/20250625 UVCLimHun 2025-06-26 11:48:44 +09:00
• b899ba6acd bugfix lh/20250624 UVCLimHun 2025-06-25 14:41:15 +09:00
• 0f94e89de7 remove unused corutines in webmanager lwj 2025-06-24 17:10:00 +09:00
• 73e8c28990 merge with lwj/250619 lwj 2025-06-24 17:07:39 +09:00
• 8e0bb1a559 remove all corutine base restAPI call lwj 2025-06-24 17:02:33 +09:00