Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,210 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

16210 Commits

Author SHA1 Message Date
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
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
Éloi Rivard e992723758 GLFW include path for Fedora 2014-02-11 16:35:52 +01: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
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
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
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
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
James Chen 6f81e7f304 Merge pull request #5256 from Dhilan007/develop_label 
Label::reduce unnecessary calculation amount.
 2014-02-10 14:08:49 +08:00
James Chen 263464e7b2 Merge pull request #5315 from CocosRobot/updategeneratedsubmodule_1392011921 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-10 14:03:34 +08:00
CocosRobot 4f54b36127 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 05:58:44 +00:00
James Chen 9e42285d63 Merge pull request #5314 from dumganhar/develop 
Compilation error fix after merging PR #5311
 2014-02-10 13:53:57 +08:00
James Chen a05cd6fbb2 Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311 2014-02-10 12:53:08 +08:00
lihex b06d54f706 issue #3781, use custom python executeable if PYTHON_BIN defined 2014-02-10 12:50:23 +08:00
Dhilan007 47e16728cc reduce unnecessary calculation amount. 2014-02-10 12:38:32 +08:00
Dhilan007 6a662a6330 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-02-10 11:47:05 +08:00
Ricardo Quesada a7b853e360 Merge pull request #5311 from ricardoquesada/gl_vertices 
Gl vertices
 2014-02-09 19:41:11 -08:00
Ricardo Quesada 68143d3093 re-add missing assert 2014-02-09 19:39:56 -08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Dhilan007 e12c1f57ac Label::reduce unnecessary calculation amount. 2014-02-10 11:21:54 +08:00
James Chen 3b57f897d9 Merge pull request #5310 from dumganhar/event-disp-typo 
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
 2014-02-10 11:19:45 +08:00
James Chen 9a02568eca Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners. 2014-02-10 11:15:56 +08:00
James Chen a1aa4b9b8a Update CHANGELOG [ci skip] 2014-02-10 11:05:09 +08:00
James Chen db91ec9183 Update AUTHORS [ci skip] 2014-02-10 11:04:23 +08:00
James Chen eda4c9a420 Merge pull request #5302 from Pisces000221/improve-label-chinese 
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
 2014-02-10 11:03:03 +08:00
Ricardo Quesada 1c4321304c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:01:55 -08:00