duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,049 Commits 13 Branches 0 Tags
d2a11e50d8bdb7a63797bbd5dce0337e7e778ebd
Commit Graph

2049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Le Duc Anh d2a11e50d8 WIP: re-alpha-version 2026-03-23 19:30:20 +07:00
NguyenVanDat 93519b7f2e add tool test badword 2026-03-23 11:03:47 +07:00
NguyenVanDat b034c0b19e Merge branch 'develop' into feature/world-filter 2026-03-23 10:50:32 +07:00
NguyenVanDat f87dcbd7f8 add badword filter version 1 2026-03-23 10:46:10 +07:00
hainh 4049204008 Merge pull request 'feature/friend_ui' (#266) from feature/friend_ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/266
 2026-03-20 09:48:22 +00:00
VuNgocHaiC7 0ff167624b Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-20 16:47:23 +07:00
VuNgocHaiC7 65afe04918 update money in inventory when pickup money and button confirm dlgAwarld for item_info setActive false 2026-03-20 16:47:14 +07:00
Chomper9981 ee75334b1d fix task trace position 2026-03-20 16:16:17 +07:00
Tungdv c5ed99babc fix: update camera detech collider. 2026-03-20 15:58:21 +07:00
Tungdv 8099b87c71 fix: update camera detech collider. 2026-03-20 15:50:59 +07:00
cuongnv ac6b92c5f8 Merge pull request 'feature/chat' (#265) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/265
 2026-03-20 08:48:01 +00:00
CuongNV f64cf04403 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 15:46:41 +07:00
CuongNV bdf3a25858 update size text and image item_info 2026-03-20 15:28:03 +07:00
Le Duc Anh f627c5e6a7 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-20 15:08:41 +07:00
Le Duc Anh ca49c2b1c5 camera controller option 2 2026-03-20 15:07:59 +07:00
tungdv 473721b7d6 Merge pull request 'update rotation camera.' (#264) from feature/elseplayer into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/264
 2026-03-20 07:50:33 +00:00
Tungdv b6defe44c6 Merge branch 'develop' into feature/elseplayer 
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
 2026-03-20 14:49:48 +07:00
Tungdv 3a8507c15b fix: update rotation camera. 2026-03-20 14:40:50 +07:00
CuongNV cf02ddf4cf Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 14:33:30 +07:00
namth 3178c8c7d4 Merge pull request 'fix null proplem in quickBar' (#263) from figbug/quick-bar-bug into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/263
 2026-03-20 07:17:54 +00:00
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +07:00
CuongNV 0021ce2ade Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 13:53:37 +07:00
CuongNV fad24cfdd8 add new logic chat Input 2026-03-20 13:52:55 +07:00
namth a91faac68f Merge pull request 'feature/task-trace-ui' (#262) from feature/task-trace-ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/262
 2026-03-20 03:19:00 +00:00
Chomper9981 265dea6ff3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into check-out-branch 2026-03-20 10:11:28 +07:00
namth b0e3aa4b43 Merge pull request 'feature/task-trace-ui' (#261) from feature/task-trace-ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/261
 2026-03-20 03:07:06 +00:00
Chomper9981 d986b11380 Fix UI after merge 2026-03-20 10:03:52 +07:00
Chomper9981 3a89f85d1f Merge origin/develop into current branch (resolve conflicts using develop) 
Made-with: Cursor
 2026-03-19 18:13:14 +07:00
hainh 3f3b3b0589 Merge pull request 'feature/friend_ui' (#260) from feature/friend_ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/260
 2026-03-19 10:55:46 +00:00
VuNgocHaiC7 f290d44d13 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-19 17:54:21 +07:00
Chomper9981 8e4117e139 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 17:53:54 +07:00
VuNgocHaiC7 f9dbdc1c3c fix ui for dlg FriendList 2026-03-19 17:50:49 +07:00
Chomper9981 bb107503ab Change UI for TaskTrace. Add side bar for MainUI 2026-03-19 17:48:02 +07:00
cuongnv 64571dcf84 Merge pull request 'feature/chat' (#259) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/259
 2026-03-19 09:54:46 +00:00
CuongNV 06b4cd91ca Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-19 16:53:59 +07:00
CuongNV 221c6ad364 change prefab chatsystem and update logic button channel 2026-03-19 16:52:49 +07:00
hoangvd 2301700969 Merge pull request 'feature/refactor-SkillUI' (#258) from feature/refactor-SkillUI into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/258
 2026-03-19 09:02:29 +00:00
VDH ae02046fc7 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 16:01:05 +07:00
VDH 92852a28a0 add log for build 2026-03-19 16:00:31 +07:00
Le Duc Anh 4337001a2c add Tien Thu equipments 2026-03-19 15:46:52 +07:00
CuongNV 8b8653c1fa update prefix 2026-03-19 15:44:02 +07:00
CuongNV c484ade69b add prefix for chat 2026-03-19 15:24:13 +07:00
cuongnv 691fc88226 Merge pull request 'feature/chat' (#257) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/257
 2026-03-19 07:25:11 +00:00
CuongNV 664e5b2f74 Merge remote-tracking branch 'origin/develop' into feature/chat 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-19 14:24:21 +07:00
CuongNV e2735a73f3 add scene bootstrap new prefab chat 2026-03-19 14:23:10 +07:00
cuongnv 4192582aad Merge pull request 'Change UI Chat' (#256) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
 2026-03-19 07:19:07 +00:00
hoangvd 6d0557a60a Merge pull request 'feature/refactor-SkillUI' (#255) from feature/refactor-SkillUI into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/255
 2026-03-19 06:57:41 +00:00
VDH dd36dde176 Merge branch 'develop' into feature/refactor-SkillUI 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-19 13:57:04 +07:00
namth 8616fd1a65 Merge pull request 'feature/change-skill-feature' (#254) from feature/change-skill-feature into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/254
 2026-03-19 06:55:41 +00:00
VDH a726ca23cb Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 13:54:21 +07:00