Commit Graph

Select branches

Hide Pull Requests

PrevEditor

dev/jym/250507_00

dev/jym/250509_00

dev/jym/250516_00

dev/jym/250526_00

jym/250429_00

jym/250507_01

jym/250507_02

jym/250508_00

jym/250512_00

jym/250512_01

jym/250512_02

jym/250513_00

jym/250515_00

jym/250515_01

jym/250520_00

jym/250521_00

jym/250521_01

jym/250522_00

jym/250522_01

jym/250523_00

jym/250523_01

jym/250524_01

jym/250525_00

jym/250526_01

jym/250526_02

jym/250526_03

jym/250526_04

jym/250528_01

jym/250528_02

jym/250528_03

jym/250528_04

jym/250528_05

jym/250528_06

jym/250528_07

jym/250528_08

jym/250528_09

jym/250529_00

jym/250529_01

jym/250529_02

jym/250529_03

jym/250529_04

jym/250529_05

jym/250529_06

jym/250529_08

jym/250529_09

jym/250609_01

jym/250609_02

jym/250609_03

jym/250609_04

jym/250611_00

jym/250611_01

jym/250611_02

jym/250611_03

jym/250612_00

jym/250613_00

jym/250613_01

jym/250613_02

jym/250616_01

jym/250617_00

jym/250617_01

jym/250618_00

jym/250618_01

jym/250619_00

jym/250623_00

jym/250623_01

jym/250623_02

jym/250624_00

jym/250624_01

jym/250624_02

jym/250627_00

jym/250627_01

jym/250630_00

jym/250701_00

jym/250701_01

jym/250714_00

jym/250714_01

jym/250714_02

jym/250715_00

jym/250715_01

jym/250716_00

lh/0328_Prototype

lh/20250228_merge

lh/20250304

lh/20250305

lh/20250305_merge

lh/20250307

lh/20250311

lh/20250311_Merge

lh/20250317

lh/20250403

lh/prototype

lh/prototype2

lh/prototype_0328

main

njh/250514_00

njh/250514_01

njh/250516_00

njh/250520_00

njh/250524_00

njh/250525_00

njh/250525_01

njh/250526_00

njh/250526_01

njh/250526_02

njh/250527_00

njh/250528_00

njh/250529_00

njh/250529_1800

njh/250529_Test

pgd/20250311

pgd/20250311_merge

pgd/20250318

pgd/20250318_2

pgd/20250318_3

pgd/20250318_4

pgd/20250318_5

pgd/20250319

pgd/20250319_2

pgd/20250319_3

pgd/20250320

pgd/20250321

pgd/20250321_merge

pgd/20250324

pgd/20250326

pgd/20250327_1

pgd/20250327_2

pgd/20250327_3

pgd/20250328

pgd/20250328_2

pgd/20250402

pgd/20250403

pgd/20250408

pgd/20250409

pgd/20250409_2

pgd/20250410

pgd/20250414

pgd/20250414_2

pgd/20250416

pgd/20250417

pgd/20250421

pgd/20250421_2

pgd/20250422

pgd/20250425

pgd/20250429

pgd/202505026

pgd/20250507

pgd/20250508

pgd/20250508_1

pgd/20250512_1

pgd/20250515

pgd/20250515_2

pgd/20250516

pgd/20250520

pgd/20250520_2

pgd/20250521

pgd/20250526

pgd/20250527

pgd/20250527_merge2

pgd/20250527merge

pgd/20250528

pgd/20250528_2

pgd/20250528_2merge

pgd/20250528_3

pgd/20250528_3merge

pgd/20250529

pgd/20250529_1

pgd/20250529_3

pgd/20250529_4

pgd/20250529_5merge

pgd/20250529_7

pgd/20250529_merge

pgd/202506023_1

pgd/20250609_1

pgd/20250610_1

pgd/20250610_2

pgd/20250610_3

pgd/20250610_4

pgd/20250611_1

pgd/20250611_merge

pgd/20250612_1

pgd/20250612_2

pgd/20250612_2merge

pgd/20250616_1

pgd/20250618_merge

pgd/20250623_2

pgd/20250623_3

pgd/20250624_1

pgd/20250624_2

pgd/20250625_1

pgd/20250625_2

pgd/20250626_1

pgd/20250626_3

pgd/20250627_1

pgd/20250627_2

pgd/20250627_3

pgd/20250630_1

pgd/20250701_1

pgd/20250701_2

pgd/20250701_build

pgd/20250708

pgd/20250714_1

pgd/20250714_2

pgd/20250715_1

pgd/20250715_2

pgd/20250715_3

pgd/20250716_1

pgd/20250716_2

pgd/20250716_3

pgd/20250716_4

pgd/20250718_1

pgd/20250718_2

pgd/20250721_1

pgd/20250721_2

pgd/20250723_1

pgd/20250723_2

pgd/20250723_3

pgd/20250723_4

pgd/20250724_1

pgd/20250724_2

pgd/20250724_3

pgd/20250725_1

sjm/250224

sjm/250226

sjm/250319

sjm/250320

sjm/250321

sjm/250324

sjm/250325

sjm/250326

sjm/250331

sjm/250401

sjm/250402

sjm/250403

sjm/250407

sjm/250519

sjm/250521

sjm/250521_njh

sjm/250523

sjm/250523_2

sjm/250526

sjm/250526_2

sjm/250527

sjm/250528

sjm/250528_2

sjm/250528_3

sjm/250528_4

sjm/250529

sjm/250529_2

sjm/AW

ssl/250220

ssl/250224

ssl/250305

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 7006c70270 백업 geondo55 2025-05-26 17:41:54 +09:00
• 1310ce1823 Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정 jym/250526_04 정영민 2025-05-26 17:39:10 +09:00
• a6746e5272 Merge pull request '라인 렌더러 버그 수정' (#100) from sjm/250526 into main UVCXR 2025-05-26 14:26:01 +09:00
• c463877bb1 Merge pull request '불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정' (#99) from jym/250526_03 into main UVCXR 2025-05-26 14:25:47 +09:00
• b2cd3621fc 거리측정 라인 두께 조절 sjm/250526 jmaniuvc 2025-05-26 12:06:08 +09:00
• 9fd0f759cd 라인 렌더러가 정상적으로 사라지지 않는 버그 수정 jmaniuvc 2025-05-26 11:47:47 +09:00
• df2140212b 불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정 jym/250526_03 정영민 2025-05-26 11:41:17 +09:00
• 9ede173f77 Merge pull request 'jym/250526_02' (#98) from jym/250526_02 into main UVCXR 2025-05-26 11:01:02 +09:00
• 57397f956a 충돌 해결 jym/250526_02 정영민 2025-05-26 11:00:28 +09:00
• c15d6e6a13 Merge branch 'dev/jym/250526_00' jym/250526_01 정영민 2025-05-26 10:51:48 +09:00
• 1d9279a4af Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio wsh 2025-05-26 10:39:57 +09:00
• 8d612d8b30 1 wsh 2025-05-26 10:39:54 +09:00
• 73d75a0c7b Merge branch 'main' into dev/jym/250526_00 dev/jym/250526_00 jym 2025-05-26 10:15:13 +09:00
• 7e3081c4fc Merge pull request '에셋불러오기 후 agv 자동생성.' (#95) from njh/250526_00 into main UVCXR 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 njh/250526_00 준학 노 2025-05-26 09:23:12 +09:00
• 7e1667ac1b fbx.. njh/250525_01 준학 노 2025-05-26 09:22:08 +09:00
• 1ed10a5de6 Merge pull request 'STK,AGV' (#94) from njh/250525_01 into main jym 2025-05-25 15:49:19 +09:00
• 0f40cfdbe7 merge 준학 노 2025-05-25 15:30:08 +09:00
• 23c51f94b0 Merge pull request '3D Factory 설정 기능 개선' (#93) from jym/250525_00 into main jym 2025-05-25 15:27:55 +09:00
• 424ef63a79 3D Factory 설정 기능 개선 jym/250525_00 정영민 2025-05-25 15:27:25 +09:00
• 51936e7cd6 merge njh/250525_00 준학 노 2025-05-25 14:30:10 +09:00
• 8576a8f541 코드수정 njh/250524_00 준학 노 2025-05-25 14:28:38 +09:00
• f8c7e77019 Update README.md UVCXR 2025-05-25 14:20:22 +09:00
• 222f9229e9 1 wsh 2025-05-25 14:19:46 +09:00
• 6e7f5fefbb MQTT 테스트 화면 추가 wsh 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 UVCXR 2025-05-24 17:04:11 +09:00
• b0deccbd89 TopMenu 의 New Project, Open Project 기능 추가 jym/250524_01 정영민 2025-05-24 17:03:39 +09:00
• 4fa1a76ba5 Update README.md UVCXR 2025-05-24 16:11:04 +09:00
• 831d0b17ae MQTTTestResult 모달 추가 wsh 2025-05-24 16:01:45 +09:00
• aee8c0614f .. 준학 노 2025-05-24 15:54:06 +09:00
• 9780c297e6 agv . mqtt 연동작업 njh/250520_00 준학 노 2025-05-24 14:11:29 +09:00
• fbf67a2f36 Merge branch 'jym/250524_00' into jym/250524_01 정영민 2025-05-24 12:59:08 +09:00
• a751b7d0f3 에셋 저장, 불러오기 정영민 2025-05-24 12:51:30 +09:00
• be2520a553 Update README.md UVCXR 2025-05-24 11:19:18 +09:00
• 370b40ce88 TemporaryMQTTClient 추가 wsh 2025-05-24 11:18:34 +09:00
• 55f23c9f03 1 wsh 2025-05-24 09:36:09 +09:00
• d37ffb6e2e Merge pull request 'sjm/250523_2' (#90) from sjm/250523_2 into main UVCXR 2025-05-24 09:33:19 +09:00
• 60d85a930b 충돌 sjm/250523_2 jmaniuvc 2025-05-23 21:17:33 +09:00
• 1fefb2d384 불필요 코드 제거 sjm/250523 jmaniuvc 2025-05-23 21:16:38 +09:00
• b56dd00ee8 완료 jmaniuvc 2025-05-23 21:07:17 +09:00
• b5bcfb4ca9 저장 jmaniuvc 2025-05-23 20:36:02 +09:00
• e33a795d2d 저장 jmaniuvc 2025-05-23 20:26:03 +09:00
• 819ad4430d 저장 jmaniuvc 2025-05-23 20:18:26 +09:00
• 1e53ea3f54 저장 jmaniuvc 2025-05-23 20:12:44 +09:00
• 740427e9b3 저장 jmaniuvc 2025-05-23 20:05:19 +09:00
• 1be2d715d4 패널 활성화 jmaniuvc 2025-05-23 19:00:09 +09:00
• 1539a49b16 Merge pull request '자산 관리자 Local Assets Load 기능 개발' (#89) from jym/250523_01 into main UVCXR 2025-05-23 17:01:56 +09:00
• fd42f2b11b 자산 관리자 Local Assets Load 기능 개발 jym/250523_01 정영민 2025-05-23 17:00:57 +09:00
• 060dc241b1 Update README.md UVCXR 2025-05-23 16:48:02 +09:00
• ffbced48c4 AssetDataService 삭제 wsh 2025-05-23 16:47:02 +09:00
• e23391f955 1 wsh 2025-05-23 16:42:02 +09:00
• 71c62f9d64 Panel_OpenProjectInfo와 Panel_NewProjectInfo 의 위치를 Panel_Start.Content 하위로 변경 wsh 2025-05-23 15:09:12 +09:00
• 67af2fb862 패널 이동 jmaniuvc 2025-05-23 14:59:37 +09:00
• a1c1844a5c 1 wsh 2025-05-23 14:58:01 +09:00
• fac1ec9337 minimap 컴파일러 경고 수정 wsh 2025-05-23 14:56:32 +09:00
• 1fe0ef3d62 디자인 매우일부 적용 wsh 2025-05-23 14:54:24 +09:00
• fa383fd85c 충돌 해결 jmaniuvc 2025-05-23 14:53:33 +09:00
• 0918ac3542 UI 수정 sjm/250521_njh jmaniuvc 2025-05-23 14:52:29 +09:00
• 5ab0270392 agv 테스트중 준학 노 2025-05-23 14:41:31 +09:00
• bca4dc81bb Panel_QuickStart -> Panel_Start wsh 2025-05-23 14:28:46 +09:00
• 79ea12b702 NewStudioPGD 삭제 !!!! ^^... wsh 2025-05-23 14:06:32 +09:00
• 7f9dd3ad57 MQTTData 버튼 추가 jmaniuvc 2025-05-23 13:59:45 +09:00
• fce0546697 Canvas_Component 삭제 wsh 2025-05-23 13:52:09 +09:00
• b7aeec020b Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio wsh 2025-05-23 13:32:26 +09:00
• 86a090536f 1 wsh 2025-05-23 13:32:23 +09:00
• fad0692395 Update README.md UVCXR 2025-05-23 13:24:36 +09:00
• cfd55c912e LoadProjectCommand 삭제 wsh 2025-05-23 13:23:55 +09:00
• 21e9b58d03 API 버튼 업데이트 jmaniuvc 2025-05-23 12:33:04 +09:00
• 5ad9c55bdd Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio wsh 2025-05-23 11:27:00 +09:00
• 408652aee3 CustomAssetEventHandler 삭제 wsh 2025-05-23 11:26:44 +09:00
• 1b8d2f9f51 Update README.md UVCXR 2025-05-23 11:23:52 +09:00
• 7595b49a5f CustomAssetDataHandler 삭제 wsh 2025-05-23 11:23:30 +09:00
• d258253cea 시간 데이터 계산 jmaniuvc 2025-05-23 10:47:00 +09:00
• ba3154b014 1 wsh 2025-05-23 10:33:36 +09:00
• d770a85905 Merge pull request 'Open Project 기능 개발' (#88) from jym/250523_00 into main UVCXR 2025-05-23 10:02:19 +09:00
• 6756134f03 Update pre-0.24.0.unity jym/250523_00 정영민 2025-05-23 10:00:53 +09:00
• 3620e8c944 Open Project 기능 개발 정영민 2025-05-23 09:34:37 +09:00
• 2b4e5cdcb2 Data Repository 모달 jmaniuvc 2025-05-22 18:29:09 +09:00
• 604b8e3bef Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio wsh 2025-05-22 17:52:45 +09:00
• d5162ab834 SceneDataContainer 추가 및 오브젝트 배치 생성 관련 기능들에 연동 wsh 2025-05-22 17:52:42 +09:00
• 39c5af316f Update README.md UVCXR 2025-05-22 17:52:21 +09:00
• 53a90bee41 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio wsh 2025-05-22 17:30:52 +09:00
• ddd83ade59 1 wsh 2025-05-22 17:30:50 +09:00
• 59b95da6b8 Merge pull request 'jym/250522_01' (#87) from jym/250522_01 into main UVCXR 2025-05-22 17:30:33 +09:00
• 1a0c845095 Merge branch 'jym/250522_00' into jym/250522_01 jym/250522_01 정영민 2025-05-22 17:29:47 +09:00
• c4486b3c26 Update README.md UVCXR 2025-05-22 17:20:18 +09:00
• 66f6da34c9 시작 설정 저장 기능 및 New Project 기능 개발 jym/250522_00 정영민 2025-05-22 17:17:54 +09:00
• d3ce3bcaaf 7. RenderObjectHandler의 GizmoAction KeyInput 타이밍 수정 (get->down) 8. RenderObjectHandler에 RemoveSelectObjectCommand 액션 추가 wsh 2025-05-22 17:10:46 +09:00
• 2d3616b9ee 5. LoadLocalTextureDataCommand 삭제 6. LoadLocalModelDataCommand 삭제 wsh 2025-05-22 16:58:25 +09:00
• c99b61e031 Info_API 제작 jmaniuvc 2025-05-22 16:12:56 +09:00
• a76df3c8a3 AssetLibraryPopupScrollViewItem 삭제 wsh 2025-05-22 15:17:05 +09:00
• 23ea720bdf 일부 기능 비활성화 및 오브젝트 조작 관련 버그 일부 수정 wsh 2025-05-22 12:17:56 +09:00
• 3602da0fc3 이름!!!1 wsh 2025-05-22 11:04:54 +09:00
• 29aba746e8 1 wsh 2025-05-22 11:00:46 +09:00
• 1595fb6f19 1 wsh 2025-05-22 11:00:41 +09:00
• c8d50f9033 네임스페이스 수정 wsh 2025-05-22 10:18:44 +09:00
• eb4fbaa9c6 Merge pull request 'UI 레이아웃 수정' (#85) from jym/250521_01 into main UVCXR 2025-05-22 10:06:47 +09:00
• 402839f6f4 Merge pull request '미니맵' (#84) from sjm/250521 into main UVCXR 2025-05-22 10:06:35 +09:00