Commit Graph

914 Commits

Author SHA1 Message Date
KingRainbow44
549471b76e Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
50307ea3a9 Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
29f9d6506a Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
836e0150b5 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
8e99cb4f35 More reliable stamina calculation
by separately handling immediate one-time cost and cost over time.
2022-05-07 18:18:20 -07:00
Kimi
43c27c4679 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
88bc5c4c54 another translation patches because i fucked it up
i hate myself
2022-05-07 15:49:22 -07:00
Magix
01b190bced UPGRADE TO 1.1.0 POG
Merge `development` into `stable`
2022-05-07 18:18:18 -04:00
Magix
1beddf16c1 Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
KingRainbow44
57cc111350 Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
730c993873 Merge pull request #628 from exzork/development
PluginManager: Use the same class loader and add getPlugin method
2022-05-07 17:58:42 -04:00
Magix
84c1cd7aa7 Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
ab5131e9fd Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
Piotr Blecharski
747d6e91f6 Deleted .DS_Store 2022-05-07 14:45:42 -07:00
Piotr Blecharski
34228dc9cd Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
zhaodice
e85eb2f48a fix issue 635
fix #635
2022-05-07 14:42:25 -07:00
zhaodice
7e5696211c fix issues 629
fix #629
2022-05-07 14:39:34 -07:00
Kimi
14da6214d3 Traditional Chinese | Translation Patches
yeah i fucked up that one line of translation oops
also added two lines of translation too
2022-05-07 14:37:48 -07:00
muhammadeko
f8bc471d4d PluginManager: Use the same class loader and add getPlugin method 2022-05-07 19:48:51 +07:00
kaitl
dc3c744778 Update zh-CN.json 2022-05-07 00:47:38 -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
真心
00d15a5c89 Create zh-CN.json 2022-05-06 23:24:47 -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
557e641fca Fix missing comma in expedition reward's json 2022-05-06 20:04:25 -07:00
ShigemoriHakura
b3c825918d Add all expedition rewards (#607)
* fix achievement proto

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

* add import

* Add all AvatarExpedition protos

Expedition system has almost done but still has some bug so it will be uploaded later

* Add all expedition rewards
2022-05-06 19:50:13 -07:00
Melledy
af39613d4f Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
Melledy
e31a0c14ec Add to gacha mappings to gitignore 2022-05-06 19:14:01 -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
KingRainbow44
f34100924e Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:20:59 -04:00
KingRainbow44
2c1cc36ceb Rename & refactor 2022-05-06 21:20:41 -04:00
Magix
a65823d24e Merge pull request #580 from Bwly999/development
Fix the problem that the reference of serverHook in Plugin object is null
2022-05-06 21:10:50 -04: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
KingRainbow44
f1079953c1 Rename en-US locale 2022-05-06 20:18:50 -04:00
Bwly999
79babcc53e roll back to timer 2022-05-07 08:00:31 +08:00