Commit Graph

107 Commits

Author SHA1 Message Date
lwj
8a75eaa23e fix conv 2025-05-29 09:25:40 +09:00
lwj
f25c610782 fix api call param 2025-05-28 20:19:09 +09:00
lwj
98d4f0ae37 fix conflict 2025-05-28 20:15:13 +09:00
lwj
00aadb4af3 add popup ui prefab 2025-05-28 20:13:57 +09:00
a39b7b0b4a re 2025-05-28 20:13:50 +09:00
lwj
ce04e510d9 ADD POPUP IMAGE 2025-05-28 19:03:05 +09:00
94e8a4e777 asdf 2025-05-28 19:02:53 +09:00
lwj
e02197ec25 Merge remote-tracking branch 'origin/main' into lwj/250528 2025-05-28 18:37:38 +09:00
308affbac9 webset 2025-05-28 18:35:42 +09:00
lwj
4c022898e4 fix save not include simulation resources 2025-05-28 17:43:55 +09:00
179973d88c nullable 2025-05-28 15:48:06 +09:00
62beecf15a 으아악 2025-05-28 15:05:07 +09:00
9a65294b1b Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation 2025-05-28 13:55:22 +09:00
c9b7f7e3df refresh 2025-05-28 13:54:59 +09:00
SullyunShin
1cc72dac38 path manager update 2025-05-28 10:56:57 +09:00
SullyunShin
07fcd25315 process, sink 작업 2025-05-28 10:08:15 +09:00
c0826b3854 saveload 2025-05-27 19:41:51 +09:00
37ca5b16c9 Merge branch 'lh/20250527' 2025-05-27 19:26:49 +09:00
lwj
fbcfd8d955 merge with main 2025-05-27 19:11:49 +09:00
lwj
91b86361ac Merge remote-tracking branch 'origin/main' into lwj/250527 2025-05-27 19:08:05 +09:00
2014058d99 uicomplete 2025-05-27 19:07:12 +09:00
lwj
d9b0d44b09 add file save, load 2025-05-27 18:23:43 +09:00
lwj
064d67d5eb add file open/save 2025-05-27 18:05:07 +09:00
SullyunShin
499f2c49a5 Object Library 수정 2025-05-27 15:23:07 +09:00
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