Commit Graph

100 Commits (d57148e824432ec5ba3945fd59ec723132bcfd9d)

Author SHA1 Message Date
Nuno d57148e824 Reformat xml using tidy_config.txt
Nuno 202cfd8aab Merge branch 'main/atys-live' into main/yubo-dev
Nuno 52c94ee0c6 Unremovable changes
Nuno 703c21cbc5 Merge branch 'feature/core4-atys' into main/yubo-dev
Nuno e43515e88a Fix generate_module_interface.xslt used to server shard_unifier_service/nel_database_mapping.xml file
Nuno 30612d4897 Merge branch 'fix-area-effect-flying-text' into main/yubo-dev
kaetemi 0d1ac00392
Merge branch 'core4' into feature/core4-atys
Nuno 2df441225c Add RYZOM_PRODUCT_VERSION
kaetemi 415fe11606
Also apply u16 idx fix to msg.xml
Nimetu 146a7e25e6 Fix flying text for area magic/combat actions
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
kaetemi ac9e8f4f5e
Merge remote-tracking branch 'origin/develop' into core4
# Conflicts:
#	ryzom/client/src/interface_v3/action_handler_help.cpp
Nimetu 984b2b3590 Merge branch 'develop' into develop-atys
Nimetu 75f490d394 Fix comparing same variable twice in CRingAccess
kaetemi 5a090b2943
Remove redundant caster parts from palette
kaetemi ec63cdc818
Fix world editor paths
kaetemi cf2bf5629f
Move item rename to be an admin command, not for player use
kaetemi 3e1ef7845c
Fix typo
kaetemi c12f83d36d
Merge fixes from core
kaetemi 97c7f85aed
Merge r2 entry points changes
kaetemi 0cf92bc6a8
Fix include
kaetemi 0b449bb95a
Regenerate sources
kaetemi ecf990f8ae
Sync network xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834
kaetemi 2fc5798f67
Revert "Adjust default ports from 49xxx range to 43xxx range"
This reverts commit 0a1689ae10.
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys
kaetemi 7709977b48
Put the proper version number in service titles
kaetemi 0a1689ae10
Adjust default ports from 49xxx range to 43xxx range
kaetemi 10fc562e07
Add trick for reusable dev config
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys
kaetemi c8ecf0a756
Enable full frequency connection
kaetemi d07e219439
Cleanup unused FS tick value
kaetemi 4407fc2970
Position speed checks should be based on the client tick. This fixes excessive rubber banding
kaetemi 30117e92be
More hashing of sequential indices
kaetemi da9c5173a6
Improve debug message
kaetemi 6d4b58c281
Update GPL headers
kaetemi fcf97d93df
Merge remote-tracking branch 'ryzomcore/develop' into feature/develop-atys
kaetemi 7a647ab76d
Update GPL headers
kaetemi 113f3f97d7
Merge branch 'develop' into ryzomclassic-develop
kaetemi c70ca1f8ab
Update GPL headers
kaetemi 28fd4d9011
Merge branch 'develop' into ryzomclassic-develop
Nimetu 78fa873003 Merge branch 'atys' into develop-atys
Nimetu 36f9888b91 Merge branch 'atys' into develop-atys
Nimetu 17782d5d21 Merge branch 'develop' into develop-atys
Nimetu 4505ecf8a2 Revert "Add missing PowerRoot effect families to sheetid conversions table."
This reverts commit ff9aa6c608.
Nimetu 040eee5c9e Merge branch 'atys' into develop-atys
kaetemi 45bc21e5c9 Show characteristic buffs of item in icon, fix forge enhancement,
kaetemi d1769c586f Merge branch 'feature/cdb-packed-ryzomclassic' into temp/more-patches-53
kaetemi 68b0fbeae8 Where did this come from
kaetemi 879b792c6a Merge branch 'ryzomclassic-develop' into feature/cdb-packed-ryzomclassic
kaetemi 431b1140e9 Merge commit '505e13cd1eb576209ac7e088c91e0ba1a3e2da62' into feature/cdb-packed-ryzomclassic