Akka
39e8f810d2
Merge pull request #5 from Grasscutters/development
...
Development
2022-05-07 21:49:22 +08:00
Akka
6148ee8742
Monsters tide turn by turn && Ban User Skill && Lua functions
2022-05-07 21:47:13 +08:00
muhammadeko
f8bc471d4d
PluginManager: Use the same class loader and add getPlugin method
2022-05-07 19:48:51 +07:00
gentlespoon
6bba3c8477
Kamisato Ayaka and Mona talent moving costs stamina
2022-05-07 00:47:19 -07:00
gentlespoon
9b3ca239c9
Prepare MovementManager.updateStamina() for external calls.
2022-05-07 00:47:19 -07:00
mingjun97
ff52255ac7
Fix gacha mapping generation login
...
* Fix `System#out` usage pointed by magix at https://github.com/Grasscutters/Grasscutter/pull/568#pullrequestreview-965271278
* Fix typos for interchange `-` and `_`.
* Fix gacha mapping autogeneration path
2022-05-06 23:28:07 -07:00
gentlespoon
34df864e1c
Flight stamina cost -20% when Amber or Venti in team
...
- Reduced stamina not tested in MP.
- Stop MovementManager ticker when player goes offline.
2022-05-06 23:27:07 -07:00
Secretboy
bf0d01778e
Update Language.java
2022-05-06 21:54:07 -07:00
Secretboy
f9b5478c9d
Update Config.java
2022-05-06 21:54:07 -07:00
FpguDhk
a9a027bbc6
Fix the Chinese messy code problem.
2022-05-06 21:23:03 -07:00
lhhxxxxx
0690e23116
Handle with undetermined locale language config ( #611 )
...
* Update GiveAllCommand.java
giveall command nomore give arts
* Update Grasscutter.java
* Update Grasscutter.java
2022-05-06 21:20:44 -07:00
Melledy
af39613d4f
Move server profile away from GameConstants
2022-05-06 19:16:36 -07:00
Melledy
759cd6ae37
Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development
2022-05-06 19:12:58 -07:00
Melledy
f894b96edf
Fix crash on login if the player didnt have a TowerManager
2022-05-06 19:12:54 -07:00
KingRainbow44
32d2a21153
Merge remote-tracking branch 'origin/development' into development
2022-05-06 21:53:03 -04:00
KingRainbow44
043c731575
Fix for translation errors
2022-05-06 21:52:10 -04:00
Magix
e29c2dc122
Merge branch 'stable' into development
2022-05-06 21:39:30 -04:00
Magix
1ed0511cd7
Update Tools.java
2022-05-06 18:25:35 -07:00
mingjun97
1ee9cc80bb
Auto fill name of the event from TextMap
2022-05-06 18:25:35 -07:00
mingjun97
1d6fd52552
Prompt for user language option for the Tools
...
* GM Handbook
* Gacha Map
2022-05-06 18:25:35 -07:00
Magix
711ae2f554
Merge branch 'development' into development
2022-05-06 21:08:19 -04:00
Magix
38fd7bb76a
Merge pull request #567 from Grasscutters/localization
...
Implement a proper language system
2022-05-06 21:05:29 -04:00
KingRainbow44
c11e83c48f
Bug fixes
2022-05-06 21:04:39 -04:00
Bwly999
79babcc53e
roll back to timer
2022-05-07 08:00:31 +08:00
KingRainbow44
aa292b1fef
Update Utils.java
2022-05-06 19:47:30 -04:00
KingRainbow44
0d7f58fc25
Merge development
into localization
2022-05-06 19:40:32 -04:00
gentlespoon
6d678557ff
fix/runningAndDashingStamina
2022-05-06 16:11:51 -07:00
KingRainbow44
362cfe1e7b
Ensure we have a fallback for localization
2022-05-06 18:57:49 -04:00
KingRainbow44
b3a917007b
Convert to the superior language system. (pt. 3)
2022-05-06 18:50:18 -04:00
gentlespoon
58cb60299c
Fix #593 : Accidental death of character
2022-05-06 15:22:00 -07:00
gentlespoon
3f91fdcb71
Allow walking away from the statue within 2.5s to stop auto heal.
2022-05-06 14:49:33 -07:00
wulf
542a3cfc9b
fix scence block loading bug
2022-05-06 13:43:42 -07:00
Scald
afa3747fad
Add config option to change console server's signature, namecard, level and world level ( #586 )
...
* Add files via upload
* Add files via upload
* Update GameConstants.java
* Update Config.java
* Update PacketGetPlayerFriendListRsp.java
2022-05-06 13:41:29 -07:00
cfuncode
0152b146c5
Improved fault tolerance for json file deserialization ( #595 )
...
* 修复一个Gson发序列化json文件的空值问题
* Improved fault tolerance for json file deserialization
2022-05-06 13:39:37 -07:00
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
Bwly999
6149c6f0e3
Merge branch 'development' of github.com:Grasscutters/Grasscutter into development
2022-05-06 22:38:04 +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
Bwly999
2d325e1847
fix the problem that the reference of serverHook in Plugin object is null
2022-05-06 18:16:07 +08: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
KingRainbow44
c0b1ec1b9e
Convert to the superior language system. (pt. 2)
2022-05-06 00:57:45 -04:00
KingRainbow44
7a084100c6
Convert to the superior language system. (pt. 1)
2022-05-05 23:57:55 -04: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
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
57285885dc
Move languages to languages package
2022-05-04 00:44:33 -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
Melledy
de75b56d6c
Fix jline in eclipse
2022-05-03 23:24:02 -07:00
Scirese
09125f8e91
Optimize Chinese Translations ( #498 )
...
* Add Chinese Translation
* Optimize Chinese Translations
* Fix a dumb error
2022-05-03 23:15:04 -07:00
方块君
09b306f6a0
Modify Chinese language files
2022-05-03 22:17:41 -07:00
方块君
e297a29adb
Add some text to language file
2022-05-03 22:17:41 -07:00
方块君
b8f5299995
Optimize multilingualism (using variables)
...
Optimize multilingualism (using variables)
2022-05-03 22:17:41 -07:00
DancingSnow
f6d5fb1945
fix giveart command when times about 200, account will crash
2022-05-03 10:45:11 -07:00