Compare commits
merge into: Ryzom:main/gingo-test
Ryzom:fix-linux-multi-monitor
Ryzom:core4
Ryzom:add-toggle-free-look-ah
Ryzom:main/yubo-dev
Ryzom:fix-media-player-playlist-limit
Ryzom:feature/change-sound-driver-ingame
Ryzom:10-use-item-shortcut-client
Ryzom:53-setting-to-change-tooltip-opacity
Ryzom:47-hide-quality-indicator-on-item-if-equal-to-1
Ryzom:18-enchant-icon-does-not-properly-update-on-weapon
Ryzom:feature/quick-start-py
Ryzom:23-sort-inventory-by-type-weight-bulk-quantity-quality-2
Ryzom:51-shift-enter-at-merchant-no-longer-sells-to-merchant
Ryzom:52-add-escape-shortcut-to-open-quit-menu
Ryzom:60-weapon-does-not-show-in-both-hands-on-load-in
Ryzom:main/atys-live
Ryzom:main/gingo-test
Ryzom:feature/split-action-bar-1-and-2
Ryzom:55-remove-chat-replies-shortcuts
Ryzom:46-rework-item-buff-icon-placement
Ryzom:43-crafting-items-are-not-sorted
Ryzom:40-dragging-from-player-trade-to-inventory-takes-two-tries
Ryzom:38-add-smooth-resizing-of-entitie-when-vpb-are-changed
Ryzom:36-add-ability-to-have-translated-titles-with-untraslated-fields
Ryzom:35-allow-drag-and-drop-between-zig-and-guild
Ryzom:feature/compatibility-old-gcc
Ryzom:26-encoding-issues-in-client-beta-after-core4-merge
Ryzom:fix-viewtext-localized-text
Ryzom:main/atys-pre-live
Ryzom:21-fix-nopatch-without-argument-crash
Ryzom:30-changes-for-silan-refactoring
Ryzom:fixes
Ryzom:27-fixed-crash-with-html-image-downloads
Ryzom:feature/hunter
Ryzom:16-drag-drop-to-player-trade-window-from-all-inventories
Ryzom:23-sort-inventory-by-type-weight-bulk-quantity-quality
Ryzom:25-remove-lock-option-from-item-menu-in-guild-inventory
Ryzom:feature/colissions-stairs
Ryzom:feature/core4-atys
Ryzom:feature/hunter-dxsdk-download
Ryzom:merge/2021-11-19
Ryzom:fix-area-effect-flying-text
Ryzom:add-screenshot-dir-to-config
Ryzom:feature/develop-atys
Ryzom:self-kill
Ryzom:inventory-fixes
Ryzom:develop
Ryzom:13-inventory-fixes
Ryzom:20-add-equip-option-to-right-click-dialog-in-all-inventories
Ryzom:6-animal-status-innacurate-when-zig-is-in-bag
Ryzom:atys
Ryzom:use-item-macro
Ryzom:ryzomclassic-develop
Ryzom:ryzom/silan_refactoring
Ryzom:feature/prepare-cross-merge
Ryzom:storyline/s2e0
Ryzom:feature/bonusmalus-timers
Ryzom:ryzom/ark/features
Ryzom:ryzom/op_refactoring
Ryzom:feature/css-lang-var
Ryzom:ryzom/ui/improvements
Ryzom:fx
Ryzom:feature/hires-textures
Ryzom:feature/cdb-packed-ryzomclassic
Ryzom:feature/cdb-packed
Ryzom:feature/opengl3
Ryzom:ryzom/patch-changes
Ryzom:fix_opengl_on_mac
Ryzom:ryzom/deepl
Ryzom:ryzom/lua-features
Ryzom:fix-media-player
Ryzom:feature/code-to-root
Ryzom:feature/post-code-move
Ryzom:feature/pre-code-move
Ryzom:fix-menu-scroll
Ryzom:storyline/s2e1
Ryzom:webig-fixes
Ryzom:ryzom/sheets
Ryzom:feature/streamed-package
Ryzom:hg/develop
Ryzom:hg/hotfix/patches-from-atys
Ryzom:hg/yubo
Ryzom:hg/atys
Ryzom:hg/ark
Ryzom:hg/feature/html-improvements
Ryzom:undelete-develop
Ryzom:hg/feature/menu-navi
Ryzom:hg/compatibility-develop
Ryzom:kaetemi-develop
Ryzom:feature/nel-dll
Ryzom:feature/version-resources
Ryzom:feature/clean-deprecated
Ryzom:feature/3ds-max-2020
Ryzom:feature/pipeline-tools
Ryzom:feature/build-pipeline-v3
Ryzom:hg/feature/material-editor
Ryzom:hg/feature/opengl3
Ryzom:hg/feature/qt5
Ryzom:hg/feature/cef3
Ryzom:hg/feature/streamed-package
Ryzom:hg/feature/light_cycle
Ryzom:hg/compatibility
Ryzom:hg/feature/gsoc2012-fabien
Ryzom:hg/feature/build_pipeline_v3
Ryzom:hg/feature/cdb-packed
Ryzom:hg/feature/game-device
Ryzom:hg/feature/sdl2
Ryzom:hg/feature/sse2
Ryzom:hg/feature/gsoc2013-dfighter
Ryzom:hg/feature/sound
Ryzom:3.3.0
Ryzom:Live-746
Ryzom:Live-791
Ryzom:Live-803
Ryzom:Live-813
Ryzom:Live-831
Ryzom:Live-832
Ryzom:Live-834
Ryzom:compatibility-merge
Ryzom:latest-default-graft
Ryzom:latest-graft-to-default
Ryzom:latest-merge-from-default
Ryzom:live/837
Ryzom:live/893
Ryzom:live/895
Ryzom:ryzom-patch-3.0.0
Ryzom:ryzom-patch-3.0.1
Ryzom:ryzom-patch-3.0.2
Ryzom:ryzom-patch-3.1.0
Ryzom:ryzom-patch-3.1.0-april_patch
Ryzom:ryzom-patch-3.1.0-hotfix
Ryzom:ryzom-patch-3.2.0
Ryzom:ryzom-patch-3.2.1
Ryzom:ryzom-patch-3.3.0
Ryzom:ryzom-patch-3.3.1
Ryzom:ryzom-patch-3.4.0
Ryzom:ryzom-patch-3.4.0_Atysmas
Ryzom:ryzom-patch-3.4.0_Steam_Fix
Ryzom:ryzom-patch-3.5.0
Ryzom:ryzom-patch-3.5.0.9637
Ryzom:ryzom/3.0.0
Ryzom:ryzom/3.0.1
Ryzom:ryzom/3.0.2
Ryzom:ryzom/3.1.0
Ryzom:ryzom/3.1.0-april_patch
Ryzom:ryzom/3.1.0-hotfix
Ryzom:ryzom/3.2.0
Ryzom:ryzom/3.2.1
Ryzom:ryzom/3.3.0
Ryzom:ryzom/3.3.1
Ryzom:ryzom/3.4.0
Ryzom:ryzom/3.4.0-atysmas
Ryzom:ryzom/3.4.0-steam_fix
Ryzom:ryzom/3.5.0
Ryzom:ryzom/3.5.0.9637
Ryzom:ryzomcore/v0.10.0
Ryzom:ryzomcore/v0.11.0
Ryzom:ryzomcore/v0.11.1
Ryzom:ryzomcore/v0.11.2
Ryzom:ryzomcore/v0.11.3
Ryzom:ryzomcore/v0.12.0
Ryzom:ryzomcore/v0.8.0
Ryzom:ryzomcore/v0.9.0
Ryzom:ryzomcore/v0.9.1
Ryzom:ryzomcore/v1.0.0
Ryzom:ryzomcore/v1.0.1
Ryzom:ryzomcore_0_8_0
Ryzom:v0.10.0
Ryzom:v0.11.0
Ryzom:v0.11.1
Ryzom:v0.11.2
Ryzom:v0.11.3
Ryzom:v0.12.0
Ryzom:v0.8.0
Ryzom:v0.9.0
Ryzom:v0.9.1
Ryzom:v1.0.0
Ryzom:v1.0.1
pull from: Ryzom:main/gingo-test
Ryzom:fix-linux-multi-monitor
Ryzom:core4
Ryzom:add-toggle-free-look-ah
Ryzom:main/yubo-dev
Ryzom:fix-media-player-playlist-limit
Ryzom:feature/change-sound-driver-ingame
Ryzom:10-use-item-shortcut-client
Ryzom:53-setting-to-change-tooltip-opacity
Ryzom:47-hide-quality-indicator-on-item-if-equal-to-1
Ryzom:18-enchant-icon-does-not-properly-update-on-weapon
Ryzom:feature/quick-start-py
Ryzom:23-sort-inventory-by-type-weight-bulk-quantity-quality-2
Ryzom:51-shift-enter-at-merchant-no-longer-sells-to-merchant
Ryzom:52-add-escape-shortcut-to-open-quit-menu
Ryzom:60-weapon-does-not-show-in-both-hands-on-load-in
Ryzom:main/atys-live
Ryzom:main/gingo-test
Ryzom:feature/split-action-bar-1-and-2
Ryzom:55-remove-chat-replies-shortcuts
Ryzom:46-rework-item-buff-icon-placement
Ryzom:43-crafting-items-are-not-sorted
Ryzom:40-dragging-from-player-trade-to-inventory-takes-two-tries
Ryzom:38-add-smooth-resizing-of-entitie-when-vpb-are-changed
Ryzom:36-add-ability-to-have-translated-titles-with-untraslated-fields
Ryzom:35-allow-drag-and-drop-between-zig-and-guild
Ryzom:feature/compatibility-old-gcc
Ryzom:26-encoding-issues-in-client-beta-after-core4-merge
Ryzom:fix-viewtext-localized-text
Ryzom:main/atys-pre-live
Ryzom:21-fix-nopatch-without-argument-crash
Ryzom:30-changes-for-silan-refactoring
Ryzom:fixes
Ryzom:27-fixed-crash-with-html-image-downloads
Ryzom:feature/hunter
Ryzom:16-drag-drop-to-player-trade-window-from-all-inventories
Ryzom:23-sort-inventory-by-type-weight-bulk-quantity-quality
Ryzom:25-remove-lock-option-from-item-menu-in-guild-inventory
Ryzom:feature/colissions-stairs
Ryzom:feature/core4-atys
Ryzom:feature/hunter-dxsdk-download
Ryzom:merge/2021-11-19
Ryzom:fix-area-effect-flying-text
Ryzom:add-screenshot-dir-to-config
Ryzom:feature/develop-atys
Ryzom:self-kill
Ryzom:inventory-fixes
Ryzom:develop
Ryzom:13-inventory-fixes
Ryzom:20-add-equip-option-to-right-click-dialog-in-all-inventories
Ryzom:6-animal-status-innacurate-when-zig-is-in-bag
Ryzom:atys
Ryzom:use-item-macro
Ryzom:ryzomclassic-develop
Ryzom:ryzom/silan_refactoring
Ryzom:feature/prepare-cross-merge
Ryzom:storyline/s2e0
Ryzom:feature/bonusmalus-timers
Ryzom:ryzom/ark/features
Ryzom:ryzom/op_refactoring
Ryzom:feature/css-lang-var
Ryzom:ryzom/ui/improvements
Ryzom:fx
Ryzom:feature/hires-textures
Ryzom:feature/cdb-packed-ryzomclassic
Ryzom:feature/cdb-packed
Ryzom:feature/opengl3
Ryzom:ryzom/patch-changes
Ryzom:fix_opengl_on_mac
Ryzom:ryzom/deepl
Ryzom:ryzom/lua-features
Ryzom:fix-media-player
Ryzom:feature/code-to-root
Ryzom:feature/post-code-move
Ryzom:feature/pre-code-move
Ryzom:fix-menu-scroll
Ryzom:storyline/s2e1
Ryzom:webig-fixes
Ryzom:ryzom/sheets
Ryzom:feature/streamed-package
Ryzom:hg/develop
Ryzom:hg/hotfix/patches-from-atys
Ryzom:hg/yubo
Ryzom:hg/atys
Ryzom:hg/ark
Ryzom:hg/feature/html-improvements
Ryzom:undelete-develop
Ryzom:hg/feature/menu-navi
Ryzom:hg/compatibility-develop
Ryzom:kaetemi-develop
Ryzom:feature/nel-dll
Ryzom:feature/version-resources
Ryzom:feature/clean-deprecated
Ryzom:feature/3ds-max-2020
Ryzom:feature/pipeline-tools
Ryzom:feature/build-pipeline-v3
Ryzom:hg/feature/material-editor
Ryzom:hg/feature/opengl3
Ryzom:hg/feature/qt5
Ryzom:hg/feature/cef3
Ryzom:hg/feature/streamed-package
Ryzom:hg/feature/light_cycle
Ryzom:hg/compatibility
Ryzom:hg/feature/gsoc2012-fabien
Ryzom:hg/feature/build_pipeline_v3
Ryzom:hg/feature/cdb-packed
Ryzom:hg/feature/game-device
Ryzom:hg/feature/sdl2
Ryzom:hg/feature/sse2
Ryzom:hg/feature/gsoc2013-dfighter
Ryzom:hg/feature/sound
Ryzom:3.3.0
Ryzom:Live-746
Ryzom:Live-791
Ryzom:Live-803
Ryzom:Live-813
Ryzom:Live-831
Ryzom:Live-832
Ryzom:Live-834
Ryzom:compatibility-merge
Ryzom:latest-default-graft
Ryzom:latest-graft-to-default
Ryzom:latest-merge-from-default
Ryzom:live/837
Ryzom:live/893
Ryzom:live/895
Ryzom:ryzom-patch-3.0.0
Ryzom:ryzom-patch-3.0.1
Ryzom:ryzom-patch-3.0.2
Ryzom:ryzom-patch-3.1.0
Ryzom:ryzom-patch-3.1.0-april_patch
Ryzom:ryzom-patch-3.1.0-hotfix
Ryzom:ryzom-patch-3.2.0
Ryzom:ryzom-patch-3.2.1
Ryzom:ryzom-patch-3.3.0
Ryzom:ryzom-patch-3.3.1
Ryzom:ryzom-patch-3.4.0
Ryzom:ryzom-patch-3.4.0_Atysmas
Ryzom:ryzom-patch-3.4.0_Steam_Fix
Ryzom:ryzom-patch-3.5.0
Ryzom:ryzom-patch-3.5.0.9637
Ryzom:ryzom/3.0.0
Ryzom:ryzom/3.0.1
Ryzom:ryzom/3.0.2
Ryzom:ryzom/3.1.0
Ryzom:ryzom/3.1.0-april_patch
Ryzom:ryzom/3.1.0-hotfix
Ryzom:ryzom/3.2.0
Ryzom:ryzom/3.2.1
Ryzom:ryzom/3.3.0
Ryzom:ryzom/3.3.1
Ryzom:ryzom/3.4.0
Ryzom:ryzom/3.4.0-atysmas
Ryzom:ryzom/3.4.0-steam_fix
Ryzom:ryzom/3.5.0
Ryzom:ryzom/3.5.0.9637
Ryzom:ryzomcore/v0.10.0
Ryzom:ryzomcore/v0.11.0
Ryzom:ryzomcore/v0.11.1
Ryzom:ryzomcore/v0.11.2
Ryzom:ryzomcore/v0.11.3
Ryzom:ryzomcore/v0.12.0
Ryzom:ryzomcore/v0.8.0
Ryzom:ryzomcore/v0.9.0
Ryzom:ryzomcore/v0.9.1
Ryzom:ryzomcore/v1.0.0
Ryzom:ryzomcore/v1.0.1
Ryzom:ryzomcore_0_8_0
Ryzom:v0.10.0
Ryzom:v0.11.0
Ryzom:v0.11.1
Ryzom:v0.11.2
Ryzom:v0.11.3
Ryzom:v0.12.0
Ryzom:v0.8.0
Ryzom:v0.9.0
Ryzom:v0.9.1
Ryzom:v1.0.0
Ryzom:v1.0.1
These branches are equal. There is no need to create a pull request.