Commit Graph

645 Commits (52c4b07bd5b70ad800ad18f5da0de39e8f5e38c7)

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 ac9e8f4f5e
Merge remote-tracking branch 'origin/develop' into core4
# Conflicts:
#	ryzom/client/src/interface_v3/action_handler_help.cpp
3 years ago
Nimetu a4248d5fa1 Merge branch 'atys' into develop-atys 3 years ago
Nimetu 984b2b3590 Merge branch 'develop' into develop-atys 3 years ago
Nimetu 093702a704 Fix web link in item customtext being visible 3 years ago
Nimetu 75f490d394 Fix comparing same variable twice in CRingAccess 3 years ago
kaetemi 33a8128cfc
Add option to EGS to enable ring loot and xp 4 years ago
kaetemi d465191e96
Move sheet generator scripts to leveldesign 4 years ago
kaetemi fdc0af158c
Fix generated gender for 3dset 4 years ago
kaetemi 5a34b3dc59
Tweak xp level 4 years ago
kaetemi 03270f330f
Generate required NPCs for Ring 4 years ago
kaetemi 3fbb3242ee
Remove unused value 4 years ago
kaetemi 1dd98445ca
Generate generic action lists 4 years ago
kaetemi d607dec79e
Adjust folders, prepare a new success table 4 years ago
kaetemi df69ff8507
Generate generic magic dot ai actions 4 years ago
kaetemi efd2dea7e4
No need to specify melee type, since it's inherited from the equipped weapon 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 010c2c84eb
Generate genereric aeo and curse actions 4 years ago
kaetemi 838a362fad
Generate generic actions for melee and range 4 years ago
kaetemi 48548c99b8
Rebalance generated stats 4 years ago
kaetemi 34e079c020
Generate appropriate values for EGS 4 years ago
kaetemi 144ebe7f72
Comment out unused variables 4 years ago
kaetemi 5ef4a97c8a
Fix missing log context 4 years ago
kaetemi 62ed0d6de9
Generate generic ai actions for magic damage 4 years ago
kaetemi 7ecc87e3ed
Extract required creature parents 4 years ago
kaetemi 1df9e53dd5
Extract required npc creatures from palette 4 years ago
kaetemi a8f147231d
Generate melee weapons 4 years ago
kaetemi f73be89553
Generate armors into proper folders 4 years ago
kaetemi 5a090b2943
Remove redundant caster parts from palette 4 years ago
kaetemi 190057b11b
Generate shield items 4 years ago
kaetemi 03b9e1f44f
Remove known missing from list 4 years ago
kaetemi 93dc106d95
List remaining missing items 4 years ago
kaetemi 5fc80fca13
Improve naming convention 4 years ago
kaetemi c71980df2e
Fix missing piece of boss armor 4 years ago
kaetemi 34bb64cea7
Generate craftable refugee armor sheets 4 years ago
kaetemi fe9d945265
Generate craftable underwear sheets 4 years ago
kaetemi 725206c678
Add boss armor to generated sheets 4 years ago
kaetemi 43716f30fb
Add separate item list for manual additions 4 years ago
kaetemi 5117fd742b
Script to update references to renamed bricks and phrases 4 years ago
kaetemi d79f103525
Generate random mp count 4 years ago
kaetemi 151f5270bc
Test button for toggling armor (disabled) 4 years ago
kaetemi be7ee784ec
Always put the current brick name in the first column 4 years ago
kaetemi 3d174a1294
Track missing and duplicate sbricks 4 years ago
kaetemi 7a6227efcc
Extend parsing for additional armors 4 years ago
kaetemi fd14ad6c94
Generate craft brick and phrase for sitem 4 years ago
kaetemi c4025de222
Preserve previously extracted brick family indices 4 years ago
kaetemi 5346d2b15e
Tag brick family and skill trees 4 years ago
kaetemi 3cf8ca0959
Parse previous brick family indices to retain compatibility 4 years ago
kaetemi 68eb9149df
Generate armor sitem sheets 4 years ago
kaetemi 0115e0b745
Generate sitem parent sheets 4 years ago
kaetemi e0e85d0100
Parse parent sheet names as well 4 years ago
kaetemi e3ac824104
Simplify crafted rule for sitem name parser 4 years ago
kaetemi 56c3248198
Improve weapon matching tags 4 years ago
kaetemi 6cabc38192
Add script to match shape to sitem 4 years ago
kaetemi 3a2c47ac5a
Add script to parse shape names 4 years ago
kaetemi d9ac7b70a8
Write sitem name tags to output 4 years ago
kaetemi c41cdd76ff
Add script for extracting list of sheets required for R2 pallete. Add script for parsing and generating sitem names 4 years ago
kaetemi ec63cdc818
Fix world editor paths 4 years ago
kaetemi d235885d70
Fix truncated string conversion 4 years ago
kaetemi ef4fb03143
Update executable paths in tools 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 3e1ef7845c
Fix typo 4 years ago
kaetemi c12f83d36d
Merge fixes from core 4 years ago
kaetemi 97c7f85aed
Merge r2 entry points changes 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 0cf92bc6a8
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 ecf990f8ae
Sync network xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 4 years ago
kaetemi 41c8499bd4
Sync UI xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 4 years ago
kaetemi a3dea88eb1
Use better contrast 4 years ago
kaetemi b1733439d0
Splash screen for core 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 10fc562e07
Add trick for reusable dev config 4 years ago
kaetemi 614da137ac
Remove a lost file 4 years ago
kaetemi 1d06892f16
Remove duplicate web folder 4 years ago
kaetemi 08c094e957
Remove exe 4 years ago
kaetemi 681f133400
Remove redundant cfg files 4 years ago
kaetemi cac99dc9ab
Add missing browser css. Restore login window layout 4 years ago
kaetemi e9080405fc
Update title 4 years ago
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys 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
Nuno d5c03115d9
Remove useless variable 4 years ago
Nuno fe9b7aea89
Remove bad commit 4 years ago
Nuno c4fc834e67
Updated shard.screen.rc 4 years ago
Nuno 729deabd7a
Update install rocketchat 4 years ago
Nuno 0479a5ba8e
Merge branch 'allegories' 4 years ago
Nuno c4115ae2a4
Updated tools 4 years ago
Nuno 46ad8bcf5d
Merge branch 'new_features' 4 years ago
Nuno af4f4a1de6
Merge branch 'fixes' 4 years ago
Nuno c0129de5ed
Fixes for getNPCNameFromAlias 4 years ago
Nuno 5761a4a638
Merge remote-tracking branch 'origin/fixes' 4 years ago
Nuno 8d180bd38b
Merge branch 'ark' 4 years ago
Nuno bad68017b8
Fix issue with getTargetNames who are lowerized 4 years ago
Nuno e0c4bcf4e0
Merge branch 'new_features' 4 years ago
Nuno a1d3f91a9b
Merge branch 'new_features' 4 years ago
Nuno 2804161714
Merge branch 'new_features' 4 years ago
Nuno 371f529699
Fix 4 years ago
Nuno 4d4223c87c
Fix 4 years ago
Nuno f7953eea36
Fix 4 years ago
Nuno 806cb449a1
Some fixes 4 years ago
Nuno b76ac3d37f
Merge branch 'fixes' 4 years ago
Nuno d33f6b283f
Merge branch 'deepl' 4 years ago
Nuno 08393ea94d
Merge branch 'marauder_fame' 4 years ago
Nuno 9b5a4d94cf
Merge branch 'new_features' 4 years ago
Nuno ca042995c0
Merge branch 'fixes' 4 years ago
Nuno d88b549dbc
Merge branch 'fixes' 4 years ago
Nuno e3b030b823
Merge branch 'ark' 4 years ago
Nuno bf4ccacec6
Merge branch 'ark' 4 years ago
Nuno f0cc3f3b42
Merge branch 'ark' 4 years ago
Nuno 4008a69448
Added setAnimalTitle 4 years ago
kaetemi 141e7c6459
Sync to Forge server repo, rev 9f74b215ab99c508b08e2cee125946167d87e2ba 4 years ago
Nuno 000fdfb5d7
Merge branch 'fixes' 4 years ago
Nuno 17d84c5925
Merge branch 'fixes' 4 years ago
Nuno 0e833c37ef
Merge branch 'fixes' 4 years ago
Nuno 7f33e9bdd6
Merge branch 'fixes' 4 years ago
Nuno 5678ef1727
Revert "Merge branch 'yubo'"
This reverts commit 5319587e80ed7e822944565cde8b9a437b8fc55c.
4 years ago
Nuno 619b5fd122
Merge branch 'yubo' 4 years ago
Nuno a58af169ab
Merge branch 'ark' 4 years ago
Nuno bd6c6c4fc2
Merge branch 'deepl' 4 years ago
Ulukyn d6dcd13938
Merge branch 'fixes' 4 years ago
Ulukyn 72d29ef8f6
Merge branch 'fixes' 4 years ago
Ulukyn 578ae687df
Merge branch 'ark' 4 years ago
Ulukyn 3c178cb506
Merge branch 'deepl' 4 years ago
Ulukyn 0d57aad8b9
Merge branch 'fixes' 4 years ago
Ulukyn e6bb1f2f54
Merge branch 'deepl' 4 years ago
Ulukyn ea095ca4f3
Merge branch 'fixes' 4 years ago
Ulukyn 8df98ce44a
Merge branch 'ark' 4 years ago
Ulukyn ae685b3d68
Merge branch 'ark' 4 years ago
Ulukyn 653a8fb472
Added: login htacess and server_open_status 4 years ago
Ulukyn 5bddc6eaa7
Added: python tools for server commands
Install Rocketchat script
4 years ago
Ulukyn 406072f3e1
Merge branch 'ark' 4 years ago
Ulukyn 1c8a939797
Merge branch 'ark' 4 years ago
Ulukyn 463738c036
Changed: remove some logs 4 years ago
Ulukyn 10666c23bd
Merge branch 'ark' 4 years ago
Ulukyn 085cead1a1
Merge branch 'ark' 4 years ago
Ulukyn f764a0e6d9
Merge branch 'ark' 4 years ago
Ulukyn 4dafe289e5
Merge branch 'ark' 4 years ago
Ulukyn a3818593b8
Merge remote-tracking branch 'origin/feature-new-forage-sbricks' 4 years ago
Ulukyn 1b5f2ed003
Merge branch 'ark' 4 years ago
Ulukyn ecf38c8ddc
Merge branch 'ark' 4 years ago
Ulukyn be3c81aa80
Merge branch 'generic-gameplay' 4 years ago
Ulukyn 887dbdad0d
Merge branch 'ark' 4 years ago
Ulukyn 62457be418
Fixed: typo 4 years ago
Ulukyn f3b22802e8
Fixed: Don't manage translation of Npcs with deepl 4 years ago
Ulukyn 230ca5ffdb
Fixed: Remove hardcoding of mongo server and db. Prevent crash of ios 4 years ago
Ulukyn 1a6b197411
Merge branch 'generic-gameplay' 4 years ago
Ulukyn d3b2e1f4b5
Changed: updated database_plr file 4 years ago
Ulukyn 164719aa55
Fixed: Remove useless include of news_types.h 4 years ago
Ulukyn ed4e88c773
Fixed: replace nlassert by return to prevent crash of EGS 4 years ago
Ulukyn b35ba142be
Merge branch 'ark' 4 years ago
Nuno Gonçalves 417b42487d
Merge with Ark 4 years ago
Nuno Gonçalves dad6e43285
Merge with Ark 4 years ago
Nuno Gonçalves 16d3fa8e6a
Fixed: Prevent crash of IOS when renames uses ' and special chars 4 years ago
kaetemi cca82baa89
Include other stuff from Forge server repo, same rev 4 years ago
kaetemi a3a074f455
Sync with Forge server, rev fa044821f36dfdd47986c32a1357fc028984b385 4 years ago
kaetemi 3b993c6cda
Update defaults 4 years ago
kaetemi 5b22e0950a
Disable adjustment warning since it's not very useful. Speed limit needs to be able to reference a more accurate timing 4 years ago
kaetemi 20ed0a4412
Only send position if client game tick advanced as well 4 years ago
kaetemi c8ecf0a756
Enable full frequency connection 4 years ago
kaetemi d07e219439
Cleanup unused FS tick value 4 years ago
kaetemi 92bfb0aafb
Re-add lag compensation time from client to tick value in mirror 4 years ago
kaetemi 4407fc2970
Position speed checks should be based on the client tick. This fixes excessive rubber banding 4 years ago