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

18142 Commits

Author SHA1 Message Date
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash 
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
 2014-03-19 17:57:40 +08:00
andyque 2f5e9ed654 modify job-comment-trigger to support [console]. 2014-03-19 17:57:19 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
James Chen d523fc6a2a Update CHANGELOG [ci skip] 2014-03-19 17:46:52 +08:00
James Chen 7ad17e1e69 Merge pull request #5868 from dumganhar/iss4447 
closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window
 2014-03-19 17:46:49 +08:00
James Chen 09a98df063 Merge pull request #5869 from dumganhar/iss4448-scrollview 
closed #4448: Elastic bounce back effect support for cocos2d::extension::ScrollView.
 2014-03-19 17:42:58 +08:00
samuele3hu a1ca3195ce Rename `addConsoleHandler` to `addCustomHandler` 2014-03-19 17:28:23 +08:00
James Chen f7e003758f issue #4448: Respond to move event if dragging is enabled, no matter whether mouse is in the content of cocos2d::extension::ScrollView. 2014-03-19 17:11:34 +08:00
James Chen 02ee3a52eb closed #4448: Elastic bounce back effect support for cocos2d::extension::ScrollView. 2014-03-19 17:11:34 +08:00
James Chen 740aa30713 closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window 2014-03-19 17:09:10 +08:00
andyque c90ef00668 add bool support for other platform 2014-03-19 16:47:57 +08:00
andyque bab53ef2bd add test for ios and mac 2014-03-19 16:47:57 +08:00
andyque cadbfbe9b1 add Bool Integer Float Double support to CCDictionary 2014-03-19 16:47:57 +08:00
andyque 00249328a6 add boolean support for mac and ios 2014-03-19 16:47:57 +08:00
Huabing.Xu dc9baa7c72 closed #4382: added missed scaleZ feature for scaleZ 2014-03-19 16:23:14 +08:00
James Chen 5b53197e1c Merge commit 'refs/pull/5856/head' of git://github.com/cocos2d/cocos2d-x into merge5856 2014-03-19 15:18:44 +08:00
James Chen d5327c2465 Update CHANGELOG [ci skip] 2014-03-19 14:54:06 +08:00
James Chen de28786e6d Merge pull request #5864 from CocosRobot/update_lua_bindings_1395209593 
[AUTO]: updating luabinding automatically
 2014-03-19 14:24:32 +08:00
CocosRobot f0fdcb22d3 [AUTO]: updating luabinding automatically 2014-03-19 06:14:23 +00:00
James Chen 7061641dd8 Merge pull request #5860 from Dhilan007/develop_label 
closed #4434: Label's color is incorrect if it's created by font name
 2014-03-19 14:09:32 +08:00
James Chen 863272b1c8 Merge pull request #5855 from lmskater/fix-android-build 
[Jenkins] build all samples on android
 2014-03-19 12:01:37 +08:00
James Chen 05db740d2f Merge pull request #5837 from linchaogithub/develop 
[jenkins-watchdog] update
 2014-03-19 12:01:13 +08:00
samuele3hu a432f488bd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-19 10:51:42 +08:00
samuele3hu a91994f242 Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest. 2014-03-19 10:50:11 +08:00
Dhilan007 bb17da8f88 add override for Label::updateDisplayedColor 2014-03-19 10:36:44 +08:00
Dhilan007 f76460aee8 closed issue#4434:fixed display incorrect color of label if create by font name. 2014-03-19 10:10:47 +08:00
James Chen ab47c34f5f Merge pull request #5859 from CocosRobot/update_lua_bindings_1395194145 
[AUTO]: updating luabinding automatically[ci skip]
 2014-03-19 10:04:36 +08:00
CocosRobot 781ff463a2 [AUTO]: updating luabinding automatically 2014-03-19 01:56:50 +00:00
James Chen 0fad41a9cc Update CHANGELOG [ci skip] 2014-03-19 09:53:12 +08:00
James Chen a5e9630db1 Merge pull request #5843 from Dhilan007/develop_label 
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
 2014-03-19 09:52:14 +08:00
Jeong YunWon 2f1a7ebf42 Elastic bounceback for ScrollView 
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
 2014-03-18 18:51:07 +09:00
lm 426b006bfb [Jenkins] build all samples on android 2014-03-18 17:27:57 +08:00
CocosRobot ee0e43fcc2 modify android-job in autotest.py. 2014-03-18 16:21:41 +08:00
boyu0 c4aaaf9231 closed #4424: fix PhysicsBody::setGravity() doesn't work correctly sometimes. 2014-03-18 16:17:43 +08:00
James Chen 88849e1510 Merge pull request #5853 from CocosRobot/update_lua_bindings_1395129281 
[AUTO]: updating luabinding automatically
 2014-03-18 16:15:54 +08:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
James Chen 7a16ffff84 Merge pull request #5848 from samuele3hu/develop_3_fix 
Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
 2014-03-18 15:52:07 +08:00
CocosRobot e80b152045 ignore it. 2014-03-18 14:52:01 +08:00
CocosRobot 789ebb7d67 last version, need ignore 2014-03-18 14:49:49 +08:00
James Chen 2fd3e3df65 Merge pull request #5850 from lmskater/fix-submodule-update-fail 
[Jenkins] make build fail when submodule update fail
 2014-03-18 14:48:25 +08:00
lm 716f480eb4 [Jenkins] make build fail when submodule update fail 2014-03-18 14:37:23 +08:00
andyque 8c25fd5e8f modify android-build-autotest in autotest.py. 2014-03-18 14:30:01 +08:00
andyque a4bba6d03a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest 2014-03-18 14:07:24 +08:00
andyque 761456d480 test android part of autotest.py. 2014-03-18 14:06:33 +08:00
Dhilan007 a286ed8374 fixed typo. 2014-03-18 13:48:41 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
samuele3hu 402b6f0f28 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix 2014-03-18 10:40:12 +08:00
samuele3hu 309422f791 update `bindings-generator` submodule 2014-03-18 10:36:37 +08:00
Dhilan007 d59fb25e2a update test case of issue 4428. 2014-03-18 10:26:45 +08:00
Dhilan007 4d5c7fc634 Add a test case to reproduce issue 4428. 2014-03-18 10:20:25 +08:00