Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: celowsky/autodj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: celowsky/autodj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: zaruba
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 78 files changed
  • 2 contributors

Commits on Nov 17, 2015

  1. iteration2 commit for grading

    @AZaruba
    AZaruba committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    a137572 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. removed action bar at the top of the application

    @nilsreichert
    nilsreichert committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    1af241e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2015

  1. removed a lot of unnecessary files and cleaned up the XML

    @nilsreichert
    nilsreichert committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    5de6a48 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2015

  1. Composer is now smarter, switched around when sounds are loaded and c… 

    …hanged .wav files to .mp3 files. Overall improvement of clarity and consistency, with some slight improvements to the music theory component.
    @AZaruba
    AZaruba committed Dec 6, 2015
    Configuration menu
    Copy the full SHA
    86d4e75 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2015

  1. Android Studio is making me do this before I can unstash 

    my changes
    @nilsreichert
    nilsreichert committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    bd75d2c View commit details
    Browse the repository at this point in the history

  2. The play button toggles between play and pause, based on it's 

    current state. We also now have a loading screen that shows the
loading (the music files at the beginning) progress.
    @nilsreichert
    nilsreichert committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    cd20844 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Composer now generates a "hook," meaning an 8-measure melody that it … 

    …will play every fourth set of 8-measures.

The launcher now correctly loads sounds and transitioning between different sample sets works perfectly!
    @AZaruba
    AZaruba committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    b9d9681 View commit details
    Browse the repository at this point in the history

  2. Composer now generates a "hook," meaning an 8-measure melody that it … 

    …will play every fourth set of 8-measures.

The launcher now correctly loads sounds and transitioning between different sample sets works perfectly!
    @AZaruba
    AZaruba committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    8c646ba View commit details
    Browse the repository at this point in the history
Loading