Commit Graph

372 Commits (56d9c5fd0432865944c18bd5151936e559b20a46)

Author SHA1 Message Date
Nuno 1fc8cabb22 Merge remote-tracking branch 'origin/51-shift-enter-at-merchant-no-longer-sells-to-merchant' into main/yubo-dev 3 years ago
Nuno a5635ba27d Merge remote-tracking branch 'origin/18-enchant-icon-does-not-properly-update-on-weapon' into main/yubo-dev 3 years ago
nimetu 1725878201 Improve item icon buff update 3 years ago
bensaine ee699078a9 change: way of checking if shift is pushed 3 years ago
Nuno 929a126155 Merge remote-tracking branch 'origin/60-weapon-does-not-show-in-both-hands-on-load-in' into main/yubo-dev 3 years ago
nimetu d453ba89b2 Fix Weapon does not show in both hands on load-in 3 years ago
Nuno eda9f224bc Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into main/yubo-dev 3 years ago
Nuno Gonçalves (Ulukyn) 8697553956 Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene" 3 years ago
Nuno ab4aa7487c Revert "Merge branch 'server/yubo-dev' into main/yubo-dev"
This reverts commit a4d92c34bd.
3 years ago
Nuno 47d3a0bb8a Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into server/yubo-dev 3 years ago
bensaine df24bf6129 fixes 3 years ago
Nuno 9517cc7384 Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into server/yubo-dev 3 years ago
bensaine 7aa639138a revert _IsHotbarSlot 3 years ago
Nuno 96c0da8efd Merge branch 'main/atys-live' into main/yubo-dev 3 years ago
Nuno 52c4b07bd5 Merge branch '10-use-item-shortcut-client' into main/yubo-dev 3 years ago
bensaine e7dec3d6b0 add: INVENTORIES:hotbar 3 years ago
bensaine b6b67f7482 initial draft 3 years ago
Nuno Gonçalves (Ulukyn) ae33eb99bf Resolve "Message bubble is very high on FH alarm plants" 3 years ago
Nuno Gonçalves (Ulukyn) 2b88fd66ba Merge branch '46-rework-item-buff-icon-placement' into 'main/gingo-test'
Hide 1x quantity for equipable items, dynamic buff icon placement

See merge request ryzom/ryzom-core!43
3 years ago
Ben Saine be5bfd992c Hide 1x quantity for equipable items, dynamic buff icon placement 3 years ago
Nuno 0258f07880 Apply WG changes, remove core4 changes (need be reapplied later) 3 years ago
Nuno d57148e824 Reformat xml using tidy_config.txt 3 years ago
Nuno 053620e3ac Merge branch 'main/gingo-test' into main/yubo-dev 3 years ago
Nuno Gonçalves (Ulukyn) 8708fd74c6 Resolve "Improve the way to reskin ryzhome items and preview" 3 years ago
Nuno b833b26c4e Merge branch 'main/gingo-test' into main/yubo-dev 3 years ago
Ben Saine 357934fcde Resolve "Dragging from player trade to inventory takes two tries" 3 years ago
Nuno 21db256a9a Merge branch '38-add-smooth-resizing-of-entitie-when-vpb-are-changed' into main/yubo-dev 3 years ago
Nuno 5c264fad52 Add smooth resizing of entitie when VPB are changed (wip) 3 years ago
Nuno Gonçalves (Ulukyn) e784c3aab1 Merge branch '37-remove-open-menu-option-from-scroll-items-when-item-use-a-scroll-label' into 'main/gingo-test'
Resolve "Remove Open menu option from scroll items when item use a Scroll.Label"

See merge request ryzom/ryzom-core!37
3 years ago
Nuno Gonçalves (Ulukyn) 22b4c074e8 Resolve "Remove Open menu option from scroll items when item use a Scroll.Label" 3 years ago
Nuno Gonçalves (Ulukyn) 855410f3d0 Resolve "Add ability to have translated titles with untraslated fields" 3 years ago
Nuno 908ef24b6b Merge branch '37-remove-open-menu-option-from-scroll-items-when-item-use-a-scroll-label' into main/yubo-dev 3 years ago
Nuno 4d1eca1a65 Remove Open menu option from scroll items when item use a Scroll.Label 3 years ago
Nuno fc32731142 Merge branch '36-add-ability-to-have-translated-titles-with-untraslated-fields' into main/yubo-dev 3 years ago
Nuno 202cfd8aab Merge branch 'main/atys-live' into main/yubo-dev 3 years ago
Nuno 73ec298025 Add ability to have translated titles with untraslated fields 3 years ago
Ben Saine 3b2553e3dd Resolve "Allow drag and drop between zig and guild" 3 years ago
Nuno a7811f553e Merge branch '16-drag-drop-to-player-trade-window-from-all-inventories' into main/gingo-test 3 years ago
Nuno Gonçalves (Ulukyn) e891dddd1e Merge branch 'fix-area-effect-flying-text' into 'main/gingo-test'
Fix flying text for area magic/combat actions

See merge request ryzom/ryzom-core!19
3 years ago
Meelis Mägi e185ddc19f Fix flying text for area magic/combat actions 3 years ago
Nuno 52c94ee0c6 Unremovable changes 3 years ago
Nuno 703c21cbc5 Merge branch 'feature/core4-atys' into main/yubo-dev 3 years ago
Nuno Gonçalves (Ulukyn) b12c7ac25c Merge branch 'add-screenshot-dir-to-config' into 'main/gingo-test'
Add ScreenShotDirectory entry to client.cfg

See merge request ryzom/ryzom-core!16
3 years ago
Meelis Mägi 9cff221a1e Add ScreenShotDirectory entry to client.cfg 3 years ago
Nuno 0df3879358 Reapply changes reverted into atys-live because bad merge 3 years ago
Nuno de638dfe6c Remove fmod option 3 years ago
Nuno 177e2395a5 Revert "Merge branch '32-remove-fmod-option-not-used-or-client-crash' into main/atys-live"
This reverts commit 0e2ec103ab.
3 years ago
Nuno 0e2ec103ab Merge branch '32-remove-fmod-option-not-used-or-client-crash' into main/atys-live 3 years ago
Nuno 574efe0c36 Remove fmod option 3 years ago
Nimetu c47db9bf94 Fix utf8 encoding on sphrase info window 3 years ago