Commit Graph

122 Commits (main/yubo-dev)

Author SHA1 Message Date
Nuno fbf842c75a Merge remote-tracking branch 'origin/feature/split-action-bar-1-and-2' into main/yubo-dev 3 years ago
Nuno 56d9c5fd04 Merge branch '47-hide-quality-indicator-on-item-if-equal-to-1' into main/yubo-dev 3 years ago
Nuno 00f02e1603 Added 3 years ago
Nuno eda9f224bc Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into main/yubo-dev 3 years ago
Nuno 9fc091f99b Add macro checks for enable code for old gcc version (< 40800) 3 years ago
Nuno 7129a8fa5f Add macro checks for enable code for old gcc version (< 40800) 3 years ago
Nuno ab4aa7487c Revert "Merge branch 'server/yubo-dev' into main/yubo-dev"
This reverts commit a4d92c34bd.
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
nimetu 3fc85ea291 Split action bar 1 and 2 into separate sets 3 years ago
Nuno b3b473d671 Merge branch 'main/yubo-dev' into server/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 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 96fe140ded Merge branch 'server/gingo-test' into server/yubo-dev 3 years ago
Nuno 202cfd8aab Merge branch 'main/atys-live' into main/yubo-dev 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 b1bc1a3b6c Fix issues with old gcc compiler (required by forge server) 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 e43515e88a Fix generate_module_interface.xslt used to server shard_unifier_service/nel_database_mapping.xml file 3 years ago
Nuno 30612d4897 Merge branch 'fix-area-effect-flying-text' into main/yubo-dev 3 years ago
kaetemi 0d1ac00392
Merge branch 'core4' into feature/core4-atys 3 years ago
Nuno 2df441225c Add RYZOM_PRODUCT_VERSION 3 years ago
kaetemi 415fe11606
Also apply u16 idx fix to msg.xml 3 years ago
Nimetu 146a7e25e6 Fix flying text for area magic/combat actions 3 years ago
kaetemi 5fe1c8b378
Merge branch 'core4' into feature/core4-atys
# Conflicts:
#	ryzom/common/data_common/msg.xml
#	ryzom/server/src/entities_game_service/client_messages.cpp
#	ryzom/server/src/entities_game_service/player_manager/character.cpp
#	ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
3 years ago
kaetemi ac9e8f4f5e
Merge remote-tracking branch 'origin/develop' into core4
# Conflicts:
#	ryzom/client/src/interface_v3/action_handler_help.cpp
3 years ago
Nimetu 984b2b3590 Merge branch 'develop' into develop-atys 3 years ago
Nimetu 75f490d394 Fix comparing same variable twice in CRingAccess 3 years ago
kaetemi 5a090b2943
Remove redundant caster parts from palette 3 years ago
kaetemi ec63cdc818
Fix world editor paths 3 years ago
kaetemi cf2bf5629f
Move item rename to be an admin command, not for player use 3 years ago
kaetemi 3e1ef7845c
Fix typo 3 years ago
kaetemi c12f83d36d
Merge fixes from core 3 years ago
kaetemi 97c7f85aed
Merge r2 entry points changes 3 years ago
kaetemi 0cf92bc6a8
Fix include 3 years ago
kaetemi 0b449bb95a
Regenerate sources 3 years ago
kaetemi ecf990f8ae
Sync network xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 3 years ago
kaetemi 2fc5798f67
Revert "Adjust default ports from 49xxx range to 43xxx range"
This reverts commit 0a1689ae10.
3 years ago
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys 3 years ago
kaetemi 7709977b48
Put the proper version number in service titles 3 years ago
kaetemi 0a1689ae10
Adjust default ports from 49xxx range to 43xxx range 3 years ago
kaetemi 10fc562e07
Add trick for reusable dev config 3 years ago