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

Update attributes.json #122

Merged
merged 48 commits into from
Aug 22, 2024
Merged

Conversation

reneberhorst
Copy link
Contributor

The attribute file with extended explanation and links to visuals for further description...

@petrvanekrobe petrvanekrobe force-pushed the Attribute-with-extended-explanation branch from 2b102c7 to 59baa5c Compare August 24, 2022 09:48
@petrvanekrobe petrvanekrobe force-pushed the Attribute-with-extended-explanation branch from 4832626 to 1abb4f7 Compare February 25, 2023 15:25
@petrvanekrobe petrvanekrobe force-pushed the Attribute-with-extended-explanation branch from 0d2423f to 9fbdd75 Compare January 8, 2024 09:56
@petrvanekrobe
Copy link
Contributor

@moritzstaffel I have rebased and resolved conflicts here. I test rebased in onto main and it applies cleanly. As i rebased it, it will be applied with correct date and attribution at the an of the commit three. Question is whether we need all the separate commits or if we want to squash the commits (attribution will be lost, unless we add Co-authored-by: to the squashed commit itself). What do you think?

petrvanekrobe and others added 22 commits August 22, 2024 14:26
- Fixture Global Reset, Dimmer Reset, Shutter Reset, Beam Reset
- Color Mix Reset, Color Wheel Reset, Focus Reset, Frame Reset
- G Reset, Intensity Reset, Iris Reset, Pos Reset, Pan Reset, Tilt Reset
- Zoom  Reset, CTB Reset, CTO Reset, CTC Reset, Anim Sytem Reset
- Fixture  Calibration Reset, Function, Lamp Ctrl, Display Int, DMX Input
- NoFeature, Dummy, Reflector Adj
…se, IrisPulseOpen, IrisRandomPulseClose, IrisRandomPulseOpen
…r, CRI Mode, ColorUniform, Color Ctrl Rst, ColorModel
Added Attribute explanations
…Effects, AnimationWheel(n)SelectShake, AnimationWheel(n)SelectSpin
Added explanations for 'Gobo(n)SelectSpin' and 'Gobo(n)SelectShake' attributes
added explanations for "ColorEffects(n)" and "PlaySpeed" attributes
@petrvanekrobe petrvanekrobe force-pushed the Attribute-with-extended-explanation branch from 18e0421 to 59908c8 Compare August 22, 2024 12:27
@petrvanekrobe petrvanekrobe changed the base branch from matrix-fixture to main August 22, 2024 12:29
@petrvanekrobe petrvanekrobe merged commit 6e53ca4 into main Aug 22, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants