Commit Graph

360 Commits

Author SHA1 Message Date
Benjamin Elsdon
f7c941d4ff More Web Static Languages 2022-05-20 19:33:29 -07:00
Benjamin Elsdon
d59e14e383 Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
Няшик Няшный
b9eef26d8b Changing how banners work 2022-05-20 05:51:44 -07:00
4Benj_
e2cb56ee28 Server Log Events (#996)
* Server Log Event

* LogEventAppender Encoder
2022-05-20 05:48:20 -07:00
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
xtaodada
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
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
YukariChiba
fb93f1517c Do not add default region if there are already regions 2022-05-17 04:30:28 -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
xtaodada
003e28e3f8 Enhance the default permissions logic 2022-05-16 21:55:47 -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
muhammadeko
f1af23e8d6 Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -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
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
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
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
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
Melledy
0ffaba44ea Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
c35b2b965a Merge pull request #816 from Grasscutters/dev-quests
Implement quests
2022-05-13 05:36:30 -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
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
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
c7d5d8640c Add some usage of Inventory.payItems()
And add quantity to it
2022-05-11 21:56:53 -07:00
gentlespoon
00a248725e Feature: vehicle stamina
1. Remove references.
2. Handle vehicle stamina.
2022-05-11 17:39:45 -07:00