Commit Graph

10864 Commits (ab4aa7487c4744a814c911fa6f4b61238208c4f2)
 

Author SHA1 Message Date
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 fe4c39b593 move hotbar index 3 years ago
bensaine 7aa639138a revert _IsHotbarSlot 3 years ago
Nuno b3b473d671 Merge branch 'main/yubo-dev' into server/yubo-dev 3 years ago
Nuno 66980e5002 ? 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
Nuno 45518dd32c Merge branch 'main/gingo-test' into main/atys-live 3 years ago
nimetu d2508c8b15 Update hunter to 0.23.321 3 years ago
Nuno ec1b58713e Merge branch 'main/gingo-test' into main/atys-live 3 years ago
bensaine b6b67f7482 initial draft 3 years ago
Nuno Gonçalves (Ulukyn) d385dedabc Merge branch '56-message-bubble-is-very-high-on-fh-alarm-plants' into 'main/gingo-test'
Resolve "Message bubble is very high on FH alarm plants"

See merge request ryzom/ryzom-core!45
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
nimetu c4e48dc586 Update hunter to 0.23.321 3 years ago
Nuno 0258f07880 Apply WG changes, remove core4 changes (need be reapplied later) 3 years ago
Nuno d0b82b596d Merge branch 'feature/merge-from-ryzom-data' into main/yubo-dev 3 years ago
Nuno d57148e824 Reformat xml using tidy_config.txt 3 years ago
Nuno 190a81c9ff Merge branch 'main/gingo-test' into main/atys-live 3 years ago
Nuno 053620e3ac Merge branch 'main/gingo-test' into main/yubo-dev 3 years ago
Nuno Gonçalves (Ulukyn) 9a24e7557f Merge branch '54-improve-the-way-to-reskin-ryzhome-items-and-preview' into 'main/gingo-test'
Resolve "Improve the way to reskin ryzhome items and preview"

See merge request ryzom/ryzom-core!44
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
Nuno 96fe140ded Merge branch 'server/gingo-test' into server/yubo-dev 3 years ago
Nuno 858cf091aa Merge branch 'main/gingo-test' into server/gingo-test 3 years ago
Nuno db86219eab Added NL_NO_ASSERT to remove asserts in server 3 years ago
Nuno 7120bd6583 Merge branch 'main/gingo-test' into server/gingo-test 3 years ago
Nuno 3868876ab4 Merge branch 'main/gingo-test' into main/atys-live 3 years ago
Nuno Gonçalves (Ulukyn) c6ec8a8d7d Merge branch '40-dragging-from-player-trade-to-inventory-takes-two-tries' into 'main/gingo-test'
Resolve "Dragging from player trade to inventory takes two tries"

See merge request ryzom/ryzom-core!39
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) 255257a7f5 Merge branch '36-add-ability-to-have-translated-titles-with-untraslated-fields' into 'main/gingo-test'
Resolve "Add ability to have translated titles with untraslated fields"

See merge request ryzom/ryzom-core!36
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
Nuno aeb1dc1737 Fix issues with old gcc compiler (required by forge server) 3 years ago
Nuno 75a84c0e14 Update common from ryzom-data 3 years ago
Nuno 1f9694f108 Reformat xml using tidy_config.txt 3 years ago
Nuno Gonçalves (Ulukyn) 71a2c6f6e8 Merge branch '35-allow-drag-and-drop-between-zig-and-guild' into 'main/gingo-test'
Resolve "Allow drag and drop between zig and guild"

See merge request ryzom/ryzom-core!35
3 years ago