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

19074 Commits

Author SHA1 Message Date
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2014-04-24 16:58:46 +08:00
lm 41615fe56a [Jenkins][ci skip] Change 'payload' to 'tag' 2014-04-23 18:10:39 +08:00
shujunqiao c1d52f9af1 [ci skip], modify address_of_result_html display in emptytest.py. 2014-04-23 18:06:30 +08:00
shujunqiao 8b2d84a9e6 [ci skip],modify ssh directory in emptytest.py 2014-04-23 17:55:53 +08:00
pandamicro 1966d1f50e Fixed #4755: Fix PhysicsSprite transform not updated issue 2014-04-23 17:11:55 +08:00
shujunqiao e749ab8ddb [ci skip], add ssh upload file in emptytest.py. 2014-04-23 16:32:37 +08:00
minggo 55911e1e78 Merge pull request #6356 from Dhilan007/develop_v3 
fixed drawDebugData of LabelBMFont/LabelAtlas.
 2014-04-23 15:24:30 +08:00
minggo 1c15d7fd08 Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader 
Fixed bug of gui reader
 2014-04-23 15:16:31 +08:00
Huabing.Xu 2aa65ceee5 Fix compile warnings after merging 2014-04-23 15:13:50 +08:00
Dhilan007 a4ac5ab054 fixed drawDebugData of LabelBMFont/LabelAtlas. 2014-04-23 15:05:02 +08:00
CaiWenzhi 4750e8b417 Fixed bug of gui reader 2014-04-23 15:02:35 +08:00
Huabing.Xu 587f65098f Fix compile error after merging 2014-04-23 14:59:45 +08:00
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
minggo 18f12eb5dd Merge pull request #6347 from lmskater/add-ci-release-command 
[Jenkins][ci skip] Add [ci release xxx] command
 2014-04-23 12:01:08 +08:00
minggo 26abba9da4 [ci skip] 2014-04-23 09:42:33 +08:00
minggo dc7955afa3 Merge pull request #6353 from Dhilan007/develop_v3 
fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled.
 2014-04-23 09:39:39 +08:00
Dhilan007 75772af82b fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled. 2014-04-22 23:18:23 +08:00
minggo 506d628619 Merge pull request #6352 from natural-law/develop 
Solve compiling errors when some macros changed in ccConfig.h.
 2014-04-22 17:00:28 +08:00
minggo ccc935137b Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash 
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
 2014-04-22 16:53:32 +08:00
zhangbin 2305ba59e6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/2d/CCActionInterval.cpp
 2014-04-22 16:49:27 +08:00
zhangbin 093bd20a74 Solve compiling errors when some macros changed in ccConfig.h. 2014-04-22 16:42:13 +08:00
minggo b8be231ba5 Merge pull request #6351 from natural-law/develop 
Add tip message in setup.py for prompt the usage of some environment var...
 2014-04-22 15:58:23 +08:00
minggo 9abfcafd35 Merge pull request #6349 from dumganhar/config-fix 
Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION
 2014-04-22 15:56:18 +08:00
zhangbin e9fa70b101 Add tip message in setup.py for prompt the usage of some environment variable. 2014-04-22 15:55:27 +08:00
James Chen 9dec301ab3 Merge pull request #6350 from natural-law/develop 
Update the reference of submodule plugin-x.
 2014-04-22 15:52:52 +08:00
zhangbin b3bc69fccc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-22 15:38:26 +08:00
James Chen 83c1c74475 Merge pull request #6341 from samuele3hu/develop_fix 
fix two bugs found in the testing
 2014-04-22 15:09:10 +08:00
lm 2c55c740ba [Jenkins][ci skip] Git fetch tag 2014-04-22 14:31:56 +08:00
zhangbin 7a147ce46c Update the reference of submodule plugin-x. 2014-04-22 13:55:59 +08:00
James Chen a267c8eb55 Merge pull request #6348 from qq573011406/patch-2 
SimpleAudioEngine::sharedEngine() -> SimpleAudioEngine::getInstance() for cpp-template
 2014-04-22 13:54:31 +08:00
samuele3hu cd2a8e90d2 Remove the comments for ClippingNodeTest 2014-04-22 13:52:52 +08:00
samuele3hu 6b34239d75 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-22 13:48:00 +08:00
samuele3hu 771ce05d95 fix the bugs of SpriteTest that the Sprite created by passing rect display error 2014-04-22 13:41:10 +08:00
James Chen b8e77d8968 Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION 2014-04-21 22:38:15 -07:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
lm 7005d6664d [Jenkins][ci skip] Clean workspace before debug build or release build 2014-04-22 12:36:40 +08:00
lm 9f7021fd6c [Jenkins][ci skip] Add [ci release xxx] command 2014-04-22 11:41:14 +08:00
minggo 4bf84f58df Merge pull request #6345 from dabingnn/develop_fix_clippingNodeTestRawStencilBug 
3.0hotfix: Node: Clipping->RawStencilTest4-6
 2014-04-22 11:36:52 +08:00
minggo 90fb49c1ad Merge pull request #6346 from natural-law/develop 
Update the reference of submodule cocos2d-console.
 2014-04-22 11:22:56 +08:00
zhangbin b7ff312c7c Update the reference of submodule cocos2d-console. 2014-04-22 11:21:13 +08:00
James Chen b5f30ff7ec Merge pull request #6340 from shujunqiao/emptytest-device 
[ci skip], add get android device infomation in emptytest.py.
 2014-04-22 11:14:07 +08:00
shujunqiao 48d3714bf2 [ci skip], delete wake function in emptytest.py. 2014-04-22 11:04:17 +08:00
Huabing.Xu 560d24545a 3.0hotfix: Node: Clipping->RawStencilTest4-6 2014-04-22 10:58:42 +08:00
James Chen 99654289ed Invokes 'Node::onExit' only when the node is running. 2014-04-21 22:31:34 +08:00
James Chen 8038d3daa5 Fixed tilemaptest crashes when click 'next' button quickly 2014-04-21 22:24:44 +08:00
samuele3hu 3b3836db36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-21 18:28:31 +08:00
samuele3hu 582e961f2a Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest 2014-04-21 18:28:05 +08:00
shujunqiao 79e9c315d8 [ci skip], add get android device infomation in emptytest.py. 2014-04-21 18:18:48 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 83ee1b4bdc android OK 2014-04-21 17:38:10 +08:00