Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 16:29:22 +00:00
Code Issues Projects Releases Wiki Activity
816 Commits 7 Branches 22 Tags 133 MiB
414fad9079
Commit Graph

199 Commits

Author SHA1 Message Date
Melledy
c1e69ce343 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
7e4021889c
Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
f37ab46139
Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
e2d6e695dc
Bug fixes & class updates 2022-04-28 21:54:51 -04:00
Kengxxiao
0dd4bb6082 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
e85252fb14 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
39d2380754 official shop support 2022-04-28 13:30:50 -07:00
ayy lmao
47b0ee2883 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
f9cf8f4895 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
17addc1522 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
f0df78a81a fix companionship exp 
my IDEA lint is not happy on my change
 2022-04-28 06:50:37 -07:00
Kengxxiao
b37c5d89eb do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
bb645671f2 fix exp drop issue 2022-04-28 06:50:37 -07:00
Yazawazi
c2a159be13
Should be OK 2022-04-28 06:40:25 +08:00
Yazawazi
ba95637dd3
kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
a4cbf1a58e
no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
97086d7baa
Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
80aaa0d856
import 2022-04-28 03:31:36 +08:00
Yazawazi
3c3c884fc1
Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
fef0f2aff7 Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
e34ab885a3 Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
99fe453658 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Yazawazi
411a6c0715 comment & mooncard 2022-04-27 08:42:48 -07:00
Kengxxiao
27ac32a42b
Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
60a36282c4 use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
842acabe5a implement npc shop 2022-04-27 07:35:31 -07:00
Kengxxiao
08062b6da9 implement simple drop system 2022-04-27 17:42:02 +08:00
Melledy
4480ce14a7 Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
556018d9a9 Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
8105d2a7a9 Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
2b69978327 World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
be307fe5f0 Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Benjamin Elsdon
e4899034b2 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
Benjamin Elsdon
63d0db376a Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
98bb7e9bc4 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Benjamin Elsdon
2ed6fbc1da Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
619b84027f DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
c3f25edff3
utils 2022-04-27 06:15:59 +08:00
Yazawazi
383356deb0
Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
b392849577
[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
30d4fec9d4
Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Benjamin Elsdon
a2b6633797 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
9fd5aef687
Add more events 2022-04-26 02:07:00 -04:00
Benjamin Elsdon
7015905991 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
f0ae673091 Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2b75cda6df Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
080fdeeef6 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
a9b7a5a5f6 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
b0322fa3e5 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
3b414cda38 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Benjamin Elsdon
ae190f3fa0 Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08:00
Benjamin Elsdon
f18068bc16 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
43ef6ff9c5 Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
15d1159509 Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
ced5fc38be Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
4e3a1c769f THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
30bc3a8ad1 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
b1f34f4fbe 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
bc3fa67408 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
25111ed907 sanity check 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
ffe96fe93a Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
850b3d20ff Receiving items in mail 2022-04-25 13:51:19 +08:00
Benjamin Elsdon
c7096f9e49 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
Benjamin Elsdon
b10a889d76 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
9e81e10e64 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
Yazawazi
fb9f6c0bf4
Fix fetter system 2022-04-24 15:02:31 +08:00
Yazawazi
232e9a470d
Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Melledy
54ad583c67
Merge pull request #128 from memetrollsXD/development 
Use count for level for equips (dev branch)
 2022-04-23 15:15:22 -07:00
memetrollsXD
b1508183f8
Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
Yazawazi
9c920b139a
Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
7fd1e4dacb Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
903e02c538 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
45281695fe
Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
e970fdb60a
Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Jaida Wu
e38f5ca97b
Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Yazawazi
eb57534a2a
Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
17abf321a2 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
Miyucchi
e2543483ff Profile set birthday feature 2022-04-23 03:22:32 +02:00
Yazawazi
53659d2586
AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
d341e4f245 Use count for level for equips 2022-04-22 23:19:58 +02:00
Yazawazi
34c0c6b01b
setfetterlevel command 2022-04-22 23:46:24 +08:00
Yazawazi
9edb70d6cf
AvatarFetterLevel 2022-04-22 22:27:40 +08:00
fumbling
91b685586e 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
cb043e0644
no more NullPointerException pls 2022-04-22 08:30:02 +08:00
Yazawazi
1c6aa32cea
ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
a3f528ede0
typo 2022-04-22 07:42:17 +08:00
Yazawazi
6b8b6b4899
fetter try 2022-04-22 07:37:25 +08:00
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
dca137a93e Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix 2022-04-22 02:23:02 +08:00
yarik0chka
38c0c9eb7c Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
e97e124460 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:09:12 -07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
75719c5b3b Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
75cea5bc48 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
labalityowo
7b43e9a6d8
Remove the stella appearance 2022-04-21 11:42:21 +07:00
Melledy
35925903a1 Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00