Commit Graph

89 Commits (24e918071c55812c7a28b61338bbcb1e6fe1436a)

Author SHA1 Message Date
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 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
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys 3 years ago
kaetemi c8ecf0a756
Enable full frequency connection 3 years ago
kaetemi d07e219439
Cleanup unused FS tick value 3 years ago
kaetemi 4407fc2970
Position speed checks should be based on the client tick. This fixes excessive rubber banding 3 years ago
kaetemi 30117e92be
More hashing of sequential indices 3 years ago
kaetemi da9c5173a6
Improve debug message 3 years ago
kaetemi 6d4b58c281
Update GPL headers 4 years ago
kaetemi fcf97d93df
Merge remote-tracking branch 'ryzomcore/develop' into feature/develop-atys 4 years ago
kaetemi 7a647ab76d
Update GPL headers 4 years ago
kaetemi 113f3f97d7
Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi c70ca1f8ab
Update GPL headers 4 years ago
kaetemi 28fd4d9011
Merge branch 'develop' into ryzomclassic-develop 4 years ago
Nimetu 78fa873003 Merge branch 'atys' into develop-atys 4 years ago
Nimetu 36f9888b91 Merge branch 'atys' into develop-atys 4 years ago
Nimetu 17782d5d21 Merge branch 'develop' into develop-atys 4 years ago
Nimetu 4505ecf8a2 Revert "Add missing PowerRoot effect families to sheetid conversions table."
This reverts commit ff9aa6c608.
4 years ago
Nimetu 040eee5c9e Merge branch 'atys' into develop-atys 4 years ago
kaetemi 45bc21e5c9 Show characteristic buffs of item in icon, fix forge enhancement, kaetemi/ryzomclassic#203 4 years ago
kaetemi d1769c586f Merge branch 'feature/cdb-packed-ryzomclassic' into temp/more-patches-53 4 years ago
kaetemi 68b0fbeae8 Where did this come from 4 years ago
kaetemi 879b792c6a Merge branch 'ryzomclassic-develop' into feature/cdb-packed-ryzomclassic 4 years ago
kaetemi 431b1140e9 Merge commit '505e13cd1eb576209ac7e088c91e0ba1a3e2da62' into feature/cdb-packed-ryzomclassic 4 years ago
kaetemi 6f2e45d352 Merge commit '05fdc723f1519009c05f0963846b41b3ca7c3858' into feature/cdb-packed-ryzomclassic 4 years ago
kaetemi 46541a700c Test item renames 4 years ago
kaetemi 8d4c0d0ef1 Fix build 4 years ago
kaetemi be11ae1fb6 Add network messages for locking and renaming items 4 years ago
kaetemi f203559ecb Update client inventory when item name is changed 4 years ago
kaetemi be28e102ec Add buff flags to item summary 4 years ago
kaetemi d512d10f18 Add guild access grade bits to inventory summary 4 years ago
kaetemi 24ceb5df04 Add ACCESS, remove SERIAL and CREATETIME to inventory sync 4 years ago
kaetemi bd0c694970 Fix insane XML formatting 4 years ago
kaetemi 5769a3599e Add editor config 4 years ago
Nimetu 72098f624d fix merge conflict 4 years ago