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

25622 Commits

Author SHA1 Message Date
joewanchen b05f558214 fix compile error. 2014-11-07 10:14:07 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
joewanchen b682438b68 revert some modifications. 2014-11-07 09:17:32 +08:00
joewanchen c2b97a3b13 fix sprite frame cache, and remove unnecessary headers dependencies. 
we should add private headers for ccs, do not expose privae headers to users.
 2014-11-07 09:13:59 +08:00
Ricardo Quesada 9558d97517 Merge pull request #9047 from ricardoquesada/releasing 
Adds releasing rules
 2014-11-06 14:44:21 -08:00
Ricardo Quesada 120e31f4fe Adds releasing rules 2014-11-06 14:43:45 -08:00
Ricardo Quesada 738deddd42 Update CONTRIBUTE.md 2014-11-06 14:30:00 -08:00
Ricardo Quesada 9e795777b3 Merge pull request #9042 from ricardoquesada/contribute 
How to contribute to cocos2d-x
 2014-11-06 14:17:07 -08:00
Ricardo Quesada 8926e115cd How to contribute to cocos2d-x 2014-11-06 14:16:39 -08:00
Ricardo Quesada f8b1915970 Merge pull request #9040 from ricardoquesada/warnings_fixes 
fixes some compiler warnings
 2014-11-06 12:26:30 -08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
pandamicro aca5930711 Fixed #9038: parseVersion shouldn't set Manifest loaded flag 2014-11-06 23:08:34 +08:00
G17hao c7f5c3052d Update CCBone.cpp 
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
 2014-11-06 17:51:19 +08:00
samuele3hu e2474e1f96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-11-06 14:38:55 +08:00
samuele3hu 76ab86674e Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android 2014-11-06 14:32:03 +08:00
minggo 4911ae448d Merge pull request #9032 from cocoscodeide/v3 
runtime demo is ugly when screen orientation is portrait
 2014-11-06 11:59:53 +08:00
honghui 8af00cdb06 runtime demo is ugly when screen orientation is portrait 2014-11-06 11:30:01 +08:00
minggo 0402ed37f6 Merge pull request #9027 from winipcfg/patch-1 
Update CHANGELOG
 2014-11-06 10:19:39 +08:00
Summoner 3109b40df9 Update CHANGELOG 
fix typo
 2014-11-06 09:13:47 +08:00
cpascal 3dcce59e84 Fix error with CC_ENABLE_SCRIPT_BINDING=0 
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.

CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
 2014-11-06 07:20:41 +09:00
Ricardo Quesada bffe5e09e0 Merge pull request #9024 from ricardoquesada/readme_fixes 
fixes types in readme
 2014-11-05 10:27:25 -08:00
Ricardo Quesada e83de40592 fixes types in readme 
thanks @kidproquo
 2014-11-05 10:26:46 -08:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite 
add Sprite3D::getMeshArrayByName and refactor re-skin test
 2014-11-05 18:11:51 +08:00
minggo 666fdac7cb Merge pull request #9012 from CocosRobot/update_lua_bindings_1415148600 
[AUTO]: updating luabinding automatically
 2014-11-05 18:09:23 +08:00
minggo 7565b9b1eb Merge pull request #8969 from kaylyun/v3 
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
 2014-11-05 17:58:28 +08:00
minggo 46972eb477 [ci skip]Update Authors 2014-11-05 17:53:38 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
minggo 7123902f11 [ci skip] Update CHANGELOG 2014-11-05 17:51:35 +08:00
minggo e56c84ebf0 Merge pull request #8983 from super626/camera 
fix wrong camera lookat computation
 2014-11-05 17:49:59 +08:00
minggo dd7ef28145 Merge pull request #8954 from andyque/modifyChangeLog 
modify changelog
 2014-11-05 17:49:12 +08:00
cpascal c1f85bac0e Fixed compile error with CC_REF_LEAK_DETECTION 2014-11-05 16:23:25 +09:00
minggo c1caa8515c Merge pull request #9015 from CocosRobot/update_lua_bindings_1415166130 
[AUTO]: updating luabinding automatically
 2014-11-05 13:54:19 +08:00
CocosRobot 13f9073e22 [AUTO]: updating luabinding automatically 2014-11-05 05:44:02 +00:00
minggo 98073632d4 Merge pull request #8908 from zawasp/v3-source 
fix some warnings / remove TABs
 2014-11-05 13:39:20 +08:00
CocosRobot 767437969f [AUTO]: updating luabinding automatically 2014-11-05 00:52:05 +00:00
Ricardo Quesada 92caf4026a Merge pull request #9011 from ricardoquesada/perf_fixes 
Performance improvements
 2014-11-04 16:47:00 -08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
Ricardo Quesada a95f689842 Merge pull request #9010 from ricardoquesada/treat_warnings_as_errors_in_samples 
treat warnings as errors in samples
 2014-11-04 15:43:16 -08:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00
Jialong Zhai 6e35e91642 Update CCFileUtils-linux.cpp 2014-11-04 18:23:12 +08:00
峰　正博 828715ab8b ;; -> ; 2014-11-04 11:54:48 +09:00
峰　正博 9d2c1a6075 Merge branch 'v3' of https://github.com/aeonmine/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-11-04 11:51:56 +09:00
峰　正博 29779a4604 modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte); 2014-11-04 11:51:00 +09:00
峰　正博 dc8fb94bc8 fix memory leak cocos studiov2.0 engine v3.3 #8998 
fix memory leak for zipUtils
 2014-11-04 10:21:57 +09:00
峰正博 85fb2c91ab fix memory leak cocos studiov2.0 engine v3.3 2014-11-04 01:25:58 +09:00
minggo 5ee8f0a134 Merge pull request #8976 from hongliang-goudou/runtime_addSearchPath_argc 
overrided addSearchPath() by Runtime.cpp should support second argument
 2014-11-01 11:35:05 +08:00
samuele3hu 08d6b0dcff Fix the type judgment of lua value would parse string —> int or int —> string 2014-10-31 17:50:59 +08:00
hongliang adb221babe init arg1 as false for safety 2014-10-31 15:23:46 +08:00
yangxiao 642a601502 fix wrong look at 2014-10-31 11:32:10 +08:00
minggo b73ae5715c Merge pull request #8982 from CocosRobot/update_lua_bindings_1414723317 
[AUTO]: updating luabinding automatically
 2014-10-31 10:45:18 +08:00