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

Commits on Feb 10, 2012

  1. Added ScriptingExample.

    Nicolas Gramlich committed Feb 10, 2012
    Configuration menu
    Copy the full SHA
    a13e1ff View commit details
    Browse the repository at this point in the history

  2. Updated AndroidManifest.xml and strings.xml.

    Nicolas Gramlich committed Feb 10, 2012
    Configuration menu
    Copy the full SHA
    9ef94b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. Merged GLES2 changes into GLES2-Scripting.

    Nicolas Gramlich committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    dda53e9 View commit details
    Browse the repository at this point in the history

  2. Added missing string resources.

    Nicolas Gramlich committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    1903a99 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2012

  1. Updated TextBreakExample.

    Nicolas Gramlich committed Feb 23, 2012
    Configuration menu
    Copy the full SHA
    05a5b19 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2012

  1. ScriptingExample now using GLES2-JavaScriptCore branch of AndEngineSc… 

    …riptingExtension.
    Nicolas Gramlich committed Mar 1, 2012
    Configuration menu
    Copy the full SHA
    0d8047b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2012

  1. Minor changes due to AndEngine changes.

    Nicolas Gramlich committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    e97e0d5 View commit details
    Browse the repository at this point in the history

  2. Updated ScriptingExample.

    Nicolas Gramlich committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    3e71933 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2012

  1. Minor changes.

    Nicolas Gramlich committed Mar 8, 2012
    Configuration menu
    Copy the full SHA
    6f2429a View commit details
    Browse the repository at this point in the history

  2. Updated ScriptingExamle to latest AndEngineScriptingExtension@GLES2-J… 

    …avaScriptCore.
    Nicolas Gramlich committed Mar 8, 2012
    Configuration menu
    Copy the full SHA
    e0fb126 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2012

  1. Added CardinalSplineMoveModifierExample.

    Nicolas Gramlich committed Mar 21, 2012
    Configuration menu
    Copy the full SHA
    4e44941 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2012

  1. Merged GLES2 into GLES2-Scripting.

    Nicolas Gramlich committed Mar 23, 2012
    Configuration menu
    Copy the full SHA
    c1591a6 View commit details
    Browse the repository at this point in the history

  2. Fixed merge fail.

    Nicolas Gramlich committed Mar 23, 2012
    Configuration menu
    Copy the full SHA
    3eac01b View commit details
    Browse the repository at this point in the history

  3. Fixed merge fail (this time for real).

    Nicolas Gramlich committed Mar 23, 2012
    Configuration menu
    Copy the full SHA
    8b46e33 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2012

  1. Merge branch 'GLES2' into GLES2-Scripting

    Nicolas Gramlich committed Mar 29, 2012
    Configuration menu
    Copy the full SHA
    b2cb738 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. Updated SriptingExample. Added default code for ScriptingExample, whi… 

    …ch is creating an Entity.
    Nicolas Gramlich committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    1e4a1b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2012

  1. Updated ScriptingExample.

    Nicolas Gramlich committed Apr 2, 2012
    Configuration menu
    Copy the full SHA
    cd71689 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2012

  1. Changes due to AndEngine changes.

    Nicolas Gramlich committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    cf46165 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2013

  1. Updated .gitignore for future Android Studio support.

    Nicolas Gramlich committed May 17, 2013
    Configuration menu
    Copy the full SHA
    073d88e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2013

  1. Added crashlytics xml file to gitignore.

    Nicolas Gramlich committed Jun 8, 2013
    Configuration menu
    Copy the full SHA
    9efedec View commit details
    Browse the repository at this point in the history
Loading