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