Commit Graph

2317 Commits

Author SHA1 Message Date
8db1f597ce Format code [skip actions] 2023-09-02 23:51:35 +00:00
c08ab19d84 Various removals of '&' for Javadoc to be happy v1.7.1 2023-09-02 19:49:38 -04:00
34589d0128 Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:48:39 -04:00
70ee3ed1a6 Remove protocol definitions from Javadoc generation 2023-09-02 19:31:58 -04:00
88d7be86da Format code [skip actions] 2023-09-02 23:06:00 +00:00
d6abb2288d Bump version to v1.7.1 2023-09-02 19:05:34 -04:00
416ef56101 Bump down the plugin API version
nothing major was *removed*, meaning all existing v2 plugins should still work
2023-09-02 19:05:30 -04:00
ed0e89074b Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:04:09 -04:00
1894296ed4 fix: home transfer (#2327)
* fix: home transfer

* Update HomeSceneItem.java
2023-09-02 19:04:02 -04:00
69a223949b Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:02:41 -04:00
f8fb6732de Format code [skip actions] 2023-09-02 15:55:11 +00:00
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
decf494234 Format code [skip actions] 2023-09-02 05:49:00 +00:00
9c25060c78 Format code [skip actions] 2023-09-02 05:48:12 +00:00
a49f37edb3 feat: finish home avatar talk (#2328) 2023-09-02 01:47:06 -04:00
97138d8c84 feat: implement home animals (#2329) 2023-09-02 01:46:58 -04:00
314bccb7a2 Add command description for debug 2023-09-01 20:50:37 -04:00
c1045103ed Format code [skip actions] 2023-09-02 00:37:43 +00:00
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
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
0db69882a3 fix: sync home avatar costume (#2326) 2023-09-01 20:31:55 -04:00
12da46b5ee Re-order troubleshooting info 2023-09-01 20:29:25 -04:00
6fc4859f31 Merge pull request #2313 from Grasscutters/dev-4.0
Upgrade to REL4.0.x
v1.7.0
2023-08-31 22:05:36 -07:00
89efa35f83 Disable LOG_MISSING_ABILITY_HANDLERS 2023-09-01 00:52:30 -04:00
e04df0526a Run formatter & update protocol 2023-08-31 23:46:55 -04:00
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
9295d79bc2 Reflections change & Start HTTP before game server 2023-08-31 20:59:38 -04:00
58b3570f27 De-obfuscate definitions & run formatter 2023-08-31 19:29:31 -04:00
d43e5ca608 Compile scripts to replace require with script content 2023-08-31 01:09:53 -04:00
67c0e82dfb Logging changes (move levels down & add toString for some objects) 2023-08-30 23:28:54 -04:00
aad4529b0e Run formatter & 'protogen' 2023-08-30 19:36:58 -04:00
e8f4949836 feat: add more home mark point (#2323) 2023-08-30 19:32:47 -04:00
1ca451559c Add PlayerNpcTalkEvent 2023-08-29 23:54:34 -04:00
dbc45f36f0 Add PlayerSwitchAvatarEvent 2023-08-29 23:48:51 -04:00
e3f15bca47 Add PlayerLevelStatueEvent & PlayerUseSkillEvent 2023-08-29 23:35:58 -04:00
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
8e4e3dd89e fix: redundant packet 'PacketTakeAchievementRewardReq' in login req (#2321) 2023-08-29 21:12:38 -04:00
8563d4b574 feat: support multiplayer mode in teapot (#2317) 2023-08-29 21:12:21 -04:00
48439e7e5d Add PlayerPropertyChangeEvent 2023-08-29 17:25:48 -04:00
667008ecf1 fix: sync team avatar changes (#2320) 2023-08-29 12:20:17 -04:00
b72f81e720 just sync it! (#2319) 2023-08-29 12:18:39 -04:00
666b87636a just sync it! (#2318) 2023-08-29 12:18:07 -04:00
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
4f2d3f9b30 Run formatter on wish event 2023-08-28 19:34:30 -04:00
3436e0a3a8 Add PlayerFinishBattlePassMission 2023-08-28 19:34:04 -04:00
ee33fed721 Add PlayerWishEvent 2023-08-28 13:59:30 -04:00
b7855c3487 Run formatter on previous changes 2023-08-28 11:30:04 -04:00
6269f0e168 Add ExecuteCommandEvent 2023-08-28 09:31:11 -04:00
8c0032fc75 Run formatter on new events 2023-08-27 23:36:41 -04:00
0ad8eb443b Add PlayerObtainItemEvent 2023-08-27 23:29:21 -04:00