Commit Graph

1970 Commits

Author SHA1 Message Date
Abdul
1a2f25d67b Update ru-RU.json 2022-08-04 18:01:26 +09:30
유여름
1b3963a83a Create ko-KR.json 2022-08-02 22:45:49 +09:30
KingRainbow44
faeb96927a Add PlayerUseFoodEvent and implementations 2022-08-01 21:32:30 -04:00
KingRainbow44
89575f587e Move PlayerTeleportEvent occurrences into World 2022-08-01 21:25:29 -04:00
KingRainbow44
1de402bd6f Merge branch 'development' into more-events 2022-08-01 21:13:19 -04:00
KingRainbow44
b9b4b6f428 Clean-up the energy manager 2022-08-01 21:12:57 -04:00
Magix
f25fb62942 Explicitly declare the charset of a FileReader in ConfigContainer
Changed charset of FileReader in ConfigContainer from default to utf-8.
Merge pull request #1600 from Someone999/development
2022-07-31 07:17:46 -04:00
millet6
5df46dab86 Update zh-CN.json
修正 用户登录提示
2022-07-30 13:57:27 +09:30
Someone999
f3baa0b8e7 Changed charset of FileReader in ConfigContainer from default to utf-8. 2022-07-29 19:08:07 +08:00
RBNXI
66dadece8a Add files via upload 2022-07-28 21:07:17 +09:30
AnimeGitB
cb8b21d03d Auto language lint 2022-07-28 04:23:58 -07:00
AnimeGitB
0e406d9f05 Add explicit encoding on manage_languages.py for windows users 2022-07-28 04:23:58 -07:00
AnimeGitB
b80126fdda Add lock function to SetStatsCommand 2022-07-28 04:23:58 -07:00
AnimeGitB
0fa3d0e8d1 Improve message formatting to clients
Replaces tab indents with an extra linebreak.
Also adds / to the start of command usage.
Neither of these changes affect messages to the server console log.
2022-07-28 00:16:41 -07:00
Magix
24dfac65b2 Update zh-CN.json
Merge pull request #1584 from millet6/patch-1
2022-07-27 13:33:40 -04:00
Magix
f25dc4d2fc Update zh-CN.json 2022-07-27 13:32:11 -04:00
Magix
30540711eb Merge pull request #1586 from Birdulon/development
Suppress stacktrace on missing questkeys file
2022-07-27 13:29:30 -04:00
AnimeGitB
0d9116225c Suppress stacktrace on missing questkeys file 2022-07-27 21:10:32 +09:30
Magix
6ba4846e58 Change loading quest keys from info to debug.
Please for the love of god use `debug` for information not important to the enduser when starting the server.
2022-07-26 14:49:45 -04:00
millet6
d8f8aed816 Update zh-CN.json
更新汉化内容
Update Chinese content
2022-07-27 01:38:24 +08:00
Magix
9781d5e6c9 Fix an NPE in EntityGadget when draft_id isn't set
Merge pull request #1579 from Hartie95/nullfix
2022-07-26 12:14:08 -04:00
Magix
107111d3fc SceneScriptManager fix nullPointer error
Merge pull request #1581 from akatatsu27/development
2022-07-26 12:02:14 -04:00
Melledy
7600f706b5 Move QuestEncryptionKeys to resources/ 2022-07-26 08:22:27 -07:00
Kimi
2fe6bcf2cf Traditional Chinese | Translation Patches
Added missing some commands translation, and fixing up another mainlander's CHS = CHT mindset.
2022-07-27 00:28:44 +09:30
akatatsu27
7ca947b05f fix nullPointer error 2022-07-26 17:58:28 +03:00
ah
964e73f0f6 small nullpointer fix in EntityGadget, in case meta gadget is not set 2022-07-26 16:09:52 +02:00
Abdul
bb8ae4c443 Update ru-RU.json
- Add unlockall translations
2022-07-26 06:29:57 -07:00
RBNXI
5a3dfcd4b4 Add spanish translation for constellation commands 2022-07-26 22:56:36 +09:30
Melledy
797afd4ccf Merge pull request #1553 from akatatsu27/questing
Major quest framework improvements
2022-07-26 06:10:03 -07:00
akatatsu27
8bdcfb8908 token fix 2022-07-26 14:28:39 +03:00
akatatsu27
92aeb79ac3 Merge branch 'development' into questing 2022-07-26 14:17:42 +03:00
Abdul
1c5c3633d1 Update ru-RU.json 2022-07-26 18:58:15 +09:30
AnimeGitB
883b6f1fcc [Bug] New avatars always created with C0 constellation
Fixes #1552
2022-07-26 17:56:49 +09:30
hartie95
ffeff92dd6 2.7+ prerendered cutscene support 2022-07-26 16:55:53 +09:30
hartie95
938b54c2ee two small activity/event fixes
* fixed GetAcitivityInfoReq proto
* added draft to gadget Scene gatget, to let the client know the propper minigame for some entities
2022-07-26 16:49:52 +09:30
lactose
59a412cc83 Set Constellation Command (#1565)
Original commits:

* create `SetConstCommand` class and translations

* (partially) functional `setconst` command

* fixed punctuation

* added success message

* implemented `SetConstCommand`

* added translation keys

* update keys

* refactor + automatic reload

* Nitpick (Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>)
2022-07-26 16:44:17 +09:30
loulou310
63fd4dfe3a Update French translation 2022-07-26 10:35:05 +09:30
KingRainbow44
c35705010a Fix remaining traces of Player#getPos 2022-07-24 13:27:43 -04:00
KingRainbow44
41ec2316e4 Attempt to fix the teleport command. 2022-07-24 13:23:51 -04:00
KingRainbow44
818bfb8c5b Add PlayerTeamDeathEvent and implementations 2022-07-24 13:20:58 -04:00
KingRainbow44
886c2e2f43 Add EntityDeathEvent and implementations 2022-07-24 13:20:42 -04:00
KingRainbow44
a13725b1cb Add a Location class (Scene + Position) 2022-07-24 12:17:38 -04:00
KingRainbow44
7397c7f300 Remove deprecated class 2022-07-24 12:08:59 -04:00
KingRainbow44
90cded16d9 Merge branch 'development' into more-events 2022-07-24 12:05:35 -04:00
akatatsu27
44d8a6482e call deregisterRegion appropriately 2022-07-24 13:33:48 +03:00
akatatsu27
29bdb7f3f6 Merge branch 'development' into questing 2022-07-24 12:16:22 +03:00
GanyusLeftHorn
d0edd39465 Read Open States from Excels (#1557)
* Make sure we never access PlayerOpenStateManager::map directly.

* Read OpenStates from excels.

* Add defaultState

* Replace hardcoded open states with the ones read from excels.

* Don't send change notify when unlocking on login.

* Add open state blacklist for default unlocks.

* Add a way to temporarily set open states for dev

* Remove old OpenState.java

* Fix UnlockAllCommand

* Change condType to an enum.
2022-07-24 00:12:07 -07:00
akatatsu27
8050f0cc07 and misc bug fixes 2022-07-23 12:28:49 +03:00
akatatsu27
02a56fcec4 Major questing improvements 2022-07-23 12:27:14 +03:00
KingRainbow44
956d4023c7 Merge branch 'development' into more-events
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
2022-07-22 17:52:58 -04:00