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

• e936af0d5c wjdakf aksgdmsdlfemfdl dlTDJTdj lh/20250617 UVCLimHun 2025-06-24 17:02:07 +09:00
• b111be2693 change network UnitaskBase lwj 2025-06-23 16:52:46 +09:00
• 0a80f3778b remove uselessPackages lwj 2025-06-23 14:00:47 +09:00
• c1de962908 change web manager intergrate reqeust corutine lwj 2025-06-19 18:11:12 +09:00
• e5324ab48f uiupdated UVCLimHun 2025-06-16 16:43:28 +09:00
• b85ca69599 bug fix UVCLimHun 2025-06-11 17:40:10 +09:00
• c03903fba0 merge lh/20250610 UVCLimHun 2025-06-10 09:55:16 +09:00
• 487a807438 Merge branch 'lh/20250605' into lh/20250610 UVCLimHun 2025-06-10 09:40:09 +09:00
• 45cf8d5c04 refactoring0605 lh/20250605 UVCLimHun 2025-06-05 18:27:42 +09:00
• dd26c4e114 remove library garbages lwj 2025-06-05 18:03:40 +09:00
• 4fa299bbd7 fix merge merge/250529 lwj 2025-06-05 18:00:14 +09:00
• a348e87d18 fix bottom object Library lwj 2025-06-05 17:54:18 +09:00
• 85e8be0a54 asdf UVCLimHun 2025-06-05 17:18:27 +09:00
• 4431df6f33 refactoring UVCLimHun 2025-06-04 18:30:27 +09:00
• c6b4762f46 delete UVCLimHun 2025-06-02 14:58:01 +09:00
• b061500def Merge branch 'merge/250529' UVCLimHun 2025-06-02 11:40:04 +09:00
• 5bceff3116 completed UVCLimHun 2025-06-02 10:18:36 +09:00
• 88214ad41f final lwj 2025-05-29 20:03:28 +09:00
• a575295c17 onlocal UVCLimHun 2025-05-29 18:38:43 +09:00
• 238f0ffbaf Merge branch 'lh/20250529' into merge/250529 lwj 2025-05-29 17:09:23 +09:00
• 443194c4e0 uiupdate lh/20250529 UVCLimHun 2025-05-29 17:05:55 +09:00
• e1700f926e fix move model lwj 2025-05-29 16:00:12 +09:00
• 681b633d4e 폰트 추가 logonkhi 2025-05-29 14:43:55 +09:00
• fbe0047d4b Merge branch 'merge/250529' into websetting websetting UVCLimHun 2025-05-29 12:19:28 +09:00
• 4a5d815a22 updated UVCLimHun 2025-05-29 12:16:49 +09:00
• 668fa9385a fix conveyor lwj 2025-05-29 12:16:31 +09:00
• 2bf35a123f merge lwj 2025-05-29 11:37:37 +09:00
• e86848aa0e fix conv lwj 2025-05-29 11:36:41 +09:00
• b9528e4793 imageupdated lh/20250528 UVCLimHun 2025-05-29 11:09:44 +09:00
• 01106d7256 fix some confilict lwj 2025-05-29 09:37:14 +09:00
• d6199f8c39 fix lwj 2025-05-29 09:27:47 +09:00
• 9fca1235e5 fix conflict lwj 2025-05-29 09:27:13 +09:00
• 8a75eaa23e fix conv lwj 2025-05-29 09:25:40 +09:00
• 824e312de7 ui및 기타등등 UVCLimHun 2025-05-29 02:08:28 +09:00
• 6f45e08103 saveload bug UVCLimHun 2025-05-28 21:02:12 +09:00
• f25c610782 fix api call param lwj 2025-05-28 20:19:09 +09:00
• 98d4f0ae37 fix conflict lwj 2025-05-28 20:15:13 +09:00
• 00aadb4af3 add popup ui prefab lwj 2025-05-28 20:13:57 +09:00
• a39b7b0b4a re UVCLimHun 2025-05-28 20:13:50 +09:00
• ce04e510d9 ADD POPUP IMAGE lwj 2025-05-28 19:03:05 +09:00
• 94e8a4e777 asdf UVCLimHun 2025-05-28 19:02:53 +09:00
• e02197ec25 Merge remote-tracking branch 'origin/main' into lwj/250528 lwj 2025-05-28 18:37:38 +09:00
• 308affbac9 webset UVCLimHun 2025-05-28 18:35:42 +09:00
• 4c022898e4 fix save not include simulation resources lwj 2025-05-28 17:43:55 +09:00
• 179973d88c nullable UVCLimHun 2025-05-28 15:48:06 +09:00
• 62beecf15a 으아악 UVCLimHun 2025-05-28 15:05:07 +09:00
• 9a65294b1b Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation UVCLimHun 2025-05-28 13:55:22 +09:00
• c9b7f7e3df refresh UVCLimHun 2025-05-28 13:54:59 +09:00
• 1cc72dac38 path manager update ssl/250527 SullyunShin 2025-05-28 10:56:57 +09:00
• 07fcd25315 process, sink 작업 SullyunShin 2025-05-28 10:08:15 +09:00
• c0826b3854 saveload UVCLimHun 2025-05-27 19:41:51 +09:00
• 37ca5b16c9 Merge branch 'lh/20250527' UVCLimHun 2025-05-27 19:26:49 +09:00
• fbcfd8d955 merge with main lwj 2025-05-27 19:11:49 +09:00
• 91b86361ac Merge remote-tracking branch 'origin/main' into lwj/250527 lwj 2025-05-27 19:08:05 +09:00
• 2014058d99 uicomplete lh/20250527 UVCLimHun 2025-05-27 19:07:12 +09:00
• d9b0d44b09 add file save, load lwj 2025-05-27 18:23:43 +09:00
• 064d67d5eb add file open/save lwj 2025-05-27 18:05:07 +09:00
• 499f2c49a5 Object Library 수정 SullyunShin 2025-05-27 15:23:07 +09:00
• bb5d7d270a Merge branch 'main' into ssl/250527 SullyunShin 2025-05-27 15:02:28 +09:00
• a50fd5d6c0 issue UVCLimHun 2025-05-27 15:00:25 +09:00
• 1ae10a5bde Merge branch 'main' into ssl/250527 SullyunShin 2025-05-27 14:56:29 +09:00
• 6591bc8a73 uichange UVCLimHun 2025-05-27 14:53:52 +09:00
• cae4093c3f 운송 애니메이션 추가 SullyunShin 2025-05-27 14:53:01 +09:00
• a5d9c158ec textdelete UVCLimHun 2025-05-27 10:18:29 +09:00
• e51acee1ae Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation UVCLimHun 2025-05-27 10:15:12 +09:00
• eb9155aa3e packageChange UVCLimHun 2025-05-27 10:13:49 +09:00
• cc6c2fbde2 Merge remote-tracking branch 'origin/ssl/250509' SullyunShin 2025-05-27 09:05:36 +09:00
• 8aa438f3a4 Merge branch 'main' of http://220.90.135.190:3000/neitt/Simulation UVCLimHun 2025-05-26 19:13:20 +09:00
• ee60493691 mqtt UVCLimHun 2025-05-26 19:11:58 +09:00
• 1eea6538a3 로직 데이터 연동 시작 SullyunShin 2025-05-26 18:06:25 +09:00
• c06a65ad49 asset 추가 SullyunShin 2025-05-26 12:53:54 +09:00
• 316ef06320 key change UVCLimHun 2025-05-26 12:16:45 +09:00
• f03536f5ed keyvaluepairupdate UVCLimHun 2025-05-26 11:42:56 +09:00
• 0210ae8b81 concurrent UVCLimHun 2025-05-26 11:11:21 +09:00
• 4a38967218 mqttdatabase UVCLimHun 2025-05-26 11:02:10 +09:00
• a3126007e6 mqtt connect UVCLimHun 2025-05-26 10:24:40 +09:00
• 9d2f03a5ca Merge branch 'lh/20250521' UVCLimHun 2025-05-23 10:55:49 +09:00
• c5fcb8e93b webgl UVCLimHun 2025-05-23 10:47:38 +09:00
• 370fb0a537 Merge pull request 'ssl/250509' (#19) from ssl/250509 into main neitt 2025-05-21 15:37:19 +09:00
• da546900f9 Merge branch 'main' into ssl/250509 SullyunShin 2025-05-21 15:35:31 +09:00
• 290b2834a2 씬 추가 SullyunShin 2025-05-21 15:35:07 +09:00
• ed3fdbb9ae Merge pull request 'ssl/250429' (#18) from ssl/250429 into main neitt 2025-05-21 15:34:25 +09:00
• d784ac3dc4 Merge branch 'main' into ssl/250429 SullyunShin 2025-05-21 15:32:39 +09:00
• 3479a2a6a3 update UVCLimHun 2025-05-21 11:36:20 +09:00
• 1f9c25e5ab ui 추가 SullyunShin 2025-05-21 11:33:32 +09:00
• 92861bb7cc scale 추가 SullyunShin 2025-05-20 10:54:03 +09:00
• 0aed503d12 temp UVCLimHun 2025-05-19 10:06:52 +09:00
• 74c885ed9f refactoring UVCLimHun 2025-05-15 11:44:39 +09:00
• 35063ab593 mapping UVCLimHun 2025-05-14 18:07:07 +09:00
• 2a141820f0 Merge branch 'lh/20250513' into lh/20250513_merge UVCLimHun 2025-05-13 14:47:52 +09:00
• a879e60556 middle update UVCLimHun 2025-05-13 14:47:07 +09:00
• e724eb9ac6 middlemerge UVCLimHun 2025-05-13 13:53:00 +09:00
• 886614a9ef Merge pull request 'ssl/250509' (#17) from ssl/250509 into main neitt 2025-05-13 12:21:13 +09:00
• 022e75f5d1 Merge branch 'main' into ssl/250509 SullyunShin 2025-05-13 12:20:02 +09:00
• da5d9aaf1f RTG Controller 추가 SullyunShin 2025-05-13 12:19:46 +09:00
• 7e4126d8d1 Merge pull request 'ssl/250509' (#16) from ssl/250509 into main neitt 2025-05-13 09:43:12 +09:00
• 1a0cae62a6 오브젝트 상태창 프리팹화 SullyunShin 2025-05-13 09:42:15 +09:00
• d24838cc5f Merge branch 'main' into ssl/250509 SullyunShin 2025-05-13 09:40:05 +09:00
• 2e76a9fcbd setting UVCLimHun 2025-05-12 18:13:19 +09:00
• 90105cac4b 에라모르겠다 UVCLimHun 2025-05-12 18:11:00 +09:00