Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 21:47:39 +00:00
Code Issues Projects Releases Wiki Activity
934 Commits 7 Branches 22 Tags 133 MiB
727d92a6bc
Commit Graph

934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KingRainbow44
686df18b74
Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
57a3d535a7
Add the zh-TW language. 2022-05-06 18:56:19 -04:00
KingRainbow44
7899a6069b
Add the en-US language. 2022-05-06 18:50:43 -04:00
KingRainbow44
438f845e3a
Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
c582814bc1 Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
1d4a41fd61 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
71095786b8 fix scence block loading bug 2022-05-06 13:43:42 -07:00
Scald
c4e11088da
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
2b58d69534
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
6d89477120
Merge pull request #594 from Akka0/tower 
Tower Dungeons Handoff between levels
 2022-05-06 13:37:30 -07:00
Kinesis
19a2c9b7ea 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
63a37acc1b
add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
22df34606c a little fix 2022-05-07 00:31:48 +08:00
Akka
6b82a5360c
Merge pull request #3 from Akka0/development 
Development
 2022-05-07 00:19:59 +08:00
Akka
321a2a3537
Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
7279842659
Merge pull request #2 from Grasscutters/development 
Development
 2022-05-07 00:17:08 +08:00
Akka
81ca86092c Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
6144f47127 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
613366516d Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
da99140d20
Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
0102a3ce1e 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
98e1189deb fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
098cf372c9 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
092dee8e2b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
5968ed3a71 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
e319fd751b fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00