Commit Graph

188 Commits (a77f823ba361cde065cd6ed36cdbc8e15fc6b952)

Author SHA1 Message Date
Nuno adf9719076
Merge branch 'outpost_refactoring' 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 33a8128cfc
Add option to EGS to enable ring loot and xp 4 years ago
kaetemi 3fbb3242ee
Remove unused value 4 years ago
kaetemi bc5d0fae17
Add option to disable using the dodge resist table average in calculating mob damage 4 years ago
kaetemi 9bd90c47c4
Print out average dodge factor 4 years ago
kaetemi 144ebe7f72
Comment out unused variables 4 years ago
kaetemi 5ef4a97c8a
Fix missing log context 4 years ago
kaetemi cf2bf5629f
Move item rename to be an admin command, not for player use 4 years ago
kaetemi e0082cb919
Fix tool build 4 years ago
kaetemi 6169126391
Fix includes 4 years ago
kaetemi ec6b13a88b
Fix duplicate include 4 years ago
kaetemi 553a51488b
Fix include 4 years ago
kaetemi b9e71480f4
Merge fixes from core branch 4 years ago
kaetemi 2889e81d63
Typo 4 years ago
kaetemi e62991d40c
Restore character cpp formatting 4 years ago
kaetemi 41e4f6800f
Merge fixes from core branch 4 years ago
kaetemi 678d888b5c
Merge stuff from atys branch 4 years ago
kaetemi 6a79a5bf0f
Include fixes from atys branch 4 years ago
kaetemi 2928e81ec7
Merge fixes from core branch 4 years ago
kaetemi b4638c7969
Include fixes from atys branch 4 years ago
kaetemi 0b449bb95a
Regenerate sources 4 years ago
kaetemi 7cba0c8794
Merge branch 'core4' into feature/core4-atys 4 years ago
kaetemi 23b188cadc
Support launch ctrl on dev shard 4 years ago
kaetemi 4fb55a86d3
Add launch priority to dev shard configuration 4 years ago
kaetemi 9cf4677005
Generate AES configuration for dev shard 4 years ago
kaetemi 2fc5798f67
Revert "Adjust default ports from 49xxx range to 43xxx range"
This reverts commit 0a1689ae10.
4 years ago
kaetemi 4fe7175916
Revert "Adjust SU port"
This reverts commit 77e69856d4.
4 years ago
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys 4 years ago
kaetemi 7709977b48
Put the proper version number in service titles 4 years ago
kaetemi 77e69856d4
Adjust SU port 4 years ago
kaetemi b6e79ee3e1
More useful defaults for generated batch 4 years ago
kaetemi 0a1689ae10
Adjust default ports from 49xxx range to 43xxx range 4 years ago
kaetemi 5a8fa2052b
Generate shard configuration for service dashboard 4 years ago
kaetemi 681f133400
Remove redundant cfg files 4 years ago
kaetemi e6a617b8bc
Sync with Forge server repo, rev ee7e32c71e8b4988e07eb6c52fec6a3fffe0cfc3 4 years ago
Nuno c8ba121b88
Merge branch 'ark' 4 years ago
Nuno 438cce1323
Merge branch 'ark' 4 years ago
Nuno 005f1c755c
Merge branch 'ark' 4 years ago
Nuno 4108367413
Merge branch 'ark' 4 years ago
Nuno 3ccdb43683
Player can't exchanges jewels with allegories 4 years ago
Nuno aad1a6edd0
Merge branch 'ark' 4 years ago
Nuno 9b475fde60
Merge branch 'outpost_refactoring' 4 years ago
Nuno 4401db3dc7
Merge branch 'feature/bonusmalus-timers' 4 years ago
Nuno ca543ce9b6
Merge branch 'outpost_refactoring' 4 years ago
Nuno 73fc8e09ef
Merge branch 'outpost_refactoring' 4 years ago
Nuno c2fa3133b9
Merge branch 'outpost_refactoring' 4 years ago
Nuno 796582e235
Merge branch 'new_features' 4 years ago
Nuno 1c57ac7b8f
Merge branch 'ark' 4 years ago
Nuno 0f74f62640
Merge branch 'ark' 4 years ago