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

Add opponent deck input #4316

Merged
merged 35 commits into from
Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c8a38a0
WIP
Jonysegal Jul 1, 2021
f6f1034
Add basic opponent deck tracking
Jonysegal Jul 2, 2021
37d566a
Add Opponent Upload Framework
Jonysegal Jul 2, 2021
1f74bc5
Add Upload to OverlayWindow
Jonysegal Jul 2, 2021
8bff9b8
Add passing in to Player
Jonysegal Jul 2, 2021
86ef4de
Control when to show upload opponent deck
Jonysegal Jul 2, 2021
adc08df
Add hovering control
Jonysegal Jul 3, 2021
29211f0
Position uploader
Jonysegal Jul 3, 2021
711ab2d
Control when uploader is shown
Jonysegal Jul 3, 2021
7bde4ce
Update opponent state text
Jonysegal Jul 3, 2021
b27d954
Adjust opponent upload to the right
Jonysegal Jul 3, 2021
b000a5f
Cleanup Code
Jonysegal Jul 3, 2021
1b6b8c6
Update UI
Jonysegal Jul 4, 2021
9b07f3e
Add state for updated ui
Jonysegal Jul 4, 2021
b49890a
Fix deck import error reporting
Jonysegal Jul 4, 2021
2369e95
Control auto showing the panel
Jonysegal Jul 4, 2021
1e8b3dd
Cleanup code
Jonysegal Jul 5, 2021
2921b0e
Control message visibility
Jonysegal Jul 5, 2021
50e6742
Fix panel visibility flickering
Jonysegal Jul 5, 2021
c89fcea
Adjust panel position
Jonysegal Jul 5, 2021
2d47836
Pass error out
Jonysegal Jul 5, 2021
8f449d2
Fix link button
Jonysegal Jul 5, 2021
147fbe7
Fix state updating
Jonysegal Jul 5, 2021
950456c
Fix DescriptorVisibility
Jonysegal Jul 5, 2021
92e83e1
Add localizations for hyperlink
Jonysegal Jul 5, 2021
9710e22
Cleanup code
Jonysegal Jul 5, 2021
02bc278
Revert "Fix panel visibility flickering"
Jonysegal Jul 5, 2021
436180f
Fix panel flickering
Jonysegal Jul 5, 2021
c1e9949
Pass where the show or hide originated
Jonysegal Jul 5, 2021
3c98254
Correct ui behavior
Jonysegal Jul 5, 2021
641b2d8
Reset error message on panel hide
Jonysegal Jul 6, 2021
32bf3b8
Localize error message
Jonysegal Jul 6, 2021
7645f0a
Persist detailed message on first non interacted session
Jonysegal Jul 6, 2021
829f0c5
Add config for showing panel in non friendly matches
Jonysegal Jul 6, 2021
dfd719f
Fix margin
Jonysegal Jul 6, 2021
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
Update opponent state text
  • Loading branch information
Jonysegal committed Jul 3, 2021
commit 7bde4ce7840066bcd04dbc1dbb75c4b6a80f576c
3 changes: 2 additions & 1 deletion Hearthstone Deck Tracker/Utility/OpponentUploadState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum OpponentUploadState
{
Initial,
UploadSucceeded,
Error
Error,
InKnownDeckMode
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ public static string GetStatusMessage(OpponentUploadState state)
switch(state)
{
case OpponentUploadState.Initial:
return "Init";
return "Upload your Opponent's Deck Id";
case OpponentUploadState.UploadSucceeded:
return "UploadSucceed";
return "Upload Successful";
case OpponentUploadState.InKnownDeckMode:
return "Return to No Opponent Deck Mode";
case OpponentUploadState.Error:
return "Err";
return "Deck Id parsing unsucessful.";
}
return "";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ private void InitializeCollections()

_clickableElements.Add(BattlegroundsMinionsPanel.BgTierIcons);
_clickableElements.Add(HeroNotificationPanel);
_clickableElements.Add(OpponentUpload);
_clickableElements.Add(MulliganNotificationPanel);
_clickableElements.Add(BobsBuddyDisplay);
_clickableElements.Add(OpponentUpload);

_hoverableElements.Add(StackPanelOpponent);
}
Expand Down