Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-02 15:30:49 +00:00
Code Issues Projects Releases Wiki Activity
1,198 Commits 7 Branches 22 Tags 136 MiB
d64685b9ec
Commit Graph

901 Commits

Author SHA1 Message Date
muhammadeko
f2e9845421 remove log 2022-05-13 22:12:07 -07:00
muhammadeko
c0d79aa75b fix logic and some cleaning 2022-05-13 22:12:07 -07:00
muhammadeko
c7849c0462 add negative permission check 2022-05-13 22:12:07 -07:00
KingRainbow44
87bfc25ab8
Refactor dispatch (now called HTTP) server (pt. 2) 2022-05-13 23:22:30 -04:00
ShiroSaki
57a9cae1a4 add support for announcement page 2022-05-13 16:48:37 -07:00
Melledy
ab5e4fcdb4 Use scene types instead of hardcoding scene ids for checking enter reason 2022-05-13 16:35:03 -07:00
tester233
b78e397056 Improve text 2022-05-13 16:33:18 -07:00
ShigemoriHakura
44456e2868
Add support for codexQuests (#870) 2022-05-13 16:33:07 -07:00
Yazawazi
4f3112133c fix(serenitea pot): teleport & read born pos from lua 2022-05-13 16:32:52 -07:00
Yazawazi
295f15eece feature(serenitea pot): Implementation of enter 
Ugly hard code
 2022-05-13 16:32:52 -07:00
Yazawazi
27e817a6ce feature(serenitea pot): Implementation of the entry function 
It's being perfected, so don't worry. (probably)
 2022-05-13 16:32:52 -07:00
KingRainbow44
e08a9c0d70
Refactor dispatch (now called HTTP) server (pt. 1) 2022-05-13 11:39:40 -04:00
KingRainbow44
3425e0f1fc
Add JSON-related methods to Utils.java 2022-05-13 11:38:54 -04:00
KingRainbow44
f16c3fb8bc
Add new authentication system 2022-05-13 11:38:17 -04:00
Melledy
0ffaba44ea Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
00ffbea451 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
c35b2b965a
Merge pull request #816 from Grasscutters/dev-quests 
Implement quests
 2022-05-13 05:36:30 -07:00
Kimi
f00c5d9f29 Traditional Chinese | Translation Patches 2022-05-13 05:35:21 -07:00
kyoko12
5b9548c63a Don't silently delete config.json if there is an error. 2022-05-13 05:34:59 -07:00
AnimeGitB
23d1553aca Fix gachadetails 2022-05-13 05:34:14 -07:00
AnimeGitB
a89377d558 Updated cost logic and default weights 2022-05-13 05:34:14 -07:00
AnimeGitB
5f9ac00017 Remove debug log from gacha 2022-05-13 05:34:14 -07:00
AnimeGitB
cda841dd62 Custom costs for different gacha pulls 2022-05-13 05:34:14 -07:00
AnimeGitB
3f3ab11ef6 Gacha rework 
Add fallback stripping and C6 stripping
Converting banner definitions from pity vars to lerp arrays
Properly implement rates and pool smoothing
Also move reusable functions to Utils
 2022-05-13 05:34:14 -07:00
Melledy
f53b533dfb Add one more quest trigger 2022-05-13 05:33:43 -07:00
Melledy
608c379afe Switch to using quest excels 2022-05-13 03:12:25 -07:00
Akka
6c6e206a88 fix: LEAK: ByteBuf.release() was not called 2022-05-13 00:21:26 -07:00
Hotaru
32a899ded3 Fix UTF-8 encoding in announcements 2022-05-12 17:54:50 -07:00
tester233
91d36395fb Improve text 2022-05-12 14:54:53 -07:00
tester233
f850c3f6f0 Improve text 2022-05-12 14:54:53 -07:00
tester233
70d6e3b9dc Improve text 2022-05-12 14:54:53 -07:00
Akka
4f373e4016 add docs for tower 2022-05-12 14:54:44 -07:00
Hotaru
430e3d6d8b Build region_list and cur_region dynamically 2022-05-12 14:54:33 -07:00
gentlespoon
0f8b2cb192 Slowly recover HP near statue 2022-05-12 02:32:39 -07:00
gentlespoon
b14affd6ee Clean up map mark related code 
1. Remove unnecessary manager from player collection.
2. Clean up MarkMapReq handler.
3. Remove redundant checks.
 2022-05-12 02:32:11 -07:00
Melledy
0df4a076d7 Merge branch 'development' into dev-quests 2022-05-12 02:31:28 -07:00
Melledy
d8c30d5680 Implement basic quest condition handling 
Quests that require talking to npcs now work.
 2022-05-12 02:30:34 -07:00
Yazawazi
401b80060e feature(widget): simple implementation of widget 
Simple implementation of a part of the gadget support, very rough, hard code variables, I am very sorry for that. It can now handle part of the gadget rig. More features and better support await PRs from others. if no one else does, I'll give it a try.
 2022-05-12 01:23:16 -07:00
AnimeGitB
e2817c696a Fix immutable lists 2022-05-11 21:56:53 -07:00
AnimeGitB
74783cfecd More usage of payItems 2022-05-11 21:56:53 -07:00
AnimeGitB
c7d5d8640c Add some usage of Inventory.payItems() 
And add quantity to it
 2022-05-11 21:56:53 -07:00
AnimeGitB
010455548f Add Inventory.payItems() method 2022-05-11 21:56:53 -07:00
gentlespoon
53797dfd3b Fix logging level 2022-05-11 17:39:45 -07:00
gentlespoon
00a248725e Feature: vehicle stamina 
1. Remove references.
2. Handle vehicle stamina.
 2022-05-11 17:39:45 -07:00
gentlespoon
2fa2746246 Update StaminaManager 
1. Update function signatures to prepare for vehicle stamina.
3. Remove hard-coded skills.
2. Wind resonance -15% stamina cost.
4. Climb talent cost reduction.
5. Swim talent cost reduction.
6. Diluc will now consume stamina at full price if talent not activated.
7. Sayu's windwheel no longer consumes stamina.
 2022-05-11 17:39:45 -07:00
Melledy
8d56b15a17 Add quest ids to handbook 2022-05-11 12:47:16 -07:00
Melledy
364dc3bab9 Merge branch 'development' into dev-quests 2022-05-11 12:39:28 -07:00
ImmuState
5ff8a4514e Insert language setting based on the player's account. 2022-05-11 12:02:45 -07:00
ImmuState
1d4e0e09d0 Add gacha details page. 2022-05-11 12:02:45 -07:00
mingjun97
6921ea77a9 Revise version format 2022-05-11 11:52:56 -07:00
mingjun97
edc75b2632 Display version info at console starting 2022-05-11 11:52:56 -07:00
mingjun97
9bdb1c762c Introduce -version argument to display version 2022-05-11 11:52:56 -07:00
tester233
07ad24262e Improve text 2022-05-11 11:51:24 -07:00
tester233
39796099c8 Improve text & remove extra punctuation 2022-05-11 11:51:24 -07:00
Benjamin Elsdon
1da384091a Add verifyUser to AuthenticationHandler 2022-05-11 11:51:11 -07:00
Secretboy-SMR
1f7f13ffe1 It will use the english as default rather than tell you the value is not exist if there's no translation for currently language 2022-05-11 11:50:53 -07:00
KingRainbow44
68e6de8ebb
Add plugin loggers 2022-05-11 11:46:36 -04:00
KingRainbow44
89bd4b9aeb
Refactor config database settings 2022-05-11 11:38:30 -04:00
ayy lmao
3f1128356e Fix InRouting on dispatch server 2022-05-11 17:35:52 +03:00
Melledy
26575561d6 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
9351127fe1 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
285405cee4 Implement quests 2022-05-11 03:56:40 -07:00
Secretboy-SMR
98066f5015 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
ffd0212f94 Show server status to three-party game launcher 2022-05-11 02:45:21 -07:00
Secretboy-SMR
6be39eafd2 fixed language not found prompt 2022-05-11 01:18:10 -07:00
mingjun97
2cd1d32fbe Bug fixes. 
* Fix default port for the game server
* Fix the returning region info
 2022-05-11 01:17:51 -07:00
gentlespoon
d575b79a0c Fix incorrect ascension level in givechar command 2022-05-11 01:17:10 -07:00
Magix
b646e38bd6
Merge pull request #802 from Grasscutters/better-config 
Implement a better config structure
 2022-05-11 01:23:43 -04:00
KingRainbow44
5c0e193a0a
Fix ClassDefNotFound & NullPointerException errors 2022-05-11 01:23:18 -04:00
KingRainbow44
145546c26c
Remove config file 2022-05-11 00:48:40 -04:00
KingRainbow44
d5cc615948
Remove old config & migrate legacy configs 2022-05-11 00:46:49 -04:00
KingRainbow44
6894ab8aae
Convert to the far superior config system 2022-05-11 00:30:07 -04:00
KingRainbow44
5ad58a4566
Create new config class 2022-05-10 22:49:25 -04:00
gentlespoon
ef9d63f1dd Claymore charged attack stamina cost 2022-05-10 17:25:18 -07:00
Magix
69984d79d6
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
a25eb631c4
my poor, poor, language system (Formatting refactor) 2022-05-10 20:00:47 -04:00
Secretboy-SMR
2969abc20e Fix language switching prompt and save 2022-05-10 13:36:57 -07:00
tester233
4efdc767ae Improve text 2022-05-10 06:36:19 -07:00
Secretboy
0a95b7fe2e
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
b133825dd4
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
fbffb8d277 Reset first tick on new skill 2022-05-10 05:21:29 -07:00
gentlespoon
812435b333 Talent moving stamina cost 2022-05-10 05:21:29 -07:00
gentlespoon
f1aa930ef5 Add UTF8 charset in dispatch server HTML template. 2022-05-10 05:21:21 -07:00
Kinesis
55b91ad150 fixed KillCharacter help command description typo case 2022-05-10 05:21:13 -07:00
tester233
c4078a505a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
bd5e7c68fd Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
d7b3ee10ba Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
bf3d6b3c64 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
32154c2a55 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
8074f47c6a Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00
Melledy
fd3e59f332 Remove previous fix for falling to death in godmode 
This fix is more efficient
 2022-05-10 01:50:04 -07:00
gentlespoon
5a6512c5cf No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
cba16f2868 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
06be99fa15
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
f4f2cf6a96 Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
e3daf684a5 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
5bf22ce8a2 Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
b7ed76c79b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
ba180d8bf5
Merge pull request #746 from Akka0/tower 
fix the Monster spawn between stage challenges
 2022-05-09 12:50:33 -07:00
筱傑
32232ff6f9 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
0764b6c2fa little fix 2022-05-10 00:14:50 +08:00
Akka
3e65ce63f5 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
5a62a69c73 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
a63d87b0bc Update translation keys to fix issues 648 677 
fix issues 648 677
 2022-05-09 04:18:12 -07:00
Mateoust
e6cf27056f Updating language files fixed the issue 648 677 
fix issue 648 677
 2022-05-09 04:18:12 -07:00
AnimeGitB
c2d41ca0cf Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
56635f2ecc Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
ec7a66861a Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
d332e77b76 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
3cf062c98c Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
bf8f4fba52 Fix #719 2022-05-09 17:01:08 +08:00
Melledy
e28d6a1441
Merge pull request #718 from Akka0/tower 
Support Team Toggle in Tower & Refactor MonsterTide
 2022-05-09 01:15:02 -07:00
AnimeGitB
993fe3131e Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
d03f1ca5d1 Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
e23b72f298 Add permissionTargeted to applicable commands 
Change target perm from target.perm to x.perm.others
 2022-05-09 01:12:47 -07:00
Akka
e24ad0c732 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
d00465125d Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
f0ff323b7b Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
8c7a46e8ef -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
2a12ed5694 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
e8e48600ae Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
14bf96e907 Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
63eed41dd5 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
392ce26e32 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
1234a88c67 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
HotaruYS
85821eb16b
Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
6ce96d1c26 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
916b7412fd Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
e95431d3e7 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
b9fbc4975d Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
1f86e7bb17 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
6d1ef0d841 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
727d92a6bc Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Michaellan
342cf33661 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
55b692561f
Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
ccdfd15bb8 Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
eab964de5c Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
9020ee5b2a
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
8a52a041bd Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
b3317bd6d7 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
f49862145c add Command description 2022-05-08 01:47:26 -07:00
方块君
05e1e5502c Add command description multilingual 2022-05-08 01:47:26 -07:00
芊枫
3dcf8bf46a Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
57236f2197 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
401cb609ae Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
8b198d6dbe fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
8ddd7b125d Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
2416dd66e5
Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
a269ff9563
Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
8739277970 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00