Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-05 01:45:29 +00:00
Code Issues Projects Releases Wiki Activity
784 Commits 7 Branches 22 Tags 136 MiB
3d52964112
Commit Graph

537 Commits

Author SHA1 Message Date
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
eac82f3c01 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
da3eb3d26c implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
fb547c17ca Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
8b8777e932 Fix crash when login 
* Prevent email to be `null` to avoid crash in certain client setup.
 2022-04-30 21:43:46 -07:00
Melledy
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
e898384532 QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
a044448af7 Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
80659f27a8 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
55793867d3 Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
a62520f922 Merge pull request #381 from Coooookies/development 
Show the player's UID with the `/list` command
 2022-04-30 16:16:18 -04:00
Magix
8ce79ed3ca Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
f4de4a6aeb Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
86b8f4549f Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
b5c277234c Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
63d41fd79e Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
f73a713fac Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
ba97dfe7d9 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
28025a8198 Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
c0b7859f93 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
eac9c04e4e Give Artifact: Fix error & Rename alias (#370) 
* Give Artifact: Fix error & Rename alias

* Update README.md
 2022-04-30 13:19:22 +02:00
Aru
d6fa05915f Monsters should drop items in world (#373) 
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
 2022-04-30 13:18:09 +02:00
筱傑
7b991d7b4e Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
fb991d845e Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
23800745e2 Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
eef216aea8 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
286ab545e9 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
7e377dff59 Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
1ed46df6e8 Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
3f76ac4cac Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
f8f4d89cd0 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b8a20e03 Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
d8e458cd33 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
8a9dab7d74 Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -07:00
KingRainbow44
4db1724d06 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
lilmayofuksu
59ff79e23a Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
7e6b20de1a Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
79165aa402 Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
7fdf74986c Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
48aea3f5e4 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
d0ccc48642 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9892cd8480 Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00
真心
2d04758f1c Add GiveWeaponCommand 2022-04-29 15:20:28 +02:00
xtaodada
eaed1aa038 Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
yangjiahao
e1c0b4a955 改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。 2022-04-29 13:07:30 +02:00
memetrollsXD
352801b8a3 Merge pull request #344 from BaiSugar/development 
Command giveall to remove useless items
 2022-04-29 13:04:25 +02:00
LDA
c67e324a2e Fix sitting in chairs 2022-04-29 12:59:50 +02:00
xtaodada
62f0be4966 Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
memetrollsXD
2f39aff4a6 Merge pull request #355 from Grasscutters/dungeon-scripts 
Implemented Dungeon Support
 2022-04-29 12:58:01 +02:00
Melledy
6d98743025 Prevent console error spam when attacking gadgets 2022-04-29 03:33:14 -07:00
Melledy
d877d7eebc Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
cb15a5dec9 Deregister scenes if no one is in them instead of deregistering when no entities are in them 2022-04-29 03:09:17 -07:00
Melledy
ffc1f801e6 Implement spawning monsters by suite 2022-04-29 03:06:33 -07:00
xtaodada
0136425628 Support custom server avatar 2022-04-29 18:04:20 +08:00
xtaodada
74ad63573a Support Teleport from console 2022-04-29 17:53:42 +08:00
Melledy
ae3d9a4dc1 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
muhammadeko
789e5f57b8 skip loading module-info.class 2022-04-29 02:32:35 -07:00
Melledy
1a5d4cf466 Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
3af5d20473 Prevent weird crashing if there was an error loading scripts 2022-04-29 01:15:40 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
d690590ecf Implement AddExtraGroupSuite 2022-04-29 00:52:40 -07:00
Melledy
72e9a21ce3 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
8ab2b446cd Clean script events 2022-04-29 00:00:23 -07:00
BaiSugar
1bd8d871bb remove useless items 2022-04-29 14:18:32 +08:00
BaiSugar
76098cdb71 remove useless items 2022-04-29 14:13:09 +08:00
Melledy
30886da0ad Fix compile error caused by merge 2022-04-28 23:09:07 -07:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
KingRainbow44
d359e5111a Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
d701613831 Formatting changes 2022-04-28 22:21:30 -04:00
KingRainbow44
e666dede7e Move events (imports) 2022-04-28 22:13:19 -04:00
KingRainbow44
68cc386baa Move events 2022-04-28 22:12:57 -04:00
KingRainbow44
9d9c6566ed Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
dc26f9e232 Add plugin data folders 2022-04-28 22:01:40 -04:00
KingRainbow44
91a2a55ed9 Bug fixes & class updates 2022-04-28 21:54:51 -04:00
KingRainbow44
694b5c1548 Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
fcb4894387 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
Kengxxiao
027bd28afb Add command /coop and /tpall 2022-04-28 21:23:20 +02:00
ayy lmao
0c02ce9f63 Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp 
Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class
 2022-04-28 21:21:08 +02:00
omg-xtao
31b0dd30e2 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
9133742eb0 fix companionship exp 
my IDEA lint is not happy on my change
 2022-04-28 06:50:37 -07:00
Kengxxiao
7bacd8ab70 do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
ed98ab152d fix exp drop issue 2022-04-28 06:50:37 -07:00
BaiSugar
a5601e8409 Update the command format of the usage (including source code) 2022-04-28 13:47:32 +02:00
Melledy
9d75c25085 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
d3925e8c6e Merge pull request #318 from Yazawazi/development 
Implementing the `Player Show Avatars`
 2022-04-27 15:50:53 -07:00
memetrollsXD
96dbc2fbfd God damn forgot I was in java for a sec 2022-04-27 15:42:25 -07:00
memetrollsXD
b80b8aedd9 Remove default permissions from account command 2022-04-27 15:42:25 -07:00
memetrollsXD
eaf2982ebc Apply to account command 2022-04-27 15:42:25 -07:00
memetrollsXD
0c665d940e Add default permissions 2022-04-27 15:42:25 -07:00
Yazawazi
0cbfcddae4 Should be OK 2022-04-28 06:40:25 +08:00