233 Commits

Author SHA1 Message Date
SullyunShin
bb5d7d270a Merge branch 'main' into ssl/250527 2025-05-27 15:02:28 +09:00
a50fd5d6c0 issue 2025-05-27 15:00:25 +09:00
SullyunShin
1ae10a5bde Merge branch 'main' into ssl/250527 2025-05-27 14:56:29 +09:00
6591bc8a73 uichange 2025-05-27 14:53:52 +09:00
SullyunShin
cae4093c3f 운송 애니메이션 추가 2025-05-27 14:53:01 +09:00
a5d9c158ec textdelete 2025-05-27 10:18:29 +09:00
e51acee1ae Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation 2025-05-27 10:15:12 +09:00
eb9155aa3e packageChange 2025-05-27 10:13:49 +09:00
SullyunShin
cc6c2fbde2 Merge remote-tracking branch 'origin/ssl/250509' 2025-05-27 09:05:36 +09:00
8aa438f3a4 Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation 2025-05-26 19:13:20 +09:00
ee60493691 mqtt 2025-05-26 19:11:58 +09:00
SullyunShin
1eea6538a3 로직 데이터 연동 시작 2025-05-26 18:06:25 +09:00
SullyunShin
c06a65ad49 asset 추가 2025-05-26 12:53:54 +09:00
316ef06320 key change 2025-05-26 12:16:45 +09:00
f03536f5ed keyvaluepairupdate 2025-05-26 11:42:56 +09:00
0210ae8b81 concurrent 2025-05-26 11:11:21 +09:00
4a38967218 mqttdatabase 2025-05-26 11:02:10 +09:00
a3126007e6 mqtt connect 2025-05-26 10:24:40 +09:00
9d2f03a5ca Merge branch 'lh/20250521' 2025-05-23 10:55:49 +09:00
c5fcb8e93b webgl 2025-05-23 10:47:38 +09:00
neitt
370fb0a537 Merge pull request 'ssl/250509' (#19) from ssl/250509 into main
Reviewed-on: http://220.90.135.190:3000/neitt/Simulation/pulls/19
2025-05-21 15:37:19 +09:00
SullyunShin
da546900f9 Merge branch 'main' into ssl/250509
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
2025-05-21 15:35:31 +09:00
SullyunShin
290b2834a2 씬 추가 2025-05-21 15:35:07 +09:00
neitt
ed3fdbb9ae Merge pull request 'ssl/250429' (#18) from ssl/250429 into main
Reviewed-on: http://220.90.135.190:3000/neitt/Simulation/pulls/18
2025-05-21 15:34:25 +09:00
SullyunShin
d784ac3dc4 Merge branch 'main' into ssl/250429
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
2025-05-21 15:32:39 +09:00
3479a2a6a3 update 2025-05-21 11:36:20 +09:00
SullyunShin
1f9c25e5ab ui 추가 2025-05-21 11:33:32 +09:00
SullyunShin
92861bb7cc scale 추가 2025-05-20 10:54:03 +09:00
0aed503d12 temp 2025-05-19 10:06:52 +09:00
74c885ed9f refactoring 2025-05-15 11:44:39 +09:00
35063ab593 mapping 2025-05-14 18:07:07 +09:00
2a141820f0 Merge branch 'lh/20250513' into lh/20250513_merge 2025-05-13 14:47:52 +09:00
a879e60556 middle update 2025-05-13 14:47:07 +09:00
e724eb9ac6 middlemerge 2025-05-13 13:53:00 +09:00
neitt
886614a9ef Merge pull request 'ssl/250509' (#17) from ssl/250509 into main
Reviewed-on: http://220.90.135.190:3000/neitt/Simulation/pulls/17
2025-05-13 12:21:13 +09:00
SullyunShin
022e75f5d1 Merge branch 'main' into ssl/250509
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
2025-05-13 12:20:02 +09:00
SullyunShin
da5d9aaf1f RTG Controller 추가 2025-05-13 12:19:46 +09:00
neitt
7e4126d8d1 Merge pull request 'ssl/250509' (#16) from ssl/250509 into main
Reviewed-on: http://220.90.135.190:3000/neitt/Simulation/pulls/16
2025-05-13 09:43:12 +09:00
SullyunShin
1a0cae62a6 오브젝트 상태창 프리팹화
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
2025-05-13 09:42:15 +09:00
SullyunShin
d24838cc5f Merge branch 'main' into ssl/250509 2025-05-13 09:40:05 +09:00
2e76a9fcbd setting 2025-05-12 18:13:19 +09:00
90105cac4b 에라모르겠다 2025-05-12 18:11:00 +09:00
SullyunShin
8a1902d80d 오브젝트 선택창 2025-05-12 18:00:37 +09:00
d8c606fe6a logicwindowprefab 2025-05-12 10:39:28 +09:00
489aa8a3cb Merge branch 'lh/20250512temp' into lh/20250512 2025-05-12 10:38:36 +09:00
5266fe1ec2 button ing 2025-05-12 10:35:55 +09:00
neitt
07ba64661b Merge pull request 'ssl/250509' (#15) from ssl/250509 into main
Reviewed-on: http://220.90.135.190:3000/neitt/Simulation/pulls/15
2025-05-12 10:35:21 +09:00
SullyunShin
b1371fbd2d 씬 변경사항 커밋
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
2025-05-12 10:34:41 +09:00
SullyunShin
294de107c5 Merge branch 'main' into ssl/250509 2025-05-12 10:30:21 +09:00
SullyunShin
efebf78a0b 모델 스크립트 추가
Some checks failed
Code Review / code-review (pull_request) Has been cancelled
모델 아이콘 추가
모든 모델 UI 추가
2025-05-12 10:25:52 +09:00