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

20590 Commits

Author SHA1 Message Date
CocosRobot a70d6628a7 [AUTO]: updating luabinding automatically 2014-06-04 05:58:29 +00:00
minggo ef175e5999 [ci skip] 2014-06-04 13:55:00 +08:00
Dhilan007 3fcb75c82f Fixed black screen may arise when using third SDK. 2014-06-04 13:54:44 +08:00
minggo 5432698674 Merge pull request #6969 from boyu0/bug5482_setPhysicsBody 
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
 2014-06-04 13:52:43 +08:00
minggo 56d931aa71 Merge pull request #6963 from andyque/refactorLayout 
refactor Layout, remove sortChildren and unify doLayout
 2014-06-04 12:01:07 +08:00
boyu0 368c5b0d3b closed #5482: add a test case for bug 5482. 2014-06-04 11:59:15 +08:00
boyu0 dd0eecb905 closed #5482: fix issue: Node::setPhysicsBody() doesn't work after node added to other node. 2014-06-04 11:58:04 +08:00
samuele3hu c785d64ba1 Adjust the xxtea directory structure and modify configs files for platforms 2014-06-04 11:50:04 +08:00
Kenneth Chan d7fcf39386 fix layout constant syntax error 2014-06-03 20:26:59 -07:00
Dhilan007 52ad2063bd Support Fast App Resume. 2014-06-04 11:19:53 +08:00
Naoyuki Totani c7597e5396 surround tolua_isnumber with debug flug 2014-06-04 12:17:43 +09:00
andyque c6cb3a56fb refactor ListView, add do Layout 2014-06-04 10:51:32 +08:00
vision ad230bb412 fix a crash in ParticleTest->PremultipliedAlphaTest 2014-06-04 10:39:18 +08:00
andyque 652c214374 remove sortChildren of Layout 2014-06-04 10:10:50 +08:00
minggo 7641790185 [ci skip] 2014-06-04 10:05:28 +08:00
minggo 2c9c94c4a9 Merge pull request #6954 from visiblelight/AlphaIssues 
Make PNG files premultiplied alpha when loading
 2014-06-04 10:04:20 +08:00
samuele3hu 3fddb798ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-04 10:00:52 +08:00
samuele3hu e1310e2660 Adjust the xxtea directory structure and modify some grammar expressions 2014-06-04 09:59:29 +08:00
minggo 2d866de146 Merge pull request #6961 from minggo/treat-warning-as-error 
not treat warnings as error
 2014-06-04 09:46:30 +08:00
minggo cb10fb560a not treat warnings as error 2014-06-04 09:44:34 +08:00
Kezhu Wang eb8e08ccdd prefer std::vector to other containers 2014-06-03 19:09:48 +08:00
Kezhu Wang f1ce9e032d remove unnecessary cache-variable 2014-06-03 19:08:28 +08:00
Kezhu Wang 1eb991df59 bugfix related to AutoreleasePool's PoolManager 
* duplicated AutoreleasePool added to PoolManager in
  PoolManager::getInstance()
* redundant pop_back() in PoolManager::~PoolManager()
 2014-06-03 18:57:52 +08:00
minggo 8a6a0968ef [ci skip] 2014-06-03 18:20:01 +08:00
minggo a6a686bef1 [ci skip] 2014-06-03 18:17:37 +08:00
minggo e33871db9a Merge pull request #6958 from Dhilan007/v3 
fixed EVENT_COME_TO_BACKGROUND has not been sent on android.
 2014-06-03 18:16:04 +08:00
Dhilan007 9e6304d84c fixed EVENT_COME_TO_BACKGROUND has not been sent on android. 2014-06-03 18:10:22 +08:00
minggo 3d576d8068 [ci skip] 2014-06-03 18:02:37 +08:00
minggo 7817b27844 Merge pull request #6957 from andyque/fixScale9Sprite 
fix scale9Sprite can't culling problem
 2014-06-03 18:00:47 +08:00
Kezhu Wang dbca937835 add test case to break buggy code 2014-06-03 17:58:09 +08:00
andyque 1d5d1f011e fix scale9Sprite can't culling problem 2014-06-03 17:52:41 +08:00
samuele3hu 404db49538 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-03 17:17:11 +08:00
samuele3hu 55bb9a7d09 Update setting for different platform 2014-06-03 17:15:28 +08:00
minggo c1bb5d8803 [ci skip] 2014-06-03 16:58:53 +08:00
vision 1c4838e7f0 we are only udpating PNG now. 2014-06-03 16:22:50 +08:00
vision 0149fd81b5 no need for handling RAW_DATA 2014-06-03 15:19:01 +08:00
vision 8af737739b premultiplied alpha for PNG,TGA,WEBP,RAW_DATA 2014-06-03 15:06:15 +08:00
minggo 96d697a670 [ci skip] 2014-06-03 14:40:20 +08:00
minggo 691a77b148 Merge pull request #6928 from boyu0/bug5392_scheduleUpdate 
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
 2014-06-03 14:38:07 +08:00
minggo 90136b2634 [ci skip] 2014-06-03 14:36:15 +08:00
minggo 7b4ae98098 Merge pull request #6944 from minggo/treat-warning-as-error 
Treat warning as error on iOS and Mac
 2014-06-03 14:31:18 +08:00
minggo 04ddc00e3f Merge pull request #6953 from lmskater/fix-post-build 
[Jenkins][ci skip] Fix proxy address in post-build.py
 2014-06-03 13:46:35 +08:00
cocoscodeide bbf0ded6f8 Merge pull request #32 from chuanweizhang2013/v3luaruntime 
fixed config template
 2014-06-03 11:59:21 +08:00
lm be3f88c4ce [Jenkins][ci skip] Fix proxy address in post-build.py 2014-06-03 11:48:52 +08:00
cw 9d14a179db Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-03 11:28:18 +08:00
cw 521fa3118d config template 2014-06-03 11:25:16 +08:00
minggo 26a4eaaac7 Merge pull request #6939 from dabingnn/v3FixAndroid 
V3 fix android
 2014-06-03 10:26:01 +08:00
cocoscodeide 3453ae1a0e Merge pull request #31 from chuanweizhang2013/v3luaruntime 
convert resource to binary
 2014-06-03 10:16:32 +08:00
samuele3hu 5b3f3da428 update console submodule 2014-06-03 10:13:23 +08:00
samuele3hu 691e606b34 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 
Conflicts:
	tools/cocos2d-console
 2014-06-03 09:58:57 +08:00