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
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
08882e18aa
Update .gitignore & remove files
2022-05-06 18:59:26 -04:00
KingRainbow44
362cfe1e7b
Ensure we have a fallback for localization
2022-05-06 18:57:49 -04:00
KingRainbow44
f39cc9e01f
Add the zh-TW language.
2022-05-06 18:56:19 -04:00
KingRainbow44
647922ff01
Add the en-US language.
2022-05-06 18:50:43 -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
ff0e1c64cd
Merge pull request #3 from Akka0/development
...
Development
2022-05-07 00:19:59 +08:00
Akka
c2d2a37fc5
Merge branch 'tower' into development
2022-05-07 00:19:51 +08:00
Akka
a7312ce054
Merge pull request #2 from Grasscutters/development
...
Development
2022-05-07 00:17:08 +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
