Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-03 19:14:28 +00:00
Code Issues Projects Releases Wiki Activity
1,123 Commits 7 Branches 22 Tags 136 MiB
94997276db
Commit Graph

304 Commits

Author SHA1 Message Date
Akka
f683b222fc Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
93b3265d72 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
833ea1b791 Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
3d3f36cf56 Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
c0b1ec1b9e Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
gentlespoon
bafde8693d Fixes #529: fixed stamina abnormal. added fall to death. 
Stamina is still WIP.
- Currently stamina consumption is not affected by the use of foods, talents, or the environment.
- Charged attacks do no require stamina yet.
- Will be fixed tomorrow.
 2022-05-05 15:37:15 -07:00
gentlespoon
5c275c2e3c SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
5aba7da7ef Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
82ec63c4e4 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
Akka
48d1e026ef Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
Angda Song
06983e9e84 Implement map marking features 
Teleport still exists on fish hook mark.
Added mapMark-related protos.
Map marking data is stored in players collection.
 2022-05-04 10:01:46 -07:00
EtherealAO
5e0e65123e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
3d52964112 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
787f3fd45e Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
Melledy
ae31e4fd98 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
xtaodada
86e6eef4e2 Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
Melledy
a93d7c579f Fix extra skill charges being removed if you teleport 
Close #404
 2022-05-03 02:27:18 -07:00
Melledy
7395a268ef Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
0421d912fd Enable plugins to hook server message response 
* Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.
 2022-05-03 02:16:44 -07:00
xtaodada
b253e779a2 Implement food heal function 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-02 22:02:11 -07:00
dogdie233
16f77ee520 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
xtaodada
7b591a2da0 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Melledy
fba26d2da9 Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
19396a63c7 Move player mail to MailHandler class 
This is so we dont have to save the entire player to the db every time we send mail
 2022-05-02 02:01:01 -07:00
KingRainbow44
afa8fb7a51 Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
98122f3c55 Implement gacha history record subsystem 
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
 2022-05-01 13:47:17 -07:00
4Benj_
0d262e2d07 Cleaned up dispatch iOS fixes (#396) 
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
 2022-04-30 23:31:39 -07:00
KingRainbow44
72b5ec210c Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04: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
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
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07: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
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
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
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
赤座あかり
79165aa402 Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +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
ae3d9a4dc1 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
Melledy
1a5d4cf466 Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -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
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
9d9c6566ed Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
91a2a55ed9 Bug fixes & class updates 2022-04-28 21:54:51 -04: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
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
Yazawazi
0cbfcddae4 Should be OK 2022-04-28 06:40:25 +08:00
Yazawazi
02ce62422f kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
982cbbe5d2 no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
e55160dad6 Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
9092c9b3f9 import 2022-04-28 03:31:36 +08:00
Yazawazi
f16d33b413 Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
f6db39926d Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
8bf17a8bdc Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
1586bab5d7 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Benjamin Elsdon
b9f7c657ac Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
49854e4514 utils 2022-04-27 06:15:59 +08:00
Yazawazi
748e64a60c Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
addfb5eb5d [BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Benjamin Elsdon
3db1a86609 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
e27bdd9bb6 Add more events 2022-04-26 02:07:00 -04:00
Benjamin Elsdon
a5677a8e34 Improvements and send all mail fix 
Mail ID no longer exists and is handled by it's position in the mail array
 2022-04-26 11:57:55 +08:00
Melledy
614477181f Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
1c691748f5 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
f28f21b061 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Benjamin Elsdon
c68c75e8ce Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08:00
Benjamin Elsdon
3f11cc41b2 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
b29bcb553a Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
67b4c274ec Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
9bf94f9539 Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
a548fe6c52 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
29a3e64db0 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
69779a0321 Added database support for mail 
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
 2022-04-25 16:22:12 +08:00
Asnxthaony
480374fb39 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
4e5d72a99a sanity check 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
721d8b7223 Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
785effe8da Receiving items in mail 2022-04-25 13:51:19 +08:00
Benjamin Elsdon
94a75cf903 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
Benjamin Elsdon
f556bff333 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
Yazawazi
8d8866aa63 Fix fetter system 2022-04-24 15:02:31 +08:00
Yazawazi
56a1ab64ab Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Melledy
7a4de2f0d6 Merge pull request #128 from memetrollsXD/development 
Use count for level for equips (dev branch)
 2022-04-23 15:15:22 -07:00
memetrollsXD
fd1890b072 Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
Yazawazi
3baef42aac Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
9e7c9f4670 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
cb03b654bc Added database support for mail 
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
 2022-04-23 23:07:18 +08:00
Yazawazi
3bc249f042 Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
042bdc2ff2 Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Jaida Wu
cd08c52b35 Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Yazawazi
b11009f724 Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
716380a078 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
Yazawazi
7ccecda07c AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
a52eaf9bbc Use count for level for equips 2022-04-22 23:19:58 +02:00
Yazawazi
eb70904660 setfetterlevel command 2022-04-22 23:46:24 +08:00
Yazawazi
159b10af72 AvatarFetterLevel 2022-04-22 22:27:40 +08:00
fumbling
06101f1b9c Morphia call fixes; add @Entity to more classes 
1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo.

2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.
 2022-04-21 22:19:47 -04:00
Yazawazi
376c668dd9 no more NullPointerException pls 2022-04-22 08:30:02 +08:00
Yazawazi
2350f0ebe2 ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
044c2a3086 typo 2022-04-22 07:42:17 +08:00
Yazawazi
eedab79253 fetter try 2022-04-22 07:37:25 +08:00
Melledy
16318b3793 Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
e10bad5b17 Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
Melledy
4431469334 Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Yazawazi
069cb1c6d3 Teleport Small Fix 2022-04-22 02:23:02 +08:00
yarik0chka
0480f10a1a Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
1500d2e885 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Melledy
9cebd7be9a Merge pull request #69 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:09:12 -07:00