Commit Graph

423 Commits (c12f83d36d6576bf228db9ed1cb71281f7f78273)

Author SHA1 Message Date
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 553a51488b
Fix include 4 years ago
kaetemi 0cf92bc6a8
Fix include 4 years ago
kaetemi b9e71480f4
Merge fixes from core branch 4 years ago
kaetemi e62991d40c
Restore character cpp formatting 4 years ago
kaetemi 41e4f6800f
Merge fixes from core branch 4 years ago
kaetemi 2928e81ec7
Merge fixes from core 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 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