James Chen
cd4478f17c
Merge pull request #5327 from chuanweizhang2013/jsruntime
...
issue #3984 : Adds JS runtime and project-creator supports creating JS runtime.
2014-02-12 18:51:30 +08:00
chuanweizhang2013
ea82fa33e6
lower-case for StartRuntime and ReloadRuntime
2014-02-12 18:23:07 +08:00
samuele3hu
3d0fabe08c
issue #3708:Performance Test: data structure conversion in lua binding
2014-02-12 18:19:06 +08:00
James Chen
130c326811
Update CHANGELOG [ci skip]
2014-02-12 17:42:45 +08:00
James Chen
8ede1607a2
Merge pull request #5325 from boyu0/iss3988_physics_setRotation_bug
...
closed #3988 : fix bug Node::setRotation() moves opposite when node has a physics body.
2014-02-12 17:00:31 +08:00
boyu0
e7c077bb16
closed #3988 : fix indent.
2014-02-12 16:21:26 +08:00
zhangbin
bfce75f534
Merge branch 'develop' into ScenarioTest
2014-02-12 16:17:03 +08:00
zhangbin
d99af40c32
issue #3738 , Improve the performance test of game scenario.
2014-02-12 16:14:04 +08:00
boyu0
4fda8a2635
closed #3988 : add bug test
2014-02-12 15:57:02 +08:00
James Chen
bafc1369bf
Merge pull request #5333 from lmskater/fix_build_path
...
[Jenkins] fix build path
2014-02-12 13:06:35 +08:00
lm
3cc9235681
[Jenkins] fix build path
2014-02-12 12:49:30 +08:00
James Chen
0e1fb4fa44
Update AUTHORS [ci skip]
2014-02-12 09:22:57 +08:00
James Chen
8360d65f49
Merge pull request #5329 from azmeuk/fedora-glfw
...
GLFW include path for Fedora
2014-02-12 09:21:29 +08:00
Ricardo Quesada
0a2d701e9f
Update verts and calls every frame
2014-02-12 08:41:32 +08:00
Ricardo Quesada
1836375468
schemes are no longer shared
2014-02-12 08:26:22 +08:00
Ricardo Quesada
07764d03f9
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
2014-02-12 06:58:34 +08:00
Éloi Rivard
e992723758
GLFW include path for Fedora
2014-02-11 16:35:52 +01:00
chuanweizhang2013
a73d6ea81c
delete main.cpp
2014-02-11 18:16:46 +08:00
chuanweizhang2013
d5aee5eb04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
2014-02-11 18:08:14 +08:00
chuanweizhang2013
fcc78f39a1
add mac Simulator
2014-02-11 18:07:20 +08:00
boyu0
ea6edd5417
closed #3988 : fix bug Node::setRotation() moves opposite when node has a physics body.
2014-02-11 17:10:27 +08:00
heliclei
60faacab02
remove redundant return
2014-02-11 17:05:10 +08:00
heliclei
c39d9f57c8
add return
2014-02-11 17:00:09 +08:00
heliclei
f925bb17cf
add back prompts
2014-02-11 16:57:30 +08:00
heliclei
a0c3cbe054
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
2014-02-11 16:50:39 +08:00
heliclei
c15fdc3161
Merge pull request #1 from cocos2d/develop
...
merge upstream/develop
2014-02-11 16:41:41 +08:00
heliclei
e7679a62b0
fix console prompt
2014-02-11 16:41:12 +08:00
heliclei
4a2fd2b52d
fix console prompt
2014-02-11 16:14:49 +08:00
James Chen
4b2e6bbb72
Merge pull request #5323 from CocosRobot/updategeneratedsubmodule_1392100455
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-11 14:37:31 +08:00
CocosRobot
29bae34bc3
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-11 06:34:17 +00:00
James Chen
3028d75600
Update CHANGELOG [ci skip]
2014-02-11 14:32:22 +08:00
James Chen
1bf7b9a5bf
Merge pull request #5322 from dumganhar/merge5309
...
merge PR #5309 : use python script instead for auto generating binding codes.
2014-02-11 14:29:49 +08:00
James Chen
df0cf2f0ab
Merge commit 'refs/pull/5309/head' of git://github.com/cocos2d/cocos2d-x into merge5309
2014-02-11 14:13:04 +08:00
James Chen
d779aaa967
Defines NDK_ROOT and PYTHON_BIN in top level.
2014-02-11 14:12:13 +08:00
lihex
16ccf299dd
Merge pull request #4 from dumganhar/merge5309
...
Exports PYTHON_BIN variable.
2014-02-11 14:05:26 +08:00
James Chen
d8f89b8045
Exports PYTHON_BIN variable.
2014-02-11 14:02:34 +08:00
chuanweizhang2013
c0d3ce2b75
issue #3498 : commit jsruntime
2014-02-11 11:26:47 +08:00
heliclei
30942e9fba
set prompt for async console commands
2014-02-11 10:48:18 +08:00
lihex
69bc32a21d
Fix path on use 32bit windows ndk
2014-02-11 10:02:59 +08:00
lihex
93ebc4ff3b
Merge pull request #3 from lmskater/pull5309
...
[Jenkins] use python script instead for auto generating binding
2014-02-11 09:51:12 +08:00
Ricardo Quesada
ff802ed753
Merge pull request #5279 from edba/develop
...
Added getPropertiesForGID that assings value instead of returning it.
2014-02-10 12:19:47 -08:00
James Chen
6e56a56f64
Update AUTHORS [ci skip]
2014-02-10 21:54:27 +08:00
James Chen
0c58064bee
Merge pull request #5306 from azmeuk/gitignore
...
Ignore files generated by cmake
2014-02-10 21:52:40 +08:00
lm
d844f4f251
[Jenkins] use python script instead for auto generating binding
2014-02-10 19:18:27 +08:00
lihex
a0cd317d37
Merge pull request #1 from dumganhar/merge5309
...
Uses genbindings.py instead of genbindings.sh and genbindings.bat.
2014-02-10 18:35:23 +08:00
James Chen
c97b6cb197
Uses genbindings.py instead of genbindings.sh and genbindings.bat.
2014-02-10 18:30:22 +08:00
chuanweizhang2013
e9dd3d828a
issue #3498 : commit jsruntime
2014-02-10 18:15:30 +08:00
James Chen
f80f9bcd68
Merge pull request #5317 from CocosRobot/updategeneratedsubmodule_1392014528
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 17:42:23 +08:00
CocosRobot
12b5fba628
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 06:42:10 +00:00
James Chen
e90e0b0c23
Merge pull request #5312 from dumganhar/merge5268
...
closed #3716:PhysicsContact should be inherited from EventCustom, it will simplify the logic of emitting collision events
2014-02-10 14:37:43 +08:00