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

13665 Commits

Author SHA1 Message Date
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
minggo 39ec684ac8 [ci skip] 2013-11-13 15:32:22 +08:00
minggo 42e7106b99 [ci skip] 2013-11-13 14:57:24 +08:00
minggo 304b09527b Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime 
[ci skip]Configuration of VAO in runtime
 2013-11-12 22:55:29 -08:00
bmanGH 2687ee8915 put '{' in a new line to follow cocos2d-x coding style 2013-11-13 14:52:16 +08:00
garfield_ho fbb4d02251 When anchor point is 0,0 , CocosBuilder will not output anchor point param setting request.Although the Scale9Sprite`s anchor point is default to 0, 0, but when calling function "initWithBatchNode", the anchor point will be set to 0.5, 0.5. 2013-11-13 14:38:01 +08:00
bmanGH 2a08c3b876 remove conflicts files; 2013-11-13 14:28:23 +08:00
boyu0 ca4c289fd8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-13 11:24:19 +08:00
boyu0 fb04c9e574 issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
CaiWenzhi 0665d6c9bc Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-13 10:19:09 +08:00
CaiWenzhi 03b3d583e8 Modify scenereader 2013-11-13 10:16:16 +08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00
Ricardo Quesada 865e780921 Merge pull request #4213 from ricardoquesada/listener_id_type 
correct type for  Listener ID
 2013-11-12 17:15:44 -08:00
Ricardo Quesada 4848e3d3bb correct size for Listener ID 2013-11-12 17:14:51 -08:00
Ricardo Quesada 2db3ffd01f Merge pull request #4212 from ricardoquesada/coding_iii 
removes cocos2d-x from title since the image is already there
 2013-11-12 15:58:08 -08:00
Ricardo Quesada da05fa1f63 removes cocos2d-x from title since the image is already there 2013-11-12 15:57:29 -08:00
Ricardo Quesada dbd414cf32 Merge pull request #4211 from ricardoquesada/coding_ii 
More fixes to CODING STYLE
 2013-11-12 15:25:15 -08:00
Ricardo Quesada d8efcc04e6 More fixes to CODING STYLE 
Adds cocos2d-x logo, and other  syntax fixes
 2013-11-12 15:23:43 -08:00
Ricardo Quesada a21d93eda0 Merge pull request #4210 from ricardoquesada/coding 
Updates CODING STYLE
 2013-11-12 14:57:34 -08:00
Ricardo Quesada 3f61a0ac00 Updates CODING STYLE 
Adds Xcode 5.0, gcc 4.8 and VS 2012 as the supported compilers
 2013-11-12 14:56:24 -08:00
Nite Luo 37d3601fd0 Merge branch 'develop' into newRenderer 2013-11-12 11:56:17 -08:00
Nite Luo 0c0c11be5c Finish NewSpriteBatchTest 2013-11-12 11:53:53 -08:00
Nite Luo d7b76a871e Make sure it compiles after Change in test 2013-11-12 11:23:10 -08:00
Nite Luo 8c972d96a8 Create new test for NewRenderer 2013-11-12 11:19:18 -08:00
Nite Luo ab8b61aaec Create NewSpriteBatchNode to use NewRender 2013-11-12 11:18:49 -08:00
bmanGH 3b9348bfc0 remove conflicts files; 2013-11-12 20:21:30 +08:00
bmanGH 683ce1692d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/platform/ios/EAGLView.mm
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 2013-11-12 20:18:04 +08:00
bmanGH 9893fbc514 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain 
Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp
 2013-11-12 19:24:09 +08:00
bmanGH f540131320 add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class. 2013-11-12 18:59:37 +08:00
bmanGH 408b81173d fix GL_EXT_discard_framebuffer always disable in EAGLView.mm (fix compile fail on early iOS SDK 4.0); 2013-11-12 18:33:40 +08:00
bmanGH 83c99b5b1c fix GL_EXT_discard_framebuffer always disable in EAGLView.mm; 2013-11-12 18:33:26 +08:00
bmanGH 06ca84ba68 use Configuration::getInstance()->supportsShareableVAO() in place of CC_TEXTURE_ATLAS_USE_VAO; 2013-11-12 18:32:46 +08:00
bmanGH 706eeaaff9 fix direct delete touch object without use release crash bug; 2013-11-12 18:24:08 +08:00
boyu0 15c8c04f3a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-12 18:22:26 +08:00
boyu0 0aa140a6e5 issue #2771: add comments 2013-11-12 18:13:44 +08:00
James Chen 5498c79c9e Merge pull request #4203 from CocosRobot/updategeneratedsubmodule_1384249810 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-12 02:00:16 -08:00
James Chen cb6b3f8163 Merge pull request #4201 from Dhilan007/incomplete_copy 
fix incomplete copy resource
 2013-11-12 01:59:00 -08:00
Dhilan007 d43bc3f75d remove unnecessary print 2013-11-12 17:53:23 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
CocosRobot 0acaa1f76e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-12 09:50:13 +00:00
James Chen c74e5fc464 Merge pull request #4200 from samuele3hu/developCheck 
Resolve some warning and modify uint32_t to long
 2013-11-12 01:43:33 -08:00
samuele3 cb51df7d65 Update bindings-generator 2013-11-12 17:31:24 +08:00
samuele3 ae6597dbaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 
Conflicts:
	tools/bindings-generator
 2013-11-12 17:23:41 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
Dhilan007 e182328d51 fix incomplete copy resource 2013-11-12 16:25:39 +08:00
minggo 8d79e67ecf Merge pull request #4165 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-11 23:57:30 -08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
boyu0 9eac5c4a41 issue #2771: add comment and improve API 2013-11-12 15:28:07 +08:00