Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 12:36:06 +00:00
Code Issues Projects Releases Wiki Activity
1,292 Commits 7 Branches 22 Tags 133 MiB
94c940401b
Commit Graph

1292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KingRainbow44
c8c823b515
Fix errors 2022-05-14 12:10:43 -04:00
KingRainbow44
5c6fe7bb04
Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
Melledy
46f16c6759 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00
lsCoding666
afc2c8bbf2
new command join and remove to force join or remove avatars into your current team (#549) 
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
 2022-05-14 06:28:02 -07:00
zrll_
c3ff2b81ec Fix connot execute quest command in console 2022-05-14 05:28:57 -07:00
luluxiaoyu
383dfda131 Update zh-TW.json 2022-05-13 22:12:14 -07:00
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
KingRainbow44
5d557e6525
Update project to 1.1.2-dev 2022-05-13 11:37:49 -04:00
KingRainbow44
f1a64d07cf
Add lombok 2022-05-13 11:37: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
e0b84e2751 Fix broken time formatting on gacha records 2022-05-12 18:46:21 -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
Hotaru
c1749ae093 Allow to override final jar filename using project property 2022-05-12 14:54:27 -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