Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement a proper language system #567

Merged
merged 39 commits into from
May 7, 2022
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
32c70cc
Support of Enter Room Scene
Akka0 May 5, 2022
023c5ba
Convert to the superior language system. (pt. 1)
KingRainbow44 May 6, 2022
f731196
Convert to the superior language system. (pt. 2)
KingRainbow44 May 6, 2022
d32d401
Choose Avatar & Enter Tower
Akka0 May 6, 2022
7d51e0d
Merge pull request #1 from Akka0/development
Akka0 May 6, 2022
744aa47
Add drowning. Better movement ticking.
gentlespoon May 6, 2022
a79e008
Add @Transient for temporary team
Akka0 May 6, 2022
696f629
Choose Avatar & Enter Tower
Akka0 May 6, 2022
39a49ae
Add @Transient for temporary team
Akka0 May 6, 2022
39c932b
Implementes auto HP recovery at the statues.
gentlespoon May 6, 2022
e319fd7
fix: lower logging level in SotSManager
gentlespoon May 6, 2022
5968ed3
Remove the red exclamation mark from achievements
May 6, 2022
092dee8
Merge branch 'development' of https://github.com/Grasscutters/Grasscu…
May 6, 2022
098cf37
Fix morphia error when saving player to db
May 6, 2022
0102a3c
The statues will now automatically regen their HP volume over time.
gentlespoon May 6, 2022
da99140
Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#…
4Benj May 6, 2022
6144f47
Tower Dungeons Handoff between level and floor
Akka0 May 6, 2022
81ca860
Add some lua functions
Akka0 May 6, 2022
7279842
Merge pull request #2 from Grasscutters/development
Akka0 May 6, 2022
321a2a3
Merge branch 'tower' into development
Akka0 May 6, 2022
6b82a53
Merge pull request #3 from Akka0/development
Akka0 May 6, 2022
22df346
a little fix
Akka0 May 6, 2022
63a37ac
add config option to enable cors for dispatchserver (#579)
exzork May 6, 2022
19a2c9b
Implement Avatar Expedition System
CCasusensa May 6, 2022
6d89477
Merge pull request #594 from Akka0/tower
May 6, 2022
2b58d69
Improved fault tolerance for json file deserialization (#595)
cfuncode May 6, 2022
c4e1108
Add config option to change console server's signature, namecard, lev…
Arikatsu May 6, 2022
7109578
fix scence block loading bug
May 6, 2022
1d4a41f
Allow walking away from the statue within 2.5s to stop auto heal.
gentlespoon May 6, 2022
c582814
Fix #593: Accidental death of character
gentlespoon May 6, 2022
438f845
Convert to the superior language system. (pt. 3)
KingRainbow44 May 6, 2022
7899a60
Add the `en-US` language.
KingRainbow44 May 6, 2022
57a3d53
Add the `zh-TW` language.
KingRainbow44 May 6, 2022
686df18
Ensure we have a fallback for localization
KingRainbow44 May 6, 2022
d8719ec
Update .gitignore & remove files
KingRainbow44 May 6, 2022
80c9119
Merge `development` into `localization`
KingRainbow44 May 6, 2022
4264ca0
Update `Utils.java`
KingRainbow44 May 6, 2022
59b24aa
Rename `en-US` locale
KingRainbow44 May 7, 2022
e6cb97a
Bug fixes
KingRainbow44 May 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add @transient for temporary team
  • Loading branch information
Akka0 committed May 6, 2022
commit a79e00896cb99b783cb0bcef48a431a26da4cc24
4 changes: 2 additions & 2 deletions src/main/java/emu/grasscutter/game/player/TeamManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ public class TeamManager {
@Transient private final IntSet teamResonances;
@Transient private final IntSet teamResonancesConfig;

private int useTemporarilyTeamIndex = -1;
@Transient private int useTemporarilyTeamIndex = -1;
/**
* Temporary Team for tower
*/
private List<TeamInfo> temporaryTeam;
@Transient private List<TeamInfo> temporaryTeam;

public TeamManager() {
this.mpTeam = new TeamInfo();
Expand Down