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

Jump to bottom

Resolved conflicts in PR #544 (volume blocks) #2289

Closed
wants to merge 22 commits into from
Closed

Resolved conflicts in PR #544 (volume blocks) #2289

wants to merge 22 commits into from

Commits on Jul 31, 2014

  1. fix jmoenig#405

    Gubolin committed Jul 31, 2014
    Copy the full SHA
    373edef View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2014

  1. typo - error bugfix

    Gubolin committed Aug 1, 2014
    Copy the full SHA
    450fd05 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2014

  1. change volume of active sounds

    Gubolin committed Aug 2, 2014
    Copy the full SHA
    a15885a View commit details
    Browse the repository at this point in the history

  2. volume reporter: show percent sign, add watcher

    Gubolin committed Aug 2, 2014
    Copy the full SHA
    8422272 View commit details
    Browse the repository at this point in the history

  3. volume blocks: add a gap

    Gubolin committed Aug 2, 2014
    Copy the full SHA
    c8d27ee View commit details
    Browse the repository at this point in the history

  4. add block to change volume

    Gubolin committed Aug 2, 2014
    Copy the full SHA
    2e00359 View commit details
    Browse the repository at this point in the history

  5. volume blocks: user sprite's volume, apply previous changes to stage

    Gubolin committed Aug 2, 2014
    Copy the full SHA
    cc2f9bc View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2014

  1. add volume out of bounds check

    Gubolin committed Aug 3, 2014
    Copy the full SHA
    a44775e View commit details
    Browse the repository at this point in the history

  2. Update gui.js

    @studej
    studej authored and Gubolin committed Aug 3, 2014
    Copy the full SHA
    f267c27 View commit details
    Browse the repository at this point in the history

  3. Update blocks.js

    @studej
    studej authored and Gubolin committed Aug 3, 2014
    Copy the full SHA
    b4ffac6 View commit details
    Browse the repository at this point in the history

  4. adjust indentation

    Gubolin committed Aug 3, 2014
    Copy the full SHA
    51387dd View commit details
    Browse the repository at this point in the history

  5. add mute functions

    Gubolin committed Aug 3, 2014
    Copy the full SHA
    b700eaa View commit details
    Browse the repository at this point in the history

  6. stay muted after volume change

    Gubolin committed Aug 3, 2014
    Copy the full SHA
    8acc6a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. allow changing the volume of notes

    Gubolin committed Aug 4, 2014
    Copy the full SHA
    90e62b4 View commit details
    Browse the repository at this point in the history

  2. mute notes

    Gubolin committed Aug 4, 2014
    Copy the full SHA
    5a485b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2014

  1. mute Notes immediately

    Gubolin committed Aug 5, 2014
    Copy the full SHA
    ad40076 View commit details
    Browse the repository at this point in the history

  2. Pause bug (fix jmoenig#440)

    Gubolin committed Aug 5, 2014
    Copy the full SHA
    cd6d755 View commit details
    Browse the repository at this point in the history

  3. fix another sound pause bug

    Gubolin committed Aug 5, 2014
    Copy the full SHA
    e2191d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2014

  1. fix another strange Note bug

    Gubolin committed Aug 6, 2014
    Copy the full SHA
    fc36ac7 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2014

  1. fix yet another note pause bug

    Gubolin committed Aug 8, 2014
    Copy the full SHA
    4013e79 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2014

  1. resolve merge conflict

    Gubolin committed Dec 7, 2014
    Copy the full SHA
    54d0194 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2018

  1. merged PR jmoenig#544

    @bromagosa
    bromagosa committed Dec 12, 2018
    Copy the full SHA
    0738c88 View commit details
    Browse the repository at this point in the history