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.

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

raidboss: refactor trigger loading #5047

Closed
wants to merge 20 commits into from
Closed

raidboss: refactor trigger loading #5047

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
033afa1
merge #5038
trim21 Nov 1, 2022
c89701e
merge #5045
trim21 Nov 1, 2022
eec49c3
real change of this PR
trim21 Nov 1, 2022
7cac6c5
handle trigger override
trim21 Nov 2, 2022
3915822
use map to handle added trigger
trim21 Nov 2, 2022
c448a95
remove dead code
trim21 Nov 2, 2022
06aafa8
Update ui/raidboss/popup-text.ts
trim21 Nov 2, 2022
9453c34
Update ui/raidboss/popup-text.ts
trim21 Nov 2, 2022
54d6bf1
Merge remote-tracking branch 'upstream/main' into refactor-trigger-lo…
trim21 Nov 2, 2022
4fdec62
some code review
trim21 Nov 2, 2022
849c070
fix LooseTimelineTrigger
trim21 Nov 2, 2022
a1259ca
fix undefined id
trim21 Nov 2, 2022
263476d
fix always true case
trim21 Nov 2, 2022
a85117b
fix always true case
trim21 Nov 2, 2022
0d52a72
read from user set filename first
trim21 Nov 2, 2022
e9fb6e9
avoid override
trim21 Nov 2, 2022
2fec0f4
wip
trim21 Nov 3, 2022
3ade816
wip
trim21 Nov 4, 2022
e6f9d8f
code review
trim21 Nov 4, 2022
ecbffef
Update ui/raidboss/raidboss_options.ts
trim21 Nov 5, 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
2 changes: 1 addition & 1 deletion ui/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export type ConfigLooseTrigger = LooseTrigger & LooseTimelineTrigger & {

export type ConfigLooseTriggerSet = LooseTriggerSet & {
filename?: string;
isUserTriggerSet?: boolean;
loaded?: boolean;
};

export type ConfigLooseOopsyTrigger = LooseOopsyTrigger;
Expand Down
Loading