Skip to content

Add legend #7

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.

Sign up for GitHub

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

Merged
omundy merged 5 commits into from
Dec 17, 2020
Merged

Add legend #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d49658
Clean up monster spritesheets
omundy Dec 16, 2020
6c77c42
Updates data
omundy Dec 16, 2020
b7f06d8
Adds ColorManager, new palette
omundy Dec 16, 2020
78e7038
Adds legend
omundy Dec 16, 2020
4bf8ae2
Meta data updates
omundy Dec 16, 2020
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
Adds legend
  • Loading branch information
@omundy
omundy committed Dec 16, 2020
commit 78e70381c28f0479966bebddbc712a337b08f4b9
29 changes: 29 additions & 0 deletions Assets/_Project/Input/TallyInputSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ public @TallyInputSystem()
""processors"": """",
""interactions"": """"
},
{
""name"": ""LegendToggle"",
""type"": ""Button"",
""id"": ""e86e3c98-d0cf-4fc0-a4f5-8b429f676d00"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""FeedToggle"",
""type"": ""Button"",
Expand Down Expand Up @@ -266,6 +274,17 @@ public @TallyInputSystem()
""action"": ""TimelineToggle"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""8c7ae6a2-a730-4579-99b8-8c05c4e88196"",
""path"": ""<Keyboard>/l"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""LegendToggle"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
Expand Down Expand Up @@ -581,6 +600,7 @@ public @TallyInputSystem()
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
m_UI_Quit = m_UI.FindAction("Quit", throwIfNotFound: true);
m_UI_ControlToggle = m_UI.FindAction("ControlToggle", throwIfNotFound: true);
m_UI_LegendToggle = m_UI.FindAction("LegendToggle", throwIfNotFound: true);
m_UI_FeedToggle = m_UI.FindAction("FeedToggle", throwIfNotFound: true);
m_UI_TimelineToggle = m_UI.FindAction("TimelineToggle", throwIfNotFound: true);
// Player
Expand Down Expand Up @@ -732,6 +752,7 @@ public void SetCallbacks(IDebugActions instance)
private IUIActions m_UIActionsCallbackInterface;
private readonly InputAction m_UI_Quit;
private readonly InputAction m_UI_ControlToggle;
private readonly InputAction m_UI_LegendToggle;
private readonly InputAction m_UI_FeedToggle;
private readonly InputAction m_UI_TimelineToggle;
public struct UIActions
Expand All @@ -740,6 +761,7 @@ public struct UIActions
public UIActions(@TallyInputSystem wrapper) { m_Wrapper = wrapper; }
public InputAction @Quit => m_Wrapper.m_UI_Quit;
public InputAction @ControlToggle => m_Wrapper.m_UI_ControlToggle;
public InputAction @LegendToggle => m_Wrapper.m_UI_LegendToggle;
public InputAction @FeedToggle => m_Wrapper.m_UI_FeedToggle;
public InputAction @TimelineToggle => m_Wrapper.m_UI_TimelineToggle;
public InputActionMap Get() { return m_Wrapper.m_UI; }
Expand All @@ -757,6 +779,9 @@ public void SetCallbacks(IUIActions instance)
@ControlToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
@ControlToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
@ControlToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnControlToggle;
@LegendToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
@LegendToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
@LegendToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnLegendToggle;
@FeedToggle.started -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
@FeedToggle.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
@FeedToggle.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnFeedToggle;
Expand All @@ -773,6 +798,9 @@ public void SetCallbacks(IUIActions instance)
@ControlToggle.started += instance.OnControlToggle;
@ControlToggle.performed += instance.OnControlToggle;
@ControlToggle.canceled += instance.OnControlToggle;
@LegendToggle.started += instance.OnLegendToggle;
@LegendToggle.performed += instance.OnLegendToggle;
@LegendToggle.canceled += instance.OnLegendToggle;
@FeedToggle.started += instance.OnFeedToggle;
@FeedToggle.performed += instance.OnFeedToggle;
@FeedToggle.canceled += instance.OnFeedToggle;
Expand Down Expand Up @@ -879,6 +907,7 @@ public interface IUIActions
{
void OnQuit(InputAction.CallbackContext context);
void OnControlToggle(InputAction.CallbackContext context);
void OnLegendToggle(InputAction.CallbackContext context);
void OnFeedToggle(InputAction.CallbackContext context);
void OnTimelineToggle(InputAction.CallbackContext context);
}
Expand Down
19 changes: 19 additions & 0 deletions Assets/_Project/Input/TallyInputSystem.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,14 @@
"processors": "",
"interactions": ""
},
{
"name": "LegendToggle",
"type": "Button",
"id": "e86e3c98-d0cf-4fc0-a4f5-8b429f676d00",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "FeedToggle",
"type": "Button",
Expand Down Expand Up @@ -253,6 +261,17 @@
"action": "TimelineToggle",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8c7ae6a2-a730-4579-99b8-8c05c4e88196",
"path": "<Keyboard>/l",
"interactions": "",
"processors": "",
"groups": "",
"action": "LegendToggle",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand Down
264 changes: 264 additions & 0 deletions Assets/_Project/Prefabs/UI/ColorText.prefab
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Assets/_Project/Prefabs/UI/ColorText.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading