Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-11 08:53:20 +08:00
Code Issues Projects Releases Wiki Activity
1,074 Commits 7 Branches 22 Tags 150 MiB
248b655f07
Commit Graph

789 Commits

Author SHA1 Message Date
Melledy
dfd8fcb250 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
51844b6535 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
e9d7d5d5f2 Implement quests 2022-05-11 03:56:40 -07:00
Secretboy-SMR
e3fd2eaa17 Removed invalid code in getLanguageFileDescription,When the language 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 2022-05-11 03:11:10 -07:00
coooookies
7e3bfed003 Show server status to three-party game launcher 2022-05-11 02:45:21 -07:00
Secretboy-SMR
04f6e73447 fixed language not found prompt 2022-05-11 01:18:10 -07:00
mingjun97
8ad6bda3b2 Bug fixes. 
* Fix default port for the game server
* Fix the returning region info
 2022-05-11 01:17:51 -07:00
gentlespoon
37e1ffed28 Fix incorrect ascension level in givechar command 2022-05-11 01:17:10 -07:00
Magix
22cbe74875 Merge pull request #802 from Grasscutters/better-config 
Implement a better config structure
 2022-05-11 01:23:43 -04:00
KingRainbow44
812f4b372c Fix ClassDefNotFound & NullPointerException errors 2022-05-11 01:23:18 -04:00
KingRainbow44
0b3e2b3017 Remove config file 2022-05-11 00:48:40 -04:00
KingRainbow44
bd9e207a8c Remove old config & migrate legacy configs 2022-05-11 00:46:49 -04:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
KingRainbow44
c274907e9a Create new config class 2022-05-10 22:49:25 -04:00
gentlespoon
54cf45a72e Claymore charged attack stamina cost 2022-05-10 17:25:18 -07:00
Magix
099e45b581 Merge pull request #688 from HotaruYS/patch-3 
Improve logging pattern by including caller class name
 2022-05-10 20:17:13 -04:00
KingRainbow44
5d49323c37 my poor, poor, language system (Formatting refactor) 2022-05-10 20:00:47 -04:00
Secretboy-SMR
a26afe7d47 Fix language switching prompt and save 2022-05-10 13:36:57 -07:00
tester233
f92e839ad1 Improve text 2022-05-10 06:36:19 -07:00
Secretboy
94409b8635 fixed pr780, uploaded LanguageCommand.java (#782) 
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate

* I forgot to git add...sorry,,this pr is to fix pr780, uploaded LanguageCommand.java
 2022-05-10 06:35:37 -07:00
Secretboy
ecf028d0c6 add /language command (#780) 
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate
 2022-05-10 05:33:45 -07:00
gentlespoon
0f1341512c Reset first tick on new skill 2022-05-10 05:21:29 -07:00
gentlespoon
2a3708ee46 Talent moving stamina cost 2022-05-10 05:21:29 -07:00
gentlespoon
99dbac8ad3 Add UTF8 charset in dispatch server HTML template. 2022-05-10 05:21:21 -07:00
Kinesis
b1bd0a5a95 fixed KillCharacter help command description typo case 2022-05-10 05:21:13 -07:00
tester233
70cfe3e42a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
ad1d45fa90 Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
7efbdbf1ed Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
f26fe213a2 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
fb3c3b71c8 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
0ea0eab6b6 Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00
Melledy
c424d15b32 Remove previous fix for falling to death in godmode 
This fix is more efficient
 2022-05-10 01:50:04 -07:00
gentlespoon
a601e13d80 No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
5a37acde2b Fix the following issues: 
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located
 2022-05-09 23:15:58 -07:00
FpguDhk
d179b5c7dc Fix the decision statement of adding map marker. (#763) 
* Fix the Chinese messy code problem.

* Fix the decision statement of adding map marker.
 2022-05-09 23:15:17 -07:00
hatsune-miku
f5509d1e7d Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
c2230485c1 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
1c8207500c Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
19e798a28b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
85f5a753e1 Merge pull request #746 from Akka0/tower 
fix the Monster spawn between stage challenges
 2022-05-09 12:50:33 -07:00
筱傑
bdc9e483ae Fixed MissingFormatArgumentException (#727) 
Format string is `"given_level": "Given %s with level %s %s times to %s"`
 2022-05-09 12:50:23 -07:00
Akka
66b17cad26 little fix 2022-05-10 00:14:50 +08:00
Akka
2e69a4d8f7 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
faa3cde575 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
9a7d78e0b7 Update translation keys to fix issues 648 677 
fix issues 648 677
 2022-05-09 04:18:12 -07:00
Mateoust
c432ace5d8 Updating language files fixed the issue 648 677 
fix issue 648 677
 2022-05-09 04:18:12 -07:00
AnimeGitB
63efef8d05 Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
5d917f185f Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
eb2b23928b Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
ccdc3d1214 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
45b45c4beb Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
722e710c7b Fix #719 2022-05-09 17:01:08 +08:00
Melledy
f0aa8c2c53 Merge pull request #718 from Akka0/tower 
Support Team Toggle in Tower & Refactor MonsterTide
 2022-05-09 01:15:02 -07:00
AnimeGitB
713b2698d0 Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
f08a89711c Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
80db118f72 Add permissionTargeted to applicable commands 
Change target perm from target.perm to x.perm.others
 2022-05-09 01:12:47 -07:00
Akka
47ea466054 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
65c93a747c Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
056b5b80c8 Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
9869e4368d -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
935bb4b523 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
72e8a976ea Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
5f8011f0ec Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
06f531fe18 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
d43f431506 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
137ea1e294 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
HotaruYS
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
5d1f49579b feature(task): Implement pause, resume and cancel 
Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly.
A little bit of testing shows that pausing and then resuming may execute the task multiple times.
 2022-05-08 06:28:13 -07:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
9ad44f5c10 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
55389d3a5c Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
2dfdc62743 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
219a850818 Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Michaellan
176f3e91f1 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
beea95fdae Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
d78348522e Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
a09723f07d Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
7c35c51a6a Override server logging level with environment variable (#653) 
Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`
 2022-05-08 03:48:06 -07:00
Akka
4b6842f006 Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
3a5503de72 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
ef3579da82 add Command description 2022-05-08 01:47:26 -07:00
方块君
a46d58e5f6 Add command description multilingual 2022-05-08 01:47:26 -07:00
芊枫
4c911d6f55 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
d7a82e1c9f Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
21cd002fbd Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
06564da009 fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
94a6a79b4a Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
549471b76e Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
50307ea3a9 Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
29f9d6506a Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
836e0150b5 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
8e99cb4f35 More reliable stamina calculation 
by separately handling immediate one-time cost and cost over time.
 2022-05-07 18:18:20 -07:00
Kimi
43c27c4679 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
88bc5c4c54 another translation patches because i fucked it up 
i hate myself
 2022-05-07 15:49:22 -07:00
KingRainbow44
57cc111350 Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
730c993873 Merge pull request #628 from exzork/development 
PluginManager: Use the same class loader and add getPlugin method
 2022-05-07 17:58:42 -04:00
Magix
84c1cd7aa7 Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
ab5131e9fd Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00