Merge development into stable
#1122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improve logging pattern by including caller class name
Implement a better config structure
* Fix default port for the game server * Fix the returning region info
…is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale
Fix InRouting on dispatch server
…not exist if there's no translation for currently language
* Move `BuildConfig.java` from `/src/generated`to `/src/main` to accomplish the building pipeline * Add BuildConfig.java to the .gitignore
I don't understand the reason why ** makes two same positions data
* Fix receiving reward repeatedly fix #1105 （just fix "无限发送领取请求"） * Fix dead code and prevent getting item repeatedly * fix again
|
no way |
|
real |
|
oh god oh fuck |
|
kick ass! |
…mand (#1152) * stamina command enhancement * added "ns" as command aliases for NoStaminaCommand
* Arresting small creature support * add InsectCaptureManager * use EnvAnimalGatherExcelConfigData.json * Update InsectCaptureManager.java
Fix that can not detach equipment after attached
WARNING: with the consuming of material widget ( Example: bomb ), this is just a implement designed to the decreasing of count ### Known Bug: No effects after using item but decrease. ### If you know which Packet could make the effects, feel free to contribute!
Now the spawn command is: spawn <entityID> [amount] [level(monster only)] <x> <y> <z>(monster only, optional) The coordinate is optional
….json when worldLevelOverride is not zero. For example, in world with worldlevel 8, base monster level is 90 according to resources/ExcelBinOutput/WorldLevelExcelConfigData.json, monster level bias in data/Spawns.json belongs to [1,32], so the monster level would belong to [69, 100].
…f Chaos Gear series.
Also clarified coop command in help command.
* When the server starts, it now outputs the game and server version. Too dumb to not hardcode it - sorry! * ... * sorry i dropped my spaghetti, I'll help clean that * Doing simple stuff: now without hardcoding! * Restored Git hash functionality * Fixed other languages and made the output more useful. * Forgot this file lol
…1186) * add new command (unlimitenergy):toggle energyusage for each player while energyusage is ture in config.json * Solve the problem of layout and naming errors * make currentActiveTeam's Avatar full-energy while turn on the ule. * Resolve language document errors * add config_error message while player try to execute UnlimitEnergyCommand in GAME_OPTIONS.energyUsage == false
* Fix unable to save game data occasionally * No self-kicking * Game data synchronization * finally * prevent duplicated saving * reverse changing * keep the previous code * Update GameServerInitializer.java * Update GameSession.java * remove sanity check because of try block * a session needs can be created without a pipeline.
ghost
merged commit
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(written by @KingRainbow44)
Upgrade to version
1.2.0!Detailed Changelogs:
lombokas a dependencyBuildConfig.javafile into the JAR containing the artifact detailskcp-netty2.7.protofiles to support anime game2.7wow actual change logs this time no way
thanks for the massive support on grasscutter!
currently at: 322 commits with 938 files changed