Commit Graph

901 Commits

Author SHA1 Message Date
ButterCookies
b2a07044e2
Set the maximum number of player on the server through the config.json (#1001)
* Show server status to three-party game launcher

* Set the maximum number of player on the server through the config.json

* modify the logical order and show the number of maxplayer to API /status/server

* Now even players who have token already cannot bypass the maxPlayer check
2022-05-20 05:47:47 -07:00
zhaodice
8819cca3e2
Fix connection bugs without removing binding address (#993)
* Fix connection bugs according to #921

Fix this for connect to game by local device or remote devices according to #921

* Fix connection bugs according to #921

same

* Update GameServer.java

* fix build

* Update GameServer.java
2022-05-19 08:35:14 -07:00
tester233
0dcf28141d Remove outdated text & update zh-CN.json 2022-05-19 08:34:58 -07:00
Melledy
c2bf663554 Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
d418d4e3e6 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
5e56b49320 Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
6a1c19ae13 Autogenerate document files 2022-05-18 23:19:13 -07:00
2bllw8
a2d5b934df Add web documentation
- '/documentation': home page with all links
- '/documentation/handbook': html version of the gm handbook
- '/documentation/gachamapping': json document with the gacha mappings
2022-05-18 15:41:19 -07:00
linebear
5042db45d7 Fix this does not look like a tar archive error when extract log file 2022-05-18 15:38:26 -07:00
tester233
f4f8104156
Fix punctuation & update zh-CN.json (#976)
* Fix punctuation & update zh-CN.json

* Fix error
2022-05-18 13:46:47 -07:00
tester233
bd6bf0e3f9 Improve text & update zh-CN.json 2022-05-18 05:48:17 -07:00
AZthemute
a306912d7b General housekeeping and clarification of en-us.json file 2022-05-17 21:11:10 -07:00
YukariChiba
138c436982 Add OAuth in AuthenticationSystem 2022-05-17 12:25:59 -07:00
muhammadeko
e54cd086f4 add CommandResponseEvent 2022-05-17 12:21:17 -07:00
Benjamin Elsdon
b0aa294c26 AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean 2022-05-17 05:30:22 -07:00
YukariChiba
fb93f1517c Do not add default region if there are already regions 2022-05-17 04:30:28 -07:00
tester233
9abe656a46 Add translation key 2022-05-17 04:24:18 -07:00
tester233
3c2b4f355b Modify usage 2022-05-17 04:24:18 -07:00
tester233
f87e459c3f Fix usage & remove outdated text 2022-05-17 04:24:18 -07:00
Benjamin Elsdon
aca3795425 Change BANNED_PACKETS to HashSet instaed of List 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
a1e095bba7 Fix "Attempt to get java.util.List field 'PacketOpcodes.BANNED_PACKETS' with illegal data type conversion to int" 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
c33ac713d8 Permanent fix for version.json stuff (causes 4206) 2022-05-17 04:11:50 -07:00
4Benj_
ead0df336e
"Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927)
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
2022-05-17 03:00:52 -07:00
003e28e3f8 Enhance the default permissions logic 2022-05-16 21:55:47 -07:00
RDsatan
67380d6f14 fixed 2022-05-16 21:53:16 -07:00
RDsatan
8aaf3c795d Optimize the join and remove commands to team 2022-05-16 21:53:16 -07:00
muhammadeko
eeb7c47cb2 add config to enable/disable console 2022-05-16 17:57:14 -07:00
Magix
7fba6fefc3
Merge pull request #928 from 6ixfalls/dispatch-fix
Fix "/" Route
2022-05-16 12:56:13 -04:00
Elapse
7abe30c33b update opcodes, correct op names, and update relative codes 2022-05-16 06:20:34 -07:00
line-bear
58df221c6d
Remove the extra slash while loading resources. (#893)
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
2022-05-15 23:32:03 -07:00
6ixfalls
f08891a73c
Fix "/" Route 2022-05-15 09:41:10 -07:00
Melledy
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
AnimeGitB
2564fefe02 Fix logic error in remove command 2022-05-15 01:17:26 -07:00
AnimeGitB
9380e9cda4 Fix targeting on Join and Remove commands 2022-05-15 01:17:26 -07:00
muhammadeko
f1af23e8d6 Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
lsCoding666
722d53c9c2
fix join command and remove command bug and update docs (#904)
* 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

* fix(command):fix remove command a stupid bug.Loop delete element bug.

* fix(command):fix join command. When adding avatars, repeat avatars skip and non repeat avatars join.

* fix(language):fix join command remove command translate

* fix(ReadMe):update README.md join and remove command.
2022-05-14 23:27:23 -07:00
muhammadeko
cde76e10b6 fix permission command 2022-05-14 21:06:57 -07:00
Hotaru
213d2883a9 Move gacha files to separate directory and refactor file serving 2022-05-14 20:07:08 -07:00
HotaruYS
0231f26be0
Properly handle static assets for announcements (#891) 2022-05-14 20:05:19 -07:00
tiantian520
f1b12ccf63
Add a new command "nostamina" (#877)
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
2022-05-14 16:06:48 -07:00
KingRainbow44
b04b8eef8e
Update routes 2022-05-14 12:41:49 -04:00
KingRainbow44
6c419f2d20
External authentication 2022-05-14 12:39:21 -04:00
KingRainbow44
457d00211c
Implement PR #657 2022-05-14 12:21:55 -04:00
KingRainbow44
0405cb6718
JavaDoc Fix 2022-05-14 12:13:41 -04:00
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
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