Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 19:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,140 Commits 7 Branches 22 Tags
a4f5d3286d8688e26854ab14a0e343ec9643ae92
Commit Graph

624 Commits

Author SHA1 Message Date
KingRainbow44
a4f5d3286d Implement game time locking 
implement for quests
 2023-05-08 00:11:29 -04:00
KingRainbow44
d32f6982be Run spotlessApply 
also set line endings to native, no more line conflict errors!
 2023-05-07 22:53:55 -04:00
KingRainbow44
4f1136ce2d Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests 2023-05-07 17:57:24 -04:00
KingRainbow44
24ad6bf478 Add the dungeon ID to the transfer scene packet 2023-05-07 02:57:06 -04:00
scooterboo
c832c1cac0 Revert final's added by 15e2f3ca34 (#2144) 
* Revert final's added by 15e2f3ca34

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-05-07 02:39:16 -04:00
scooterboo
f0a11c1b4e Partially fix fairy clock (#2143) 
updatePlayerGameTime() expects time since game start not since day start.
 2023-05-05 18:36:55 -04:00
KingRainbow44
48e233eb9b Update game time changing (triggers quests and updates properly) 2023-05-04 21:41:41 -04:00
KingRainbow44
8bb7ae22d0 Fix changing time + Trigger time change condition 2023-05-04 01:05:03 -04:00
KingRainbow44
3df5f79ebf Revert "Run spotlessApply" 
This reverts commit d67e2d0c5e.
 2023-05-03 10:48:00 -04:00
KingRainbow44
d67e2d0c5e Run spotlessApply 2023-05-02 23:21:17 -04:00
KingRainbow44
93a3276f75 Implement hiding in-game icons 
this will also enable exception showing if 'DEBUG' is enabled
 2023-05-02 21:35:17 -04:00
KingRainbow44
fdd6820a8f Merge pull request Grasscutter-Quests#53 
'Updated with how talks are handle' by `mjolsic`
 2023-05-02 20:16:55 -04:00
KingRainbow44
d01ba08f26 Fix double adding of avatar entities 2023-04-30 20:58:31 -04:00
KingRainbow44
9b507a6ec3 Add support for legacy and newer quest excels 2023-04-29 21:35:49 -04:00
KingRainbow44
d5f75e1889 Attempt to correct PlayerSetPauseReq 
this is still broken; further investigation is required
 2023-04-29 02:00:13 -04:00
KingRainbow44
52ac9cd75e Remove obsolete code 2023-04-24 20:56:20 -04:00
KingRainbow44
c9d6225194 Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
a53328346a Fix avatar trial status being saved to the database 2023-04-20 00:22:29 -04:00
KingRainbow44
ee298235c2 Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
361620de6d Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
 2023-04-18 15:36:29 -04:00
FlourishingWorld
8c6b166a42 fix co-op mode avatar animation interrupt (#2124) 2023-04-18 15:19:34 -04:00
Moistcrafter
abcabc9861 Parse dungeon entry info req from payload instead of player scene (#2122) 2023-04-17 01:08:08 -04:00
KingRainbow44
7bdcf4e0d2 Merge packet handlers from quests/quests 2023-04-14 21:59:15 -04:00
KingRainbow44
c08633aa46 Fix issue with trial teams 2023-04-14 02:37:15 -04:00
dragon
f71b29c00a Implement a new item drops system (#2112) 
* 1

* Delete .gitattributes

* implement

* Update PacketDropHintNotify.java

* Update PacketWorldChestOpenNotify.java

* Update FileUtils.java

* Update PacketDropHintNotify.java

* Update WorldDataSystem.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-04-13 22:28:54 -04:00
KingRainbow44
38ba9771ec Remove default Anemo skill depot from a Traveler when questing is enabled 2023-04-13 17:53:18 -04:00
KingRainbow44
d6efaaea86 Call Player#onPlayerBorn when the player is created 2023-04-13 17:34:04 -04:00
KingRainbow44
b42d8b67ed Fix quest progression when entering a domain 2023-04-12 02:59:44 -04:00
KingRainbow44
0de69cd1fa Show available story dungeons to the player 2023-04-12 02:01:22 -04:00
KingRainbow44
71a8ca2a8a Implement scripting: SetEntityServerGlobalValueByConfigId 
w/ help from: Moistcrafter#9172
 2023-04-11 21:07:29 -04:00
KingRainbow44
06cbae31fa Fix player fields not being set 
line seps r weird
 2023-04-10 22:46:19 -04:00
KingRainbow44
5e56b5e3a8 Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/managers/ResinManager.java
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
#	src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
#	src/main/java/emu/grasscutter/utils/Crypto.java
 2023-04-10 22:13:50 -04:00
tamilpp25
3c60f792ca reject clients on version mismatch (#2106) 2023-04-10 20:05:11 -04:00
Moistcrafter
c905d493af Add co-op lyre support (#2105) 2023-04-10 01:43:26 -04:00
hamusuke
caf9521013 feat: add ability to buy resin with primogems (#2104) 
* feat: add ability to buy resin with primogems

* ResinManager#buy returns RetCode value
 2023-04-09 20:20:12 -04:00
KingRainbow44
e20c7c151b Lint code 2023-04-09 14:50:59 -04:00
KingRainbow44
644f1b3ab9 Continue merging quests (pt. 2) 2023-04-09 14:35:45 -04:00
KingRainbow44
a3970f8e43 Format code 2023-04-02 21:34:07 -04:00
hamusuke
9181d1cbfd fix: mail system (#2096) 
* fix: mail

* Simplify the mail handler

---------

Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-04-02 21:32:30 -04:00
KingRainbow44
b2c9e8de3e Merge branch 'unstable' into unstable-quests 2023-04-02 21:31:39 -04:00
KingRainbow44
95e1d77b65 Merge branch 'fixmail' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/game/mail/Mail.java
#	src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
#	src/main/java/emu/grasscutter/utils/Utils.java
 2023-04-02 21:30:52 -04:00
KingRainbow44
90fb606f68 Simplify the mail handler 2023-04-02 21:23:02 -04:00
ハムスケ ハム
ddafeb9ed3 fix: mail 2023-04-03 00:18:48 +09:00
KingRainbow44
9fbb7fb3be Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
772532515e Comment-out unknown packet handlers/encoders 
These are mostly related to the teapot, music game, and custom teams
 2023-04-01 20:00:08 -04:00
KingRainbow44
daa51e53b7 Copy some files from Grasscutter-Quests 
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
 2023-04-01 18:06:30 -04:00
KingRainbow44
262ee38ded Create files from Grasscutter-Quests 
these files are NOT directly compatible with Grasscutter, and require additional modifications to the codebase to work.
 2023-03-31 23:58:12 -04:00
KingRainbow44
fc05602128 Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
15e2f3ca34 Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
Colleiflower
516e5975e1 Add support for v3.5.0 (#2090) 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-03-31 15:13:32 -04:00