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

23224 Commits

Author SHA1 Message Date
minggo 7fd1521bbf update version 2014-08-22 11:48:14 +08:00
huangshiwu 7f57d15cb3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs 2014-08-22 11:04:13 +08:00
huangshiwu 7dec715288 OpenGL context attributions setting revise 2014-08-22 10:55:39 +08:00
minggo 21cb90bf12 Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR 
Migrate some changes from Cocos2d-JS to -x
 2014-08-21 22:38:59 +08:00
pandamicro bb5e189f30 Fix warning or Bundle3D 2014-08-21 20:02:22 +08:00
pandamicro 59cedea6dc Reverse useless change 2014-08-21 19:40:18 +08:00
pandamicro 634847412b Reverse CC_CONSTRUCTOR_ACCESS modification 2014-08-21 19:36:28 +08:00
lvlong 4ce334c0c3 Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle 2014-08-21 18:16:21 +08:00
lvlong d00bcbccb0 add texture coord2-7 2014-08-21 18:14:24 +08:00
minggo f94717de94 Merge pull request #7839 from minggo/revert-ccimage 
Revert ccimage
 2014-08-21 16:21:54 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
minggo 4563e65427 fix compiling error on android and fix some coding style 2014-08-21 15:41:05 +08:00
pandamicro 5fb9f59633 Fix small issues 2014-08-21 15:40:53 +08:00
pandamicro 9544482058 Fix Android.mk s 2014-08-21 15:40:42 +08:00
pandamicro 485dd1f7da Update #3897: Refactor missed protected constructors 2014-08-21 15:40:22 +08:00
minggo b349ce43ae use macro to control whether to use jpeg, tiff, webp or not 2014-08-21 15:19:26 +08:00
pandamicro 909dd0d397 Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
samuele3hu 1ed4c4eab8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-21 15:05:31 +08:00
andyque bade43ca93 update ui::Scale9Sprite release note 2014-08-21 15:03:50 +08:00
minggo 0f624078ca Merge pull request #7836 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-21 14:14:42 +08:00
minggo 3e6726e307 Merge pull request #7837 from minggo/update-release-note 
update release note
 2014-08-21 14:13:27 +08:00
minggo 88b8af0a34 update release note 2014-08-21 14:11:43 +08:00
zhangbin 97a4258cd6 Update the reference of submodule cocos2d-console. 2014-08-21 14:10:36 +08:00
minggo c0d1bfca26 Merge pull request #7832 from Teivaz/v3 
Fixed WinRT project
 2014-08-21 13:37:03 +08:00
teivaz 312f57d7a6 - [WP8] Now replacing application display name with project name 2014-08-21 18:49:52 +03:00
teivaz aecdb832a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-21 13:48:05 +03:00
teivaz a70688dc96 + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
lvlong 7753f4c471 modify assert(0) 2014-08-21 13:30:51 +08:00
XiaoYang ffdbdc446d Merge pull request #110 from liuliang2004/Meshv3 
Meshv3
 2014-08-21 11:26:49 +08:00
liuliang 9ee6683569 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 2014-08-21 11:24:11 +08:00
liuliang 082689971d Modify the model resolution 2014-08-21 11:23:31 +08:00
XiaoYang 7cf00c535d Merge pull request #109 from lvlonggame/merge-bundle 
fix binary load bug.
 2014-08-21 10:44:00 +08:00
lvlong 1f349cb3fe fix binary load bug. 2014-08-21 10:38:33 +08:00
minggo 2fc3be2720 [ci skip] 2014-08-21 10:33:57 +08:00
andyque 3f51926c5d add click event listener to Widget 2014-08-21 10:21:07 +08:00
huangshiwu 2369a5900d merge v3 to v3_glviewattrs 2014-08-21 10:18:55 +08:00
yangxiao c26a81bb55 Merge branch 'newcode' into v3 2014-08-21 09:53:06 +08:00
minggo dfc5fb4ea4 Merge pull request #7833 from Teivaz/v3_WP8 
! Set version to 3.3 (as it is no longer 3.2)
 2014-08-21 09:38:20 +08:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
andyque 34b3f1f0e3 remove warnings 2014-08-21 09:36:12 +08:00
huangshiwu 2a03bea1a4 OpenGL context attributions setting 2014-08-21 09:35:32 +08:00
yangxiao 3a69fc9b14 rename ModelDataNode to ModelData 2014-08-20 19:19:49 +08:00
yangxiao fcf4d79b06 setGLProgramState support 2014-08-20 19:01:04 +08:00
yangxiao bd4aec4bcd support multi-attribs 2014-08-20 18:20:19 +08:00
minggo f3b211351b Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie 
V3 add primitivehead fie
 2014-08-20 16:04:27 +08:00
yangxiao 9a6181fdca Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-20 15:02:26 +08:00
yangxiao 79857c471b multiply Mesh attrib support 2014-08-20 15:02:16 +08:00
minggo 1535c666fc Merge pull request #7829 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-20 14:53:36 +08:00
Huabing.Xu b5e5e2d8d5 add primitive head file to cocos2d.h 2014-08-20 14:48:50 +08:00