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

16002 Commits

Author SHA1 Message Date
James Chen 9734d49b59 Merge pull request #5251 from dumganhar/develop 
Updates JS-Test: fix ArmatureTest/ChangeMounttest fails.
 2014-01-26 19:22:47 -08:00
James Chen 4712636783 Updates JS-Test: fix ArmatureTest/ChangeMounttest fails. 2014-01-27 11:22:19 +08:00
James Chen 0cc8050b73 Update CHANGELOG [ci skip] 2014-01-27 10:34:57 +08:00
James Chen 80709aa7d5 Merge pull request #5250 from dumganhar/iss3867-linux-empty-string-crash 
closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform.
 2014-01-26 18:33:43 -08:00
minggo 7065b34f8a Merge pull request #5249 from minggo/develop 
[ci skip]update changelog
 2014-01-26 18:31:48 -08:00
James Chen 6c69626a4f closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform. 2014-01-27 10:31:24 +08:00
minggo c8bd7bc3a8 update changelog 2014-01-27 10:28:11 +08:00
James Chen 208939ab2a Update CHANGELOG [ci skip] 2014-01-26 23:06:48 +08:00
James Chen 64e289d665 Merge pull request #5246 from samuele3hu/developBug 
issue #3863:Rename the lua binding of the `registerScriptHandler` and  `unregisterScriptHandler` of the SkeletonAnimation
 2014-01-26 07:02:02 -08:00
samuele3hu 1ad43e676e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 22:31:57 +08:00
samuele3hu 46ce35c0bd fix:Resolve the compile error of the cast_type on vs 2014-01-26 22:30:26 +08:00
samuele3hu d3824c9592 issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation 2014-01-26 22:27:37 +08:00
James Chen bd10afab60 Update CHANGELOG [ci skip] 2014-01-26 22:07:55 +08:00
James Chen 2c4faeefe0 Merge pull request #5244 from dumganhar/memory-leak-new-label 
closed #3862: [New Label] Memory leak in FontFreeType::createFontAtlas()
 2014-01-26 06:06:45 -08:00
James Chen 1e50a93bb7 A compilation error fix in lua_cocos2dx_manual.cpp. 2014-01-26 21:54:00 +08:00
James Chen a1b02b24ae Merge pull request #5245 from Dhilan007/develop_label 
fix mistake of label's transparency.
 2014-01-26 05:39:56 -08:00
James Chen 75dddf390b unsigned short int * -> unsigned short* , remove unneeded `int`. 2014-01-26 21:33:22 +08:00
James Chen f2981adf1f unsigned short int * -> unsigned short* , remove unneeded `int`. 2014-01-26 21:32:21 +08:00
Dhilan007 710b614680 fix mistake of label's transparency. 2014-01-26 21:19:40 +08:00
James Chen 2ee58c913c NewLabel memory leak fix. 2014-01-26 20:53:55 +08:00
James Chen 77538c53e9 Merge pull request #5241 from dumganhar/develop 
Some fixes:
Updates JS Test to the latest version
Remove unused files cocos/2d/cocos2dx.mk
Don't define CC_ENABLE_CHIPMUNK_INTEGATION in extension project for android.
Don't check whether CC_ENABLE_CHIPMUNK_INTEGATION is defined in CCPhysicSprite.h and CCPhysicDebugNode.h, check it in source file.
 2014-01-26 04:08:05 -08:00
James Chen 1c20df5ca9 Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create. 2014-01-26 20:05:51 +08:00
James Chen 13cbaf4968 Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file. 2014-01-26 19:35:21 +08:00
James Chen 413bfdb3c2 Reverts Application.mk. 2014-01-26 19:06:03 +08:00
James Chen caf4e76586 Merge pull request #5243 from lmskater/support-develop-build-only 
[Jenkins] only develop branch build is supported for win7
 2014-01-26 02:59:45 -08:00
James Chen 23c963cbdc Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled. 2014-01-26 18:35:35 +08:00
James Chen 551f95b83c The implementation of Object::release was moved to cpp source file. 2014-01-26 18:34:48 +08:00
James Chen 8902359db0 Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled. 2014-01-26 18:32:50 +08:00
lm 2f64c99fe7 [Jenkins] only develop branch build is supported for win7 2014-01-26 18:27:27 +08:00
minggo f5e59cbb6d Merge pull request #5240 from samuele3hu/developBug 
close #3802: Add the `createWithTTF(text, ...)` lua binding to support 3.0beta0
 2014-01-26 02:08:01 -08:00
James Chen e8229ad4e3 Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h. 2014-01-26 17:56:14 +08:00
James Chen 25b15d94d4 [Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead. 2014-01-26 17:55:38 +08:00
James Chen 6a302735d8 Removes unused files. 2014-01-26 17:54:13 +08:00
James Chen e89bde4fbe Updates JS test. 2014-01-26 17:53:42 +08:00
samuele3hu d2cc2d4065 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 17:22:49 +08:00
samuele3hu 2d66419394 close #3802: Add the createWithTTF(text, ...) lua binding to support 3.0beta0 2014-01-26 17:21:36 +08:00
James Chen 384f8b9f70 Merge pull request #5239 from CocosRobot/updategeneratedsubmodule_1390727564 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-26 01:18:14 -08:00
CocosRobot 8fa44baa2e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 09:12:47 +00:00
James Chen c0b0383438 Merge pull request #5238 from dumganhar/merge5071 
Merge PR #5071
 2014-01-26 01:07:11 -08:00
James Chen 351ac4a5d7 [LUA] Adds missing cc prefix for lua classes. 2014-01-26 17:05:35 +08:00
James Chen a4a010465c Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071 2014-01-26 16:41:35 +08:00
James Chen ccf31de3c4 Merge pull request #5236 from CocosRobot/updategeneratedsubmodule_1390725001 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-26 00:31:13 -08:00
minggo b72dfa5461 Merge pull request #5234 from andyque/develop 
issue #3859. improve the prompt of android-build scripts
 2014-01-26 00:30:21 -08:00
CocosRobot 4862bbbd86 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 08:30:04 +00:00
andyque 96af336780 issue #3859. update description of android-build.py 2014-01-26 16:22:09 +08:00
James Chen 4b1f61e020 Merge pull request #5235 from dumganhar/develop 
Updates bindings-generator.
 2014-01-26 00:21:40 -08:00
James Chen 25c7c68cd2 Updates bindings-generator. 2014-01-26 16:20:10 +08:00
andyque 7f3a0216c2 issue #3859. improve the prompt of android-build scripts 2014-01-26 16:10:51 +08:00
James Chen 603df24d0e Merge pull request #5231 from samuele3hu/developBug 
issue #3837:Add the debug support for mac and lua template
 2014-01-25 23:40:10 -08:00
samuele3hu cf684bc3f4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 15:16:02 +08:00