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

Alternate speeds #966

Closed
wants to merge 68 commits into from
Closed

Alternate speeds #966

wants to merge 68 commits into from

Commits on Sep 6, 2016

  1. WIP - TIMINGS replace speed

     Conflicts:
    	engine/src/chaserrunner.h
    	engine/src/function.cpp
    	engine/src/function.h
    	engine/src/rgbmatrix.cpp
    	engine/src/scene.cpp
    plugz committed Sep 6, 2016
    Copy the full SHA
    4ca4446 View commit details
    Browse the repository at this point in the history
  2. remove total duration

    plugz committed Sep 6, 2016
    Copy the full SHA
    674363b View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. build OK

    plugz committed Sep 14, 2016
    Copy the full SHA
    0dd60ef View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

  1. fix chaserstep default timings

    plugz committed Sep 15, 2016
    Copy the full SHA
    827927f View commit details
    Browse the repository at this point in the history
  2. Remove useless LegacySpeed

    plugz committed Sep 15, 2016
    Copy the full SHA
    480ac15 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2016

  1. Fix unit tests passing

    * Chaser: save duration mode
    * ChaserStep: fix fromVariant
    * FunctionTimings: restore "Duration" loading
    plugz committed Sep 20, 2016
    Copy the full SHA
    366473b View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Group FadeIn, FadeOut and Hold into FunctionSpeeds

    Rename timing to speed
    
    Add Function::speeds() and Function::speedsEdit() to get/set speeds
    
    Add -std=c++11 to get the float utils
    plugz committed Jan 17, 2017
    Copy the full SHA
    af0c9bf View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. WIP alternatespeeds

    plugz committed Apr 25, 2017
    Copy the full SHA
    f9c7efe View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. Copy the full SHA
    04493df View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2017

  1. Fix build

    * Fix merge issues
    * Add alternateSpeed* in function implementations
    plugz committed Apr 28, 2017
    Copy the full SHA
    973ec8e View commit details
    Browse the repository at this point in the history
  2. Fix unit test passing

    plugz committed Apr 28, 2017
    Copy the full SHA
    96fd9d1 View commit details
    Browse the repository at this point in the history
  3. remove alternateSpeedsBase

    overrideSpeeds is an override of m_speeds
    it is not an alternate speed
    plugz committed Apr 28, 2017
    Copy the full SHA
    458f9ed View commit details
    Browse the repository at this point in the history
  4. WIP - make use of alternateSpeeds

    * RGBMatrix: done
    * EFX: todo
    * Chaser: todo
    
    also:
    * add innerSpeeds/commonSpeeds helpers
    * alternateSpeedsEdit now returns a FunctionSpeedsEditProxy
    plugz committed Apr 28, 2017
    Copy the full SHA
    5998852 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2017

  1. WIP - make use of alternateSpeeds

    EFX done
    plugz committed Apr 29, 2017
    Copy the full SHA
    c792985 View commit details
    Browse the repository at this point in the history
  2. WIP - make use of alternateSpeeds

    chaser done
    sequence todo
    plugz committed Apr 29, 2017
    Copy the full SHA
    15e231a View commit details
    Browse the repository at this point in the history

Commits on May 1, 2017

  1. Make use of alternateSpeeds

    sequence done
    plugz committed May 1, 2017
    Copy the full SHA
    faa21b2 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'mcallegari/master' into alternateSpeeds

    * move tempo tests from function_test to functionspeeds_test
    * fix speed beatsToMs utils
    plugz committed May 1, 2017
    Copy the full SHA
    c684570 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b18f617 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ecc7987 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    2c8af34 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    443b8b4 View commit details
    Browse the repository at this point in the history
  7. Fix functionselection fill

    plugz committed May 1, 2017
    Copy the full SHA
    f175d57 View commit details
    Browse the repository at this point in the history
  8. Fix VCSpeedDialFunction loadXML

    legacy VCSpeedDialFunction (without alternateSpeedsIdx)
    are loaded as inner speeds for chaser, efx and rgbmatrix
    plugz committed May 1, 2017
    Copy the full SHA
    af2e6ac View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. Copy the full SHA
    627caac View commit details
    Browse the repository at this point in the history

Commits on May 5, 2017

  1. Copy the full SHA
    3ac09dc View commit details
    Browse the repository at this point in the history

Commits on May 7, 2017

  1. rgbmatrix: remove resetElapsed

    In order to be able to use outer speeds,
    the elapsed timer should be kept unreseted from
    the start of the function.
    
    Add roundTime() and roundBeats() helpers
    to keep track of time in the current step.
    plugz committed May 7, 2017
    Copy the full SHA
    947a5ad View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    3c7f74d View commit details
    Browse the repository at this point in the history

Commits on May 10, 2017

  1. +multispeeddialwidget

    plugz committed May 10, 2017
    Copy the full SHA
    00c79b5 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ac8e619 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2017

  1. Copy the full SHA
    349fca5 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. Copy the full SHA
    25e5733 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. Copy the full SHA
    bcb52c6 View commit details
    Browse the repository at this point in the history
  2. Fix speed type loading

    plugz committed May 17, 2017
    Copy the full SHA
    3f92ebf View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    046ec5f View commit details
    Browse the repository at this point in the history
  4. verbose debug tweak

    plugz committed May 17, 2017
    Copy the full SHA
    c78e16e View commit details
    Browse the repository at this point in the history
  5. verbose chaser debug

    plugz committed May 17, 2017
    Copy the full SHA
    d6edce6 View commit details
    Browse the repository at this point in the history
  6. Remove chaser startIntensity

    plugz committed May 17, 2017
    Copy the full SHA
    656267e View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. Copy the full SHA
    e355462 View commit details
    Browse the repository at this point in the history
  2. vccuelist: fix primaryintensity

    plugz committed May 18, 2017
    Copy the full SHA
    36eba2d View commit details
    Browse the repository at this point in the history
  3. add outerSpeeds in efxeditor

    plugz committed May 18, 2017
    Copy the full SHA
    80c50c4 View commit details
    Browse the repository at this point in the history
  4. use outer fadein/fadeout in efx

    plugz committed May 18, 2017
    Copy the full SHA
    16f6989 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. Restore mcallegari#699

    overrideSpeeds override outer speeds, not inner speeds
    -> the issue caused by mcallegari#699 is fixed
    plugz committed May 19, 2017
    Copy the full SHA
    d7174a4 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e478d1f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    1c2ad6b View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    7eeb6c0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2017

  1. Copy the full SHA
    1fe58e4 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    46ac421 View commit details
    Browse the repository at this point in the history
  3. Remove remaining occurences of alternateSpeeds(0)

    This is now overrideSpeeds()
    plugz committed May 22, 2017
    Copy the full SHA
    4a38b60 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. Add comments in function.h

    plugz committed May 30, 2017
    Copy the full SHA
    3236330 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a79fe3c View commit details
    Browse the repository at this point in the history
  3. fix build

    * use Q_GADGET instead of Q_OBJECT macro to allow the use of Q_ENUM
    * renameAttribute is public
    plugz committed May 30, 2017
    Copy the full SHA
    6c0c9c9 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    9f8956c View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. add comments in rgbmatrix.h

    plugz committed Jun 1, 2017
    Copy the full SHA
    33c7567 View commit details
    Browse the repository at this point in the history
  2. Add comments in efx.h

    plugz committed Jun 1, 2017
    Copy the full SHA
    8f4c1bd View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    682d3dc View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. Audio: fix time in showmanager

    * old "totalDuration" is now "audioDuration"
    plugz committed Jun 9, 2017
    Copy the full SHA
    e6ba970 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. Restore totalDuration in chaser

    * Chaser::totalDuration is renamed to totalRoundDuration
    plugz committed Jun 12, 2017
    Copy the full SHA
    8df98fb View commit details
    Browse the repository at this point in the history
  2. Fix show EFXItem

    Use EFX innerSpeeds, like it was done before
    plugz committed Jun 12, 2017
    Copy the full SHA
    6808890 View commit details
    Browse the repository at this point in the history
  3. Show RGBMatrixItem: fix duration

    Restore RGBMatrix::totalDuration() as totalRoundDuration()
    plugz committed Jun 12, 2017
    Copy the full SHA
    9b0b03d View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Copy the full SHA
    d3ff00d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Fix overlapping checks

    plugz committed Jun 14, 2017
    Copy the full SHA
    390817d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Copy the full SHA
    33b2afc View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Fix qmlui build

    * Function: add totalRoundDuration(), formerly totalDuration().
    ** totalRoundDuration() is the duration of the function
       if run in "one shot" mode.
    
    * Speed: rename switchTempoType to setTempoType to match with
      FunctionSpeeds::setTempType
    
    * Update calls to Function::fadeInSpeed() and friends
    plugz committed Jun 23, 2017
    Copy the full SHA
    a5f5ee6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    db8c52e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. Copy the full SHA
    bdbe4fc View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. Copy the full SHA
    2ede682 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. Copy the full SHA
    d176558 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    faf2e3a View commit details
    Browse the repository at this point in the history