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: pxscene/pxCore2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: topcoderinc/pxCore
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 4 files changed
  • 3 contributors

Commits on May 16, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed May 16, 2018
    Configuration menu
    Copy the full SHA
    20eff95 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    09921f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    b8fd0ef View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Nov 12, 2018
    Configuration menu
    Copy the full SHA
    0090267 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Nov 13, 2018
    Configuration menu
    Copy the full SHA
    1724307 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    6537dea View commit details
    Browse the repository at this point in the history

  2. Add in some additional integration code to help with demos not workin… 

    …g properly.
    @jmgasper
    jmgasper committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    b7b6cd2 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    74b25bd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    992130f View commit details
    Browse the repository at this point in the history

  3. v8 bug fixs

    @jiangliwu
    jiangliwu committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    1fcf8f8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'px-master-target' into px-m

    @jiangliwu
    jiangliwu committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    ab3d8b1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into px-m 

    # Conflicts:
#	examples/pxScene2d/src/v8_modules/native_http_wrap.js
#	examples/pxScene2d/src/v8_modules/path.js
    @jiangliwu
    jiangliwu committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    97a5ad2 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Merge pull request #245 from jiangliwu/_v8_fix 

    V8 fix
    @jmgasper
    jmgasper authored Dec 3, 2018
    Configuration menu
    Copy the full SHA
    341ea57 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2018

  1. Merge branch 'master' into master

    Michael Fiess authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    e4d302f View commit details
    Browse the repository at this point in the history

  2. Update AppSceneContext.js

    Michael Fiess authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    c810c6e View commit details
    Browse the repository at this point in the history

  3. Update rtHttpResponse.h

    Michael Fiess authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    447d39b View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2018

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	examples/pxScene2d/src/rcvrcore/AppSceneContext.js
#	examples/pxScene2d/src/v8_modules/http.js
#	examples/pxScene2d/src/v8_modules/https.js
#	examples/pxScene2d/src/v8_modules/native_http_wrap.js
#	examples/pxScene2d/src/v8_modules/pako.js
#	examples/pxScene2d/src/v8_modules/process.js
    @jmgasper
    jmgasper committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    95190f8 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    6deb37a View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @jmgasper
    jmgasper committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    7e9ce66 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. Merge branch 'master' of https://github.com/pxscene/pxCore

    @jmgasper
    jmgasper committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    d331293 View commit details
    Browse the repository at this point in the history
Loading