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: Morgas01/TalePlay.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Morgas01/TalePlay.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: chrome
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 33 files changed
  • 1 contributor

Commits on Mar 5, 2015

  1. build

    @Morgas01
    Morgas01 committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    65f6b36 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2015

  1. Merge branch 'master' into chrome 

    Conflicts:
	src/GUI/TalePlay.GUIElement.ControllerConfig.js
	src/GUI/TalePlay.GUIElement.Map.js
	src/GUI/TalePlay.GUIElement.Menu.js
	src/Morgas
	src/RPGPlayer/TalePlay.RPGPlayer.js
	src/TalePlay.Controller.Gamepad.js
	src/TalePlay.Controller.Keyboard.js
	src/minigames/TimeStroke.js
    @Morgas01
    Morgas01 committed May 9, 2015
    Configuration menu
    Copy the full SHA
    2cdc29f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2015

  1. merge changes

    @Morgas01
    Morgas01 committed May 10, 2015
    Configuration menu
    Copy the full SHA
    00b50e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. merged master

    @Morgas01
    Morgas01 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    7f61493 View commit details
    Browse the repository at this point in the history

  2. chrome fixes

    @Morgas01
    Morgas01 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    acb41b5 View commit details
    Browse the repository at this point in the history

  3. chrome fixes

    @Morgas01
    Morgas01 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    6fc2dbd View commit details
    Browse the repository at this point in the history

  4. chrome fixes

    @Morgas01
    Morgas01 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    a360392 View commit details
    Browse the repository at this point in the history

  5. chrome fixes

    @Morgas01
    Morgas01 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    ceb1697 View commit details
    Browse the repository at this point in the history
Loading