resolve conflicts, Fix OpenGL status#15

Merged

rryan merged 113 commits into

rryan:qopenglwidgetfrom

daschuer:qopenglwidget

Apr 12, 2020

Commits on Oct 2, 2018

added color column to properties dlg but UI and DB dont update
Swiftb0y
committed

Commits on Oct 4, 2018

fixed functionality broken by previous commit.
Swiftb0y
committed

Commits on Oct 6, 2018

woverview waveformsmarks will now reflect their hotcue color
Swiftb0y
committed
markproperties.m_textColor is now the same color as the mark itself; fixed codefactor issues
Swiftb0y
committed

Commits on Oct 13, 2018

followed daschauers request to VERIFY_OR_DEBUG_ASSERT in a case
Swiftb0y
committed
followed uklotzde change requests in widget/woverview
Swiftb0y
committed

Commits on Oct 14, 2018

fixed redundant blank line (codefactor complained)
Swiftb0y
committed
fixed inverted VERIFY_OR_DEBUG Statement
Swiftb0y
committed
Added R/W ControlObject for the HotcueColor
Swiftb0y
committed

Commits on Oct 18, 2018

contrastLineColor of Markers now adapt to MarkerColor Brightness
Swiftb0y
committed

Commits on Oct 19, 2018

Removed Comment in cuecontrol.cpp
Swiftb0y
committed
the marker number color is now set by the skin again, not the m_color
Swiftb0y
committed
moved brightness function to color.h; rendermark textColor adapts now
Swiftb0y
committed

Commits on Oct 20, 2018

Color is now settable via ComboBox in trackpropertie cuepoints table.
Swiftb0y
committed
added more utility functions to util/color.h
Swiftb0y
committed

Commits on Oct 21, 2018

minor changes for performance and codefactor
Swiftb0y
committed

Commits on Dec 30, 2018

Let skins override cue colors

ferranlala
authored and
Swiftb0y
committed
Add example, revert before merge.

ferranlala
authored and
Swiftb0y
committed
Improve color methods efficiency

ferranlala
authored and
Swiftb0y
committed
Rename Color::defaultRepresentation() to makeDefaultRepresentation()

ferranlala
authored and
Swiftb0y
committed
Let skins override cue colors on overview

ferranlala
authored and
Swiftb0y
committed
Append "Cue" to the skin node name for waveform cue color overrides

ferranlala
authored and
Swiftb0y
committed
Revert "Add example, revert before merge."

ferranlala
authored and
Swiftb0y
committed
Fix WOverview cue colors not being mapped after skin reload

ferranlala
authored and
Swiftb0y
committed
Convert color lists to static const vars

ferranlala
authored and
Swiftb0y
committed
Reduce the number of runtime copies of ColorsRepresentation

ferranlala
authored and
Swiftb0y
committed
Move setupCueColorsRepresentation() to SkinContext

ferranlala
authored and
Swiftb0y
committed

Commits on Jan 1, 2019

Added JS utility object for dealing with hotcue colors from MixxxControl
Swiftb0y
committed

Commits on Jan 25, 2019

Merge branch 'master' into Enable-Setting-hotcue-color-via-controlobject
ferranlala
committed

Commits on Jan 27, 2019

Reduce number of colors
ferranlala
committed

Commits on Jan 29, 2019

use QstringLiteral to to fix FormatKiloSeconds on windows where the utf8 encoding fails
daschuer
committed

Commits on Feb 1, 2019

Add default cue color in PredefinedColorsMap
ferranlala
committed

Commits on Feb 10, 2019

Commits on Feb 11, 2019

Improve function naming and reword log message
uklotzde
committed
Merge branch 'master' into Enable-Setting-hotcue-color-via-controlobject
Ferran Pujol Camins
committed

Commits on Feb 12, 2019

Add JS api for cue colors
Ferran Pujol Camins
committed

Commits on Feb 13, 2019

Commits on Feb 14, 2019

Commits on Feb 16, 2019

Commits on Feb 19, 2019

Commits on Feb 20, 2019

Merge pull request #2034 from uklotzde/beats_classes
daschuer
authored

Commits on Feb 21, 2019

Merge remote-tracking branch 'upstream/master' into qopenglwidget
daschuer
committed

Commits on Feb 23, 2019

Commits on Feb 24, 2019

Merge branch 'star-co' of https://github.com/ronso0/mixxx into qopenglwidget
daschuer
committed