Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 16:59:21 +00:00
Code Issues Projects Releases Wiki Activity
2,334 Commits 7 Branches 22 Tags 133 MiB
5bdfc8770b
Commit Graph

1858 Commits

Author SHA1 Message Date
hamusuke
1894296ed4
fix: home transfer (#2327) 
* fix: home transfer

* Update HomeSceneItem.java
 2023-09-02 19:04:02 -04:00
KingRainbow44
69a223949b
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:02:41 -04:00
github-actions
f8fb6732de Format code [skip actions] 2023-09-02 15:55:11 +00:00
hamusuke
ed97201473
fix: arrangement of main house is duplicated even if player changes module (#2325) 
* fix: arrangement of main house is duplicated even if player change module

* removeIf

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-02 11:52:56 -04:00
github-actions
decf494234 Format code [skip actions] 2023-09-02 05:49:00 +00:00
github-actions
9c25060c78 Format code [skip actions] 2023-09-02 05:48:12 +00:00
hamusuke
a49f37edb3
feat: finish home avatar talk (#2328) 2023-09-02 01:47:06 -04:00
hamusuke
97138d8c84
feat: implement home animals (#2329) 2023-09-02 01:46:58 -04:00
KingRainbow44
314bccb7a2
Add command description for debug 2023-09-01 20:50:37 -04:00
github-actions
c1045103ed Format code [skip actions] 2023-09-02 00:37:43 +00:00
Moistcrafter
1831d5c81f
SerializedName MonsterSpecialName (#2331) 
* SerializedName MonsterSpecialName

* uh add space back

* remove space

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-01 20:35:54 -04:00
github-actions
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
hamusuke
0db69882a3
fix: sync home avatar costume (#2326) 2023-09-01 20:31:55 -04:00
KingRainbow44
12da46b5ee
Re-order troubleshooting info 2023-09-01 20:29:25 -04:00
Magix
6fc4859f31
Merge pull request #2313 from Grasscutters/dev-4.0 
Upgrade to REL4.0.x
 2023-08-31 22:05:36 -07:00
KingRainbow44
89efa35f83
Disable LOG_MISSING_ABILITY_HANDLERS 2023-09-01 00:52:30 -04:00
KingRainbow44
e04df0526a
Run formatter & update protocol 2023-08-31 23:46:55 -04:00
KingRainbow44
541433c01b
Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0 
# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
 2023-08-31 21:06:13 -04:00
KingRainbow44
9295d79bc2
Reflections change & Start HTTP before game server 2023-08-31 20:59:38 -04:00
KingRainbow44
58b3570f27
De-obfuscate definitions & run formatter 2023-08-31 19:29:31 -04:00
KingRainbow44
d43e5ca608
Compile scripts to replace require with script content 2023-08-31 01:09:53 -04:00
KingRainbow44
67c0e82dfb
Logging changes (move levels down & add toString for some objects) 2023-08-30 23:28:54 -04:00
KingRainbow44
aad4529b0e
Run formatter & 'protogen' 2023-08-30 19:36:58 -04:00
hamusuke
e8f4949836
feat: add more home mark point (#2323) 2023-08-30 19:32:47 -04:00
KingRainbow44
1ca451559c
Add PlayerNpcTalkEvent 2023-08-29 23:54:34 -04:00
KingRainbow44
dbc45f36f0
Add PlayerSwitchAvatarEvent 2023-08-29 23:48:51 -04:00
KingRainbow44
e3f15bca47
Add PlayerLevelStatueEvent & PlayerUseSkillEvent 2023-08-29 23:35:58 -04:00
hamusuke
7049cfdb58
fix: player profile changes are not reflected cuz Java is object-oriented (#2322) 
* fix: player profile changes are not reflected.
fix: deob FriendBrief.proto

* fix: tentatively sync profile when log out

* fix: allow offline player

* Update src/main/java/emu/grasscutter/game/friends/PlayerProfile.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/game/player/Player.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/game/player/Player.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* fix: server friend

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-29 23:23:46 -04:00
hamusuke
8e4e3dd89e
fix: redundant packet 'PacketTakeAchievementRewardReq' in login req (#2321) 2023-08-29 21:12:38 -04:00
hamusuke
8563d4b574
feat: support multiplayer mode in teapot (#2317) 2023-08-29 21:12:21 -04:00
KingRainbow44
48439e7e5d
Add PlayerPropertyChangeEvent 2023-08-29 17:25:48 -04:00
hamusuke
667008ecf1
fix: sync team avatar changes (#2320) 2023-08-29 12:20:17 -04:00
hamusuke
b72f81e720
just sync it! (#2319) 2023-08-29 12:18:39 -04:00
hamusuke
666b87636a
just sync it! (#2318) 2023-08-29 12:18:07 -04:00
Thoronium
f54432a89a
Bug fixes (#2314) 
* Match resources names

* Fix loading with no skill

* Stop overriding common command alias

* Fix discord link in version check popup

* Forgot to add rotation fix

* Remove unnecessary set
 2023-08-29 12:15:19 -04:00
KingRainbow44
4f2d3f9b30
Run formatter on wish event 2023-08-28 19:34:30 -04:00
KingRainbow44
3436e0a3a8
Add PlayerFinishBattlePassMission 2023-08-28 19:34:04 -04:00
KingRainbow44
ee33fed721
Add PlayerWishEvent 2023-08-28 13:59:30 -04:00
KingRainbow44
b7855c3487
Run formatter on previous changes 2023-08-28 11:30:04 -04:00
KingRainbow44
6269f0e168
Add ExecuteCommandEvent 2023-08-28 09:31:11 -04:00
KingRainbow44
8c0032fc75
Run formatter on new events 2023-08-27 23:36:41 -04:00
KingRainbow44
0ad8eb443b
Add PlayerObtainItemEvent 2023-08-27 23:29:21 -04:00
KingRainbow44
9c8a29c864
Add PlayerObtainAvatarEvent 2023-08-27 23:27:33 -04:00
KingRainbow44
76b27df622
Add PlayerLevelItemEvent 2023-08-27 23:26:51 -04:00
KingRainbow44
314b90e936
Add PlayerLevelAvatarEvent 2023-08-27 23:26:01 -04:00
KingRainbow44
4bd0fbf657
Add PlayerCompleteAchievementEvent 2023-08-27 23:23:55 -04:00
KingRainbow44
9bb3ec8916
Change the result of call to a boolean 
Returns true if logic execution should continue, false if logic condition should terminate
 2023-08-27 23:23:42 -04:00
KingRainbow44
154ace3d7e
Run formatter on code 2023-08-27 23:23:01 -04:00
KingRainbow44
40887b17fe
Add PlayerForgeItemEvent 2023-08-27 23:22:35 -04:00
KingRainbow44
9b84deaab3
Add PlayerCompleteQuestEvent 2023-08-27 23:22:18 -04:00
KingRainbow44
bdd3cbbcd9
Add PlayerFinishDungeonEvent 2023-08-27 23:22:02 -04:00
KingRainbow44
4f34970005
Make ActionSetGlobalValue return true 2023-08-27 19:42:28 -04:00
KingRainbow44
aa3e23f5f3
Remove log for 'unimplemented' SetWeatherAreaState Lua function 2023-08-27 16:04:21 -04:00
KingRainbow44
53db5def4e
Add property for SetGlobalValue action 2023-08-27 13:37:38 -04:00
KingRainbow44
bf3e390ce6
Add debug property to log missing ability actions 2023-08-27 13:37:14 -04:00
KingRainbow44
93460ab0aa
Add hasnolocals to resource info 2023-08-27 13:36:55 -04:00
KingRainbow44
bd59da8853
Broadcast global value changes 2023-08-27 13:36:39 -04:00
KingRainbow44
01766a0303
Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0 2023-08-27 02:40:09 -04:00
KingRainbow44
1844cb43f7
Fix Lua require, Fix monster abilities & Fix ServerLuaCall 2023-08-27 02:39:56 -04:00
Nazrin
cf55a58c01
revert GetScenePointRspOuterClass.java (#2312) 2023-08-27 01:25:13 -04:00
Nazrin
92e4f9057a
Implement Quaternions (#2311) 
* Implement Quaternions

* Update BaseRoute.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-27 01:25:04 -04:00
KingRainbow44
49c1daede4
Update language files to account for troubleshoot -> info 2023-08-27 00:44:26 -04:00
KingRainbow44
82bc2f0733
Add alias troubleshoot to info 2023-08-27 00:03:03 -04:00
KingRainbow44
f660a7b8a4
Ensure sensitive information isn't shown without permission 2023-08-26 21:14:36 -04:00
KingRainbow44
621000fd4b
tamil. 2023-08-26 21:05:37 -04:00
Nazrin
fc7de04f73
fix forging (again) (#2309) 2023-08-26 21:02:51 -04:00
KingRainbow44
cc91a2dcfc
Implement diving 2023-08-26 20:59:58 -04:00
KingRainbow44
f656143038
Run the formatter & Generate protocol definitions 2023-08-26 19:51:45 -04:00
ハムスケ ハム
edb00adf61
fix: deobf field name 2023-08-26 17:59:30 -04:00
ハムスケ ハム
f20ac13914
Merge changes from hamusuke (#2) 2023-08-26 17:59:26 -04:00
KingRainbow44
396f302eac
Merge changes from hamusuke (#1) 2023-08-26 17:57:46 -04:00
ハムスケ ハム
7dd63e9816
fix: EntityTeam.java (NPE) 2023-08-26 17:54:57 -04:00
ハムスケ ハム
2309b1f469
fix: liney c3 effect 2023-08-26 17:53:40 -04:00
ハムスケ ハム
87d58d2a6f
feat: ability to register new achievements 2023-08-26 17:53:28 -04:00
Nazrin
873d190e46
Make friends by fixing the protos (#2307) 2023-08-24 20:47:58 -04:00
Carl
4b167fc938
Fix the error that the parameter regionCache of class PacketPlayerLoginRsp is null in game only mode (#2297) 2023-08-20 14:52:43 -04:00
github-actions
ec53292e00 Format code [skip actions] 2023-08-20 18:48:59 +00:00
Ceris White
2b0f2f74cb
Update RegionHandler.java (#2295) 
Who decided to regex it like that???
 2023-08-20 14:47:08 -04:00
github-actions
b8fd2e2378 Update languages [skip actions] 2023-08-20 18:46:59 +00:00
laura o3o
7d13847144
Update it-IT.json (#2296) 2023-08-20 14:46:39 -04:00
KingRainbow44
fd44933ec7
Update packet files for packet ID changes 2023-08-19 15:59:07 -04:00
KingRainbow44
55083d4672
Update packet IDs to 4.0 2023-08-19 15:58:44 -04:00
KingRainbow44
ec31289921
Properly add code switches to the region config 2023-08-19 12:42:42 -04:00
KingRainbow44
81e52c364c
Add new default avatar abilities 2023-08-19 12:42:26 -04:00
KingRainbow44
813970945b
Fix BargainRecord 2023-08-18 21:13:10 -04:00
KingRainbow44
e3738ea68e
Add codeSwitch to the custom config 2023-08-18 21:04:49 -04:00
KingRainbow44
70eb0f2b16
Merge branch 'talking' into dev-4.0 2023-08-15 20:46:38 -04:00
KingRainbow44
407c1b3a86
Protocol definition fixes 2023-08-14 23:38:07 -04:00
KingRainbow44
31b9541b66
Add unversioned protocol definitions 2023-08-14 18:57:43 -04:00
KingRainbow44
ceeaf3748a
Add new protocol definitions 2023-08-14 18:57:07 -04:00
KingRainbow44
1bcb79840c
Rename troubleshoot to info to allow for credits placement 2023-08-14 18:55:19 -04:00
KingRainbow44
8cac8d13f4
Run formatter & bump version 2023-08-14 18:53:23 -04:00
KingRainbow44
543749bc9f
Implement DebugLog ability action 2023-08-13 19:40:59 -04:00
KingRainbow44
12ac5b32d3
Implement ServerLuaCall 2023-08-13 19:12:39 -04:00
KingRainbow44
6a421336df
Implement time axis 2023-08-13 19:01:08 -04:00
KingRainbow44
e7410a0be5
Semi-functional require handler implementation 2023-08-13 18:19:42 -04:00
KingRainbow44
0175e207af
Fix errors in chasm 2023-08-13 18:01:41 -04:00
KingRainbow44
f2b81a70c8
Remove deprecated function 2023-08-13 16:22:41 -04:00
KingRainbow44
cfccb2d991
Merge remote-tracking branch 'origin/development' into development 2023-08-13 16:20:11 -04:00
KingRainbow44
e0f8c03e39
Move more logs to debug constants 2023-08-13 15:56:19 -04:00
KingRainbow44
948dd5df59
Optimize content handlers 2023-08-13 15:52:38 -04:00
KingRainbow44
597574ddda
Attempt to implement bargaining (untested) 2023-08-13 12:28:56 -04:00
KingRainbow44
40bbfd90e1
Implement group-based item giving & Add content handler for item giving 2023-08-13 00:32:02 -04:00
KingRainbow44
afc5841596
Add way to toggle certain spam logs 2023-08-12 22:16:41 -04:00
KingRainbow44
70e6d7f334
Merge branch 'development' into talking 2023-08-12 19:33:25 -04:00
KingRainbow44
10c1db2fe1
Add command for listing quests 2023-08-12 19:20:34 -04:00
Phong
bdc4b5af89
Levelup City Implementation (#2281) 
* add statue promo data

* implement levelup city feature

* fix get level city when enter game

* format code

* fix typo, remove some property in the player, add the field cityInfoData to player class
 2023-08-11 23:54:19 -04:00
Nazrin
d0dde1c9e2
Fix dungeons with no finish logic in DungeonManager.java (#2288) 2023-08-10 20:06:55 -04:00
github-actions
bbf0d4dda1 Format code [skip actions] 2023-08-07 22:04:40 +00:00
Nazrin
b9a493d424
fix quest content and condition triggers (#2283) 
* Add param3 to EVENT_GADGET_STATE_CHANGE

* Slight cleanup for DungeonManager

* Fix ContentTriggerFire

* Rework and fix talk content and conditions.

* redo item content and conditions, swap out getItemByGuid with getItemById, and make count handling consistent.

* Don't need to check if checkItem is null

* add this. to DungeonManager.java

* add this to Inventory.java

* Update src/main/java/emu/grasscutter/game/quest/QuestManager.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* add spaces to ContentCompleteAnyTalk.java

* Update src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-07 18:03:13 -04:00
github-actions
8200607a15 Format code [skip actions] 2023-08-07 04:28:56 +00:00
Nazrin
0b0dcf9b8e
Implement QUEST_EXEC_RANDOM_QUEST_VAR (#2284) 2023-08-07 00:27:13 -04:00
Thoronium
58d2650505
Fix swim stamina cost (#2287) 2023-08-07 00:25:59 -04:00
github-actions
175e7f5f09 Format code [skip actions] 2023-08-01 04:23:23 +00:00
KingRainbow44
665263d9ba
Fix account list subcommand 2023-07-31 17:26:30 -04:00
KingRainbow44
08284bc669
Add extra giving method 2023-07-31 16:03:55 -04:00
KingRainbow44
b82567d9d9
Attempt to implement item giving to NPCs (untested) 2023-07-31 15:42:52 -04:00
github-actions
a4ad781d61 Format code [skip actions] 2023-07-31 16:54:59 +00:00
Nazrin
465582b8da
Handle Dungeons with null config (#2279) 2023-07-31 12:52:42 -04:00
github-actions
4320bc7d29 Format code [skip actions] 2023-07-29 15:40:10 +00:00
Nazrin
98fbc4e512
Improve Platforms (#2275) 
* Improve Platforms

* add this.
 2023-07-29 11:38:34 -04:00
Nazrin
f3277dee9f
Fix Forging (#2278) 2023-07-29 11:37:32 -04:00
github-actions
0005fcf96f Format code [skip actions] 2023-07-23 03:19:10 +00:00
github-actions
f065b2b16f Format code [skip actions] 2023-07-23 03:18:53 +00:00
github-actions
e9d68936f6 Format code [skip actions] 2023-07-23 03:18:29 +00:00
Nazrin
47971dc931
various small bug fixes (#2270) 
* various small bug fixes

* Upgrade warning to error

* A few more state changes to match the others in this pull
 2023-07-22 23:17:59 -04:00
Nazrin
fe169398ec
Gadgets can be picked up too (#2272) 
* Gadgets can be picked up too

* put in a warning
 2023-07-22 23:17:39 -04:00
Nazrin
ddc082fc97
Everything triggers regions (#2271) 
* Everything triggers regions

* hotfix
 2023-07-22 23:17:33 -04:00
Nazrin
0b806e21cf
Fix talks that have a quest id of 4 digits or more (#2268) 2023-07-22 23:17:18 -04:00
Nazrin
49ba0e55e8
make xxGroupVariableValueByGroup the same as xxGroupVariableValue (#2266) 2023-07-22 23:17:11 -04:00
pfyy
ae2ab20b5b
add support for 3.8 teapot binout files (scene 2005, 2204) (#2265) 2023-07-22 23:17:02 -04:00
github-actions
27d495742d Format code [skip actions] 2023-07-15 03:05:16 +00:00
KingRainbow44
f17339f1b6
Send global value packet after the scene host has finished initializing the scene 2023-07-14 23:03:49 -04:00
KingRainbow44
f0775f70f3
Send packet after scene load & Directly send back entity ID to clients 2023-07-14 21:22:45 -04:00
KingRainbow44
fecf83cfa4
Revert AvatarUpgradeRsp 2023-07-14 21:09:57 -04:00
KingRainbow44
dfbe4022f3
Merge remote-tracking branch 'origin/development' into development 2023-07-14 19:47:56 -04:00
KingRainbow44
e859d87ae3
Implement SetEntityServerGlobalValueByEntityId 2023-07-14 19:46:30 -04:00
5idereal
acb3575c77
update zh-TW.json (#2260) 2023-07-14 19:37:54 -04:00
Nazrin
f725d9203d
Fix QUEST_CONTENT_LEAVE_SCENE (#2262) 2023-07-14 19:37:29 -04:00
Nazrin
d62394e35e
Remove obsolete code in ScriptLib.java (#2263) 2023-07-14 19:37:08 -04:00
Nazrin
a4d5de06d1
Fix starting wrong quest for story quests (#2264) 2023-07-14 19:36:50 -04:00
pfyy
0d71d29932
fix first entering teapot failure (#2259) 2023-07-12 22:00:55 -04:00
github-actions
d0a4da8a1f Update languages [skip actions] 2023-07-09 06:04:19 +00:00
laura o3o
d332861ed8
add italian support (italian translation fix) (#2249) 
* Updated IT Readme

* Update it-IT.json

* Update it-IT.json (2)

* fixed a couple errors while reviewing
 2023-07-09 02:03:54 -04:00
y.mi
47186a47b2
It now can bind on correct addr (#2254) 
Now Grasscutter will bind on address specified in config.json (bindAddress), instead of 0.0.0.0
 2023-07-08 12:27:12 -04:00
TotallyNotOndre
5090b17b80
Update ru-RU.json (#2247) 
ty Scaldy for help♥♥♥
 2023-07-03 23:32:15 -04:00
Xotak
5b9508d7a4
Update French translations (#2246) 2023-07-03 23:30:22 -04:00
github-actions
df7941bc1b Format code [skip actions] 2023-07-03 11:03:03 +00:00
Thoronium
9cac0953fa
Add alternate val name (#2245) 2023-07-03 07:01:50 -04:00
KingRainbow44
7cdb774b1f
Merge remote-tracking branch 'origin/development' into development 2023-07-01 01:29:40 -04:00