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

28972 Commits

Author SHA1 Message Date
samuele3hu dc765aee25 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1 2015-04-28 09:19:03 +08:00
samuele3hu 51bcac9e84 Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest 2015-04-28 09:17:00 +08:00
minggo 6b13505d1d Merge pull request #11613 from Wu-Hao/v3.6 
updated SpritePolygon
 2015-04-27 17:59:59 +08:00
WuHao 597d2289c0 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-27 17:31:50 +08:00
WuHao a046f74c4d fix anchor point bug 2015-04-27 17:30:38 +08:00
WuHao dcf8f674bc Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 
Conflicts:
	cocos/2d/SpritePolygon.cpp
	cocos/2d/SpritePolygonCache.cpp
 2015-04-27 17:18:26 +08:00
minggo 454ca26653 [ci skip] update version 2015-04-27 16:47:22 +08:00
minggo ee29888d8e [ci skip] update version 2015-04-27 16:46:03 +08:00
WuHao 815c6a9b74 merge the start and end points 2015-04-27 16:33:54 +08:00
minggo 822dfcf61d Merge pull request #11610 from CocosRobot/update_lua_bindings_1430120801 
[AUTO]: updating luabinding automatically
 2015-04-27 16:28:38 +08:00
CocosRobot 09a6cc19b7 [AUTO]: updating luabinding automatically 2015-04-27 07:48:42 +00:00
minggo dcf48eaa04 Merge pull request #11609 from CocosRobot/update_cocosfiles_1430120770 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-27 15:47:37 +08:00
CocosRobot ef82d9fa3a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-27 07:46:12 +00:00
minggo 588e575f7f Merge pull request #11608 from samuele3hu/v3.6_test1 
[ci skip]Update configure for auto travis and generate-cocosfiles.sh
 2015-04-27 15:43:47 +08:00
samuele3hu 95381ab975 Update the generate-cocosfiles.sh 2015-04-27 15:41:26 +08:00
samuele3hu 99bdfeb468 Update the configure about travis 2015-04-27 15:38:35 +08:00
Hao Wu 7212735284 Merge pull request #4 from samuele3hu/v3.6 
Update SpritePolygon
 2015-04-27 15:23:14 +08:00
samuele3hu 3de665b9cd Update SpritePolygon 2015-04-27 15:19:26 +08:00
minggo c9bacd58e8 Merge pull request #11591 from Wu-Hao/v3.6 
V3.6
 2015-04-27 14:22:21 +08:00
WuHao c7e990dcae Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 
Conflicts:
	cocos/2d/SpritePolygon.cpp
 2015-04-27 13:39:41 +08:00
WuHao 9f2ea5fbb9 fixed some SpritePolygon create, added more tests 2015-04-27 13:34:47 +08:00
Hao Wu f8464659e3 Merge pull request #3 from samuele3hu/v3.6 
Add the PolySprite support and adjust the project setting on the different platform
 2015-04-27 12:02:50 +08:00
samuele3hu d7dbb910d0 Update SpritePolygonCache 2015-04-27 11:57:36 +08:00
samuele3hu cf53d13f6f Update SpritePolygon.cpp 2015-04-27 11:07:08 +08:00
samuele3hu 6f17dcecf2 Update config.json for 3rd-party-libs and SpritePolygonCache 2015-04-27 11:01:47 +08:00
minggo 0a8f533e80 Merge pull request #11590 from super626/v3 
Animate3D Quality control
 2015-04-27 10:58:10 +08:00
WuHao c2cefadb6f Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6 2015-04-27 10:44:56 +08:00
WuHao cd0ebc1801 fix the info struct 2015-04-27 10:44:23 +08:00
yangxiao 2dbb6a54b5 modify change log 2015-04-27 09:56:36 +08:00
Hao Wu 7232577b23 Merge pull request #2 from samuele3hu/v3.6 
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
 2015-04-27 09:32:44 +08:00
samuele3hu bd5ca083e9 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
WuHao 9496a48800 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-24 18:29:23 +08:00
WuHao c1d10ffa1c fixed poly2tri creation method, added testCase 2015-04-24 18:28:28 +08:00
WuHao 5620da1adf fixed anchor point issue, removed rect rotated property 2015-04-24 18:17:12 +08:00
yangxiao 7547a58e80 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-04-24 17:59:13 +08:00
yangxiao dee966e586 modify change log 2015-04-24 17:59:00 +08:00
XiaoYang d7deabc3ad Merge pull request #311 from lvlonggame/v3 
animate 3d quality
 2015-04-24 17:54:28 +08:00
WuHao 0e318dd8dc fixed UV issue, also taking account of contentScaleFactor, made test case better 2015-04-24 17:39:43 +08:00
minggo 0198c8707b Merge pull request #11572 from super626/v3 
Fix memory leak
 2015-04-24 16:42:33 +08:00
XiaoYang a860277ddd Merge pull request #312 from songchengjiang/v3 
Optimization
 2015-04-24 16:05:08 +08:00
minggo 5a33fba01f Merge pull request #11587 from andyque/update-config-json-for-v36 
update config.json to v3.6
 2015-04-24 15:53:36 +08:00
songchengjiang 2aee4abd66 fix https://github.com/cocos2d/cocos2d-x/issues/11203 
fix the error of CCBundle3D
 2015-04-24 15:31:50 +08:00
andyque abaf63aa35 update config.json to v3.6 2015-04-24 15:00:28 +08:00
minggo 32f3331fe7 Merge pull request #11574 from xiaofeng11/v3.6 
Add function for studio needed
 2015-04-24 14:53:02 +08:00
lvlong 59dc646c17 modify test 2015-04-24 14:12:24 +08:00
lvlong a379196340 modify comments 2015-04-24 14:06:20 +08:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
XiaoFeng 07725ce84d fix 2015-04-24 11:40:15 +08:00
XiaoYang 5c89b3acda Merge pull request #309 from lvlonggame/v3 
memory leaks and UI action
 2015-04-23 18:13:41 +08:00
WuHao 07349ff588 initial cpp test 2015-04-23 18:03:03 +08:00