issue #3498: commit jsruntime
set prompt for async console commands
issue #3498: commit jsruntime
fix console prompt
fix console prompt
Merge pull request #1 from cocos2d/develop

merge upstream/develop
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
add back prompts
add return
remove redundant return
closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body.
add mac Simulator
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
delete main.cpp
Uses Droid Sans Console font for FPS and more

* Uses Droid Sans Console: Size 10
* Don't scale up font even if content scale factor is bigger (not needed for FPS)
* Adds better labels in FPS console
schemes are no longer shared
Update verts and calls every frame
[Jenkins] fix build path
Merge pull request #5333 from lmskater/fix_build_path

[Jenkins] fix build path
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop