Kimi
fbaeaee4b5
another translation patches because i fucked it up
...
i hate myself
2022-05-07 15:49:22 -07:00
Magix
658ee3b547
UPGRADE TO 1.1.0 POG
...
Merge `development` into `stable`
2022-05-07 18:18:18 -04:00
Magix
426f3701e8
Update build.gradle (in prep for 1.1.0)
2022-05-07 18:17:32 -04:00
KingRainbow44
330427f5a5
Simplify the language fallback system
2022-05-07 18:12:53 -04:00
Magix
d70df776b1
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
f133a8b123
Update PluginManager.java
2022-05-07 17:58:18 -04:00
HotaruYS
75032b4aa2
Respect FrontHTTPS when creating URI for gacha record
2022-05-07 14:54:15 -07:00
Piotr Blecharski
55d47a014f
Deleted .DS_Store
2022-05-07 14:45:42 -07:00
Piotr Blecharski
1445fe9ce5
Command list with descriptions in handbook
2022-05-07 14:45:42 -07:00
zhaodice
fadda64699
fix issue 635
...
fix #635
2022-05-07 14:42:25 -07:00
zhaodice
03544acb3d
fix issues 629
...
fix #629
2022-05-07 14:39:34 -07:00
Kimi
8618c7de9e
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
Akka
2c50d2268b
Merge pull request #5 from Grasscutters/development
...
Development
2022-05-07 21:49:22 +08:00
Akka
d20cffb905
Monsters tide turn by turn && Ban User Skill && Lua functions
2022-05-07 21:47:13 +08:00
muhammadeko
5cc9ecfd91
PluginManager: Use the same class loader and add getPlugin method
2022-05-07 19:48:51 +07:00
kaitl
d8477fbcc4
Update zh-CN.json
2022-05-07 00:47:38 -07:00
gentlespoon
34af72ec9e
Kamisato Ayaka and Mona talent moving costs stamina
2022-05-07 00:47:19 -07:00
gentlespoon
29c5551450
Prepare MovementManager.updateStamina() for external calls.
2022-05-07 00:47:19 -07:00
mingjun97
f1f3badd16
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
39816f8eeb
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
真心
9109e4ee44
Create zh-CN.json
2022-05-06 23:24:47 -07:00
Akka
ea75508a46
Merge pull request #4 from Grasscutters/development
...
Development
2022-05-07 13:45:16 +08:00
Secretboy
22ebf35e69
Update Language.java
2022-05-06 21:54:07 -07:00
Secretboy
9a611a4c06
Update Config.java
2022-05-06 21:54:07 -07:00
FpguDhk
0347d877ea
Fix the Chinese messy code problem.
2022-05-06 21:23:03 -07:00
lhhxxxxx
cc104a6a1f
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
5a33720e4f
Fix missing comma in expedition reward's json
2022-05-06 20:04:25 -07:00
ShigemoriHakura
84f8023396
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
4cf4d37738
Move server profile away from GameConstants
2022-05-06 19:16:36 -07:00
Melledy
7b77f3eb9e
Add to gacha mappings to gitignore
2022-05-06 19:14:01 -07:00
Melledy
9f69fdcfd5
Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development
2022-05-06 19:12:58 -07:00
Melledy
bd7fb76b1d
Fix crash on login if the player didnt have a TowerManager
2022-05-06 19:12:54 -07:00
KingRainbow44
6ab1a4f43e
Merge remote-tracking branch 'origin/development' into development
2022-05-06 21:53:03 -04:00
KingRainbow44
a93371a0d0
Fix for translation errors
2022-05-06 21:52:10 -04:00
Magix
5744fc60d4
Merge branch 'stable' into development
2022-05-06 21:39:30 -04:00
Magix
c8779fec3c
Update Tools.java
2022-05-06 18:25:35 -07:00
mingjun97
6c7b94c127
Auto fill name of the event from TextMap
2022-05-06 18:25:35 -07:00
mingjun97
eb391b3833
Prompt for user language option for the Tools
...
* GM Handbook
* Gacha Map
2022-05-06 18:25:35 -07:00
KingRainbow44
fca5248ce1
Merge remote-tracking branch 'origin/development' into development
2022-05-06 21:20:59 -04:00
KingRainbow44
32b9e8f9d2
Rename & refactor
2022-05-06 21:20:41 -04:00
Magix
6ad0a1f625
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
217166822b
Merge branch 'development' into development
2022-05-06 21:08:19 -04:00
Magix
4455072db1
Merge pull request #567 from Grasscutters/localization
...
Implement a proper language system
2022-05-06 21:05:29 -04:00
KingRainbow44
e6cb97a437
Bug fixes
2022-05-06 21:04:39 -04:00
KingRainbow44
59b24aa481
Rename en-US locale
2022-05-06 20:18:50 -04:00
Bwly999
c5bf5ecd69
roll back to timer
2022-05-07 08:00:31 +08:00
KingRainbow44
4264ca0485
Update Utils.java
2022-05-06 19:47:30 -04:00
KingRainbow44
80c9119ca2
Merge development into localization
2022-05-06 19:40:32 -04:00
gentlespoon
82a88c8573
fix/runningAndDashingStamina
2022-05-06 16:11:51 -07:00
KingRainbow44
d8719ecc52
Update .gitignore & remove files
2022-05-06 18:59:26 -04:00
