Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 17:17:43 +00:00
Code Issues Projects Releases Wiki Activity
1,153 Commits 7 Branches 22 Tags 133 MiB
f876470369
Commit Graph

1153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melledy
f876470369 Fix dataloader not getting path correctly 2022-05-19 03:00:59 -07:00
Melledy
29941aa8d0 Add area_id to SceneObject 2022-05-19 02:28:46 -07:00
Melledy
5f8cc47e87 Fix bad casting exceptions with scene garbages objects 2022-05-19 02:28:25 -07:00
Melledy
3feb98f08b Fix issue with groups that dont have any suites 2022-05-19 02:19:18 -07:00
Melledy
4ef3080c62 Move gadget/monster creation events to after they are spawned in scene 2022-05-19 00:36:38 -07:00
Melledy
89454726ac Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
Akka
8faf8decec optimized the Lua func binding so that the script will not eval again 2022-05-18 20:51:39 -07:00
Melledy
1fef837a97 Move chest rewards to new data format 2022-05-18 15:54:55 -07:00
Melledy
3902a5d744 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -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
Melledy
2e24d77bc2 Cleanup and remove business_type filter 2022-05-18 05:33:00 -07:00
Melledy
9902ba381a Only load groups that have a business type of 0 2022-05-18 05:10:45 -07:00
Melledy
f53dda0335 Fix errors caused by merge + Refactor chests into GadgetChest 2022-05-18 02:36:50 -07:00
Melledy
73a88b2da2 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into dev-world-scripts 2022-05-18 02:24:00 -07:00
Melledy
17a273387e Implement local specialty spawning 2022-05-18 02:21:34 -07:00
Akka
7c02e6c912 Support Open Chest 2022-05-18 01:07:06 -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
DancingSnow
6180d15c17 Cache gradle files 2022-05-17 04:23:49 -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
Melledy
e43946e44c Fixed issue with scene groups after merge 2022-05-16 22:09:10 -07:00
Melledy
3f27874765 Merge branch 'development' into dev-world-scripts 2022-05-16 22:08:28 -07:00
xtaodada
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
Akka
c103841a03 optimized the lua serializer 2022-05-16 21:30:04 -07:00
muhammadeko
eeb7c47cb2 add config to enable/disable console 2022-05-16 17:57:14 -07:00
TangHuLuTaiTian
a63ed21213 Some clients Code 4206 Error 2022-05-16 17:49:46 -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
Akka
035b0ff8bd fix the dynamic group loading 2022-05-15 12:40:36 -07:00
6ixfalls
f08891a73c
Fix "/" Route 2022-05-15 09:41:10 -07:00
Akka
8a7077dc04
Enable script in big world (#884) 
* add docs for tower

* fix: LEAK: ByteBuf.release() was not called

* enableScriptInBigWorld

* not print log when loaded scripts from cache

* revert the change of server tick

* revert the change of server tick

* fix

* optimize the performance: lazy load & cache

* fix the refresh group

* fix NPE

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-15 04:19:24 -07:00
Melledy
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
Melledy
dd63b29003 Add new gacha mappings and lombok generated files to gitignore 2022-05-15 03:48:31 -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