Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 20:34:49 +00:00
Code Issues Projects Releases Wiki Activity
836 Commits 7 Branches 22 Tags 133 MiB
6b82a5360c
Commit Graph

836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akka
6b82a5360c
Merge pull request #3 from Akka0/development 
Development
 2022-05-07 00:19:59 +08:00
Akka
321a2a3537
Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
7279842659
Merge pull request #2 from Grasscutters/development 
Development
 2022-05-07 00:17:08 +08:00
Akka
81ca86092c Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
6144f47127 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
4Benj_
da99140d20
Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
0102a3ce1e The statues will now automatically regen their HP volume over time. 
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
 2022-05-06 03:26:38 -07:00
Melledy
098cf372c9 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
092dee8e2b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
5968ed3a71 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
e319fd751b fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
39c932b041 Implementes auto HP recovery at the statues. 
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
 2022-05-06 00:17:18 -07:00
Akka
39a49ae964 Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
a79e00896c Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
744aa478a9 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
7d51e0deb5
Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
d32d4014cd Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
memetrollsXD
2dc6a48403 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
414fad9079 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
ShiroSaki
eaf0dd0b3b Add all AvatarExpedition protos 
Expedition system has almost done but still has some bug so it will be uploaded later
 2022-05-05 16:52:48 -07:00
gentlespoon
18b1c50d0a 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
Ljzd-PRO
57b5e6f3d9
Change the usage of command permission in README.md (#557) 
* Change the command `permission` usage

* Change the command `permission` usage
 2022-05-05 22:32:09 +02:00
Scirese
e01c270a52 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -07:00
Akka
9ee9d7e686 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
243db37fd6 No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
a7273fd84a I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
b313d8567a Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
32c70cc83f Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
775f4cb7c1
GiveCommand: fix edge case with unspaced multiple args (#539) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-05 15:23:48 +02:00
Melledy
b61672e046 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
Melledy
199c97f241
Remove link to personal site 2022-05-05 00:16:39 -07:00
AnimeGitB
bc19f2da93 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07:00
gentlespoon
080ba33cc9 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
94c1de66b9 SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
2cfaeac6bc Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
0c715f0856 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
e198907143 Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
bf654ced36 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
821969fdd2 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
dabd700252 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
8218b1c162 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
c3eafa0255 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
c63f2cfd3c Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
491ad5b4d9 Add missing PacketOpcodes. 2022-05-04 22:54:52 -07:00
Angda Song
3edbed463b Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
d62be2d1d7
Add the god statue's blood return display and stamina system (#520) 
* Fix announcement display

* Approaching StatuesOfTheSeven will restore all health of the current team

* Added god statue's blood return display and stamina system

* fix error

fix error

* fix file
 2022-05-04 11:45:20 -07:00
ShigemoriHakura
022dcf60ad
fix achievement proto (#507) 
* fix achievement proto

TakeAchievementRewardReq tells client the achievements achieved or not and it's progress.

* add import
 2022-05-04 10:06:33 -07:00
Akka
823040be56
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
6943360f4a 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