Melledy
ad84635540
Merge pull request #594 from Akka0/tower
...
Tower Dungeons Handoff between levels
2022-05-06 13:37:30 -07:00
Kinesis
8abd3ace6c
Implement Avatar Expedition System
...
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
2022-05-06 13:28:26 -07:00
Muhammad Eko Prasetyo
deee32a0a1
add config option to enable cors for dispatchserver ( #579 )
2022-05-06 13:23:26 -07:00
Akka
f2231349bd
a little fix
2022-05-07 00:31:48 +08:00
Akka
c2d2a37fc5
Merge branch 'tower' into development
2022-05-07 00:19:51 +08:00
Akka
17242a24ed
Add some lua functions
2022-05-07 00:15:23 +08:00
Akka
b58bcda0c8
Tower Dungeons Handoff between level and floor
2022-05-07 00:11:54 +08:00
4Benj_
3ede7523b0
Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent ( #582 )
2022-05-06 15:48:16 +02:00
gentlespoon
2e68578525
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
b760fb1b26
Fix morphia error when saving player to db
2022-05-06 01:19:39 -07:00
Melledy
000b10983b
Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development
2022-05-06 01:17:19 -07:00
Melledy
796201e8b7
Remove the red exclamation mark from achievements
2022-05-06 01:17:16 -07:00
gentlespoon
221668570e
fix: lower logging level in SotSManager
2022-05-06 00:49:08 -07:00
gentlespoon
198214ec53
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
2ad6f5934b
Add @Transient for temporary team
2022-05-06 00:12:33 -07:00
Akka
c912b8d857
Choose Avatar & Enter Tower
2022-05-06 00:12:33 -07:00
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
memetrollsXD
81998b9cf9
Customise sender and title too. Add statement of use
2022-05-05 19:49:28 -07:00
Melledy
a045142a41
Kick player if they use an invalid resources folder
2022-05-05 17:17:27 -07: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
Scirese
128f767002
Update CNLanguage to match with the latest EN version
2022-05-05 09:03:23 -07:00
Akka
3f34aa0460
Support of Enter Room Scene
2022-05-05 09:02:54 -07:00
Benjamin Elsdon
782c9bfb6b
No misleading 404 error
2022-05-05 09:02:10 -07:00
Benjamin Elsdon
db1ddd0630
I honestly don't know what happened....
2022-05-05 09:02:10 -07:00
Benjamin Elsdon
3395c76dbc
Removed GCStatic. Cleaned up GachaRecordHandler.
2022-05-05 09:02:10 -07:00
Akka
a21fc116ee
Support of Enter Room Scene
2022-05-05 22:00:11 +08:00
Luke H-W
15dca5a04d
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
e693612ed1
Fix clear command causing a concurrency error
2022-05-05 02:29:43 -07:00
AnimeGitB
3a28e741d0
Add R# LVL# X# arg syntax to GiveCommand
2022-05-05 00:14:17 -07:00
gentlespoon
7d85c53e68
Restrict to MP prop only.
2022-05-05 00:03:42 -07:00
gentlespoon
5c275c2e3c
SetPlayerPropReq Handler and player.setProperty() sanity check.
2022-05-05 00:03:42 -07:00
AnimeGitB
37c2ee5e2c
Command Targeting overhaul fixes
2022-05-05 00:03:10 -07:00
AnimeGitB
d8b2e787e5
Commands Targeting rework
2022-05-05 00:03:10 -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
hanbao233xD
4e0ebe56a6
Update CNLanguage.java
2022-05-04 22:57:33 -07:00
hanbao233xD
3f02afb46b
Update CNLanguage.java
2022-05-04 22:57:33 -07:00
hanbao233xD
fb05a3711d
Update CNLanguage.java
2022-05-04 22:57:33 -07:00
Secretboy
a7b9b1f923
Update Config.java
2022-05-04 22:57:06 -07:00
Secretboy
08c01ab15d
Update Grasscutter.java
2022-05-04 22:57:06 -07:00
gentlespoon
6fc4065fa0
Add missing PacketOpcodes.
2022-05-04 22:54:52 -07:00
Angda Song
5a2d25e4eb
Update teleport docs and allow overriding Y coord when teleporting
2022-05-04 14:50:49 -07:00
BaiSugar
2074933e96
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
aa06583a45
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
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
Scirese
4220b6b88d
Fix CNLanguage.java ( #505 )
...
* Fix CNLanguage.java
@Melledy
Keep an eye on the file encodeing next time,please.
* Update CNLanguage.java
* Fix a little bug
2022-05-04 16:56:50 +02:00
