Commit Graph

Select branches

Hide Pull Requests

bugfix/processor-ui-fixes

dd

feature/autoItemUI

feature/entitynetworkterminal

feature/network-property

hsb/260120_00

hsb/260122_00

hsb/260126_00

hsb/260127_00

hsb/260128_00

hsb/260129_00

hsb/260202_00

hsb/260203_00

hsb/260204_00

hsb/260206_00

hsb/260209

hsb/260210_00

jym/260119_00

jym/260120_00

jym/260122_00

jym/260123_00

jym/260127_00

jym/260128_00

jym/260128_01

jym/260129_00

jym/260129_01

jym/260203_00

jym/260203_01

jym/260210_00

jym/260228_00

lwj/260208/playbackTempUI

lwj/260209/onlyWIAScene

main

rjh/260208

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#5

#6

#7

#8

#9

Mono Color

• 72d2ff8c2a [방소연] AW 전시회 버전(수정) main 방소연 프로 2026-03-13 09:50:02 +09:00
• 5459b9ce01 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-11 11:59:41 +09:00
• 66a65a042c fix mqtt njh 2026-02-11 11:59:38 +09:00
• 282d39fa99 fix render value wsh 2026-02-11 11:56:52 +09:00
• 3b14573eff merege njh 2026-02-10 22:18:28 +09:00
• ced34a07a4 [방소연] AI 온도 제어 기능 추가 njh 2026-02-10 22:14:01 +09:00
• 626df5be5f [정영민] 카메라 위치 조정 및 UI 오류 수정 정영민 2026-02-10 21:43:10 +09:00
• 0003d67fc0 [방소연] injector animator 추가 njh 2026-02-10 21:17:58 +09:00
• 38b4af45a8 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-10 20:53:00 +09:00
• 7ba313b54c [방소연] Agent AI 제어 추가 njh 2026-02-10 20:52:54 +09:00
• e25d240e9b Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-10 20:50:43 +09:00
• 8d6018cff3 [노준학] 라이브러리 오브젝트 배치 위치 변경 wsh 2026-02-10 20:50:35 +09:00
• 6d35616f2d fix gizmo 버그수정 정영민 2026-02-10 20:49:46 +09:00
• 1c8272e952 [정영민] UI effect 오류 수정 정영민 2026-02-10 19:07:22 +09:00
• d0c18776cd fix 현대 njh 2026-02-10 19:00:51 +09:00
• a802c8d407 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-10 18:42:28 +09:00
• f96ed46d96 add animiaton s njh 2026-02-10 18:42:18 +09:00
• 647b4d0899 [정영민] 설비 아이콘 활성화 오류 및 카메라 위치 오류 수정 정영민 2026-02-10 18:25:06 +09:00
• 928a2d1625 merge wia scene njh 2026-02-10 18:18:15 +09:00
• c9160f2cab Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-10 18:16:04 +09:00
• 73336b514a merge njh 2026-02-10 18:15:36 +09:00
• 85f4a959af CompletionResult 기반 UI 색상 매핑 및 파이프라인 완료 검증 추가 wsh 2026-02-10 18:13:42 +09:00
• 2d03cc7d1b change build setting njh 2026-02-10 18:11:47 +09:00
• bc7e6cb00e fix 현대 씬수정 njh 2026-02-10 18:04:20 +09:00
• 836c7eaca6 add anims lwj/260209/onlyWIAScene XR 2026-02-10 17:59:27 +09:00
• b57ba3f33d [정영민] Meun 오류 수정 hsb/260210_00 정영민 2026-02-10 17:30:24 +09:00
• 298225514f Merge pull request 'dd' (#40) from dd into main UVCXR 2026-02-10 17:04:47 +09:00
• 316ecc9524 Merge pull request '[한수빈] 홈화면 나갔다가 들어왔을 때 UI 버튼 상태 초기화' (#41) from hsb/260210_00 into main 한수빈 2026-02-10 16:54:34 +09:00
• 04ce811ed3 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260210_00 SOOBEEN HAN 2026-02-10 16:50:11 +09:00
• 834a58dc06 [한수빈] 홈으로 나갈 때 설정창 안 닫히는 문제 해결 SOOBEEN HAN 2026-02-10 16:49:30 +09:00
• d7f1c4e4cd fix - data njh 2026-02-10 16:40:43 +09:00
• 9269b48ca9 [한수빈] 홈 화면 나갔다가 다시 들어왔을 때 UI 메뉴들 초기화 작업 SOOBEEN HAN 2026-02-10 16:01:43 +09:00
• 736cd4d3c4 Merge branch 'feature/autoItemUI' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo dd wsh 2026-02-10 16:01:04 +09:00
• 5e1b39c77f 커밋 feature/autoItemUI wsh 2026-02-10 15:58:48 +09:00
• f840158bbf TwinAgentAutoProcessor 가중치 완료조건 및 Entity별 터미널 로그 분리 wsh 2026-02-10 15:58:31 +09:00
• 3bc441c642 fix - renderPipe and lightmap njh 2026-02-10 15:57:24 +09:00
• a7f63c6c78 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-10 14:59:19 +09:00
• 941a96b4a7 [정영민] 한전 데이터 업로드 정영민 2026-02-10 14:58:55 +09:00
• 9be8eeaf0a Merge pull request '[정영민] 한전 작업' (#38) from jym/260210_00 into main UVCXR 2026-02-10 14:57:30 +09:00
• 69b001be03 [정영민] 한전 작업 jym/260210_00 정영민 2026-02-10 14:56:59 +09:00
• ff7e358154 Merge pull request '[한수빈] 설정창 UI디자인 수정' (#37) from hsb/260210_00 into main 한수빈 2026-02-10 14:56:14 +09:00
• 53396debac Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-10 14:55:47 +09:00
• c48b8e2d75 fix - projectData , shader , projectSetting njh 2026-02-10 14:55:33 +09:00
• 09637caf49 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260210_00 SOOBEEN HAN 2026-02-10 14:55:17 +09:00
• bf0585779c [한수빈] 사용자 설정 창 UI 디자인 수정 SOOBEEN HAN 2026-02-10 14:27:01 +09:00
• 365698472f Merge pull request '[한수빈] 홈 화면에서 프로젝트 클릭 후에 hover상태 유지되던 문제 해결' (#36) from hsb/260210_00 into main 한수빈 2026-02-10 14:13:49 +09:00
• 32a1753762 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260210_00 SOOBEEN HAN 2026-02-10 14:11:12 +09:00
• 9e76e93418 [한수빈] 홈 화면에서 프로젝트 클릭 후에 hover상태 유지되던 문제 해결 SOOBEEN HAN 2026-02-10 14:10:45 +09:00
• 9e9314d32d Merge pull request '[한수빈] 홈 화면 프로젝트 호버 이미지 설정' (#35) from hsb/260210_00 into main 한수빈 2026-02-10 12:11:16 +09:00
• 8f01a76d7c Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260210_00 SOOBEEN HAN 2026-02-10 12:09:28 +09:00
• cc228305e0 [한수빈] 홈 화면 프로젝트 호버 이미지 설정 SOOBEEN HAN 2026-02-10 12:08:53 +09:00
• 7667544b5a Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-10 12:04:53 +09:00
• 8df7420c05 Merge branch 'feature/entitynetworkterminal' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-10 11:56:39 +09:00
• 1ff9b7447a Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-10 11:54:49 +09:00
• a88d280de1 [정영민] Data 추가, 천일 씬 전환 오류 수정, 한전 씬 전환 기능 추가 정영민 2026-02-10 10:20:10 +09:00
• 4e3ed72d7b Merge pull request '[한수빈] 홈화면 프로젝트 description 및 사진 변경' (#34) from hsb/260210_00 into main 한수빈 2026-02-10 10:14:24 +09:00
• 4a984215b3 [한수빈] 홈화면 프로젝트 description 및 사진 변경 SOOBEEN HAN 2026-02-10 10:13:54 +09:00
• f9fdbd59b4 중간저장 feature/entitynetworkterminal wsh 2026-02-10 09:34:30 +09:00
• ce845c73bf fix home button XR 2026-02-10 00:44:25 +09:00
• 3408250a13 fix scene work stand alone XR 2026-02-10 00:24:24 +09:00
• 6f58fdc956 fix bottomleft njh 2026-02-09 22:25:05 +09:00
• 343b7a9113 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-09 21:44:37 +09:00
• 99de3849dc fix 아 집에 가고싶다 njh 2026-02-09 21:44:33 +09:00
• 4fe604c7cc [방소연] Default 카메라 포인트 추가 binmo7575-maker 2026-02-09 21:38:15 +09:00
• 738df97bed [정영민] 아이콘 비활성화 시작 변경 맟 설비 아이콘 오류 수정 정영민 2026-02-09 21:25:17 +09:00
• a113263c35 [방소연] 라이브러리 배치 설비 Hover Effect 추가 binmo7575-maker 2026-02-09 21:20:41 +09:00
• 5f9bf58c32 [방소연] Octopus_Twin 씬 카메라 포인트 추가 binmo7575-maker 2026-02-09 21:18:49 +09:00
• b5f177f63b [정영민] 아이콘 활성화/비활성화 기능 추가 정영민 2026-02-09 21:11:49 +09:00
• 96f90b5ae8 fix camear위치 수정 njh 2026-02-09 20:59:43 +09:00
• 7641107b01 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-09 20:48:57 +09:00
• 2cbe39696c fix cameraPosition njh 2026-02-09 20:48:55 +09:00
• a0f1a6b5fe [정영민] 카메라 위치 이동 코드 수정 정영민 2026-02-09 20:44:47 +09:00
• 6107d1781e fix [노준학]나도모르는데 수정댐 njh 2026-02-09 20:33:32 +09:00
• 14995fa3a4 fix namespace and error njh 2026-02-09 18:54:24 +09:00
• 035a9137e6 merge wsh 2026-02-09 18:39:38 +09:00
• c7677ba9d1 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-09 18:38:32 +09:00
• d244d30a69 fix 씬 초기화 오류 수정 njh 2026-02-09 18:38:30 +09:00
• 998cdd7236 Merge branch 'bugfix/processor-ui-fixes' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-09 18:32:18 +09:00
• 7ecf3330e7 1 bugfix/processor-ui-fixes wsh 2026-02-09 18:28:51 +09:00
• 636615b4d6 Merge branch 'bugfix/processor-ui-fixes' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-09 18:14:14 +09:00
• 231af700f7 Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo wsh 2026-02-09 18:11:37 +09:00
• 87a1bc63b1 커밋 wsh 2026-02-09 18:09:45 +09:00
• 0fb023405b Merge pull request '[한수빈] 토스트 팝업 스크립트에서 연결로 변경' (#33) from hsb/260209 into main 한수빈 2026-02-09 16:01:43 +09:00
• 5d620e5e5d [한수빈] 토스트 팝업 스크립트에서 연결로 변경 hsb/260209 SOOBEEN HAN 2026-02-09 15:46:56 +09:00
• 031982e757 FIX ERROR 임시막음 njh 2026-02-09 15:05:19 +09:00
• e7e50241b5 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-09 14:55:20 +09:00
• f49332dfa9 fix [노준학] 플레이백, 사용자 설정 이미지 적용 njh 2026-02-09 14:55:14 +09:00
• ebe0d8107e [정영민] 데이터 연동 및 라이브러리 아이템 추가 정영민 2026-02-09 14:54:43 +09:00
• 14698b7da5 refactor: RandomDelay 로직을 UpdateStatus 메서드로 통합 feature/network-property wsh 2026-02-09 14:54:41 +09:00
• cdaaefe17b Merge pull request '[한수빈] 현황판 배경 UI 변경' (#32) from hsb/260209 into main 한수빈 2026-02-09 14:45:53 +09:00
• 3af441d6a5 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260209 SOOBEEN HAN 2026-02-09 14:44:57 +09:00
• f6396d1e5b [한수빈] 현황판 배경 UI 변경 SOOBEEN HAN 2026-02-09 14:44:32 +09:00
• 2d3f1b0a6a Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo binmo7575-maker 2026-02-09 14:43:23 +09:00
• d62455a625 fix label position not update njh 2026-02-09 14:42:11 +09:00
• ee052be76c [방소연] Machine Animator 초기 셋팅 수정 binmo7575-maker 2026-02-09 14:39:33 +09:00
• 53e037c02c Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo njh 2026-02-09 14:35:36 +09:00
• a35f98305f add multiply njh 2026-02-09 14:35:25 +09:00
• 960a651ac5 Merge pull request '[한수빈] 로딩바 UI 디자인 변경 (내부 로딩바 패딩값 적용)' (#31) from hsb/260209 into main 한수빈 2026-02-09 14:30:03 +09:00
• 60bedd0514 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo into hsb/260209 SOOBEEN HAN 2026-02-09 14:29:02 +09:00
• aa72bdb7d6 [한수빈] 로딩바 UI 디자인 변경 (패딩 추가) SOOBEEN HAN 2026-02-09 14:28:11 +09:00