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

30113 Commits

Author SHA1 Message Date
WuHao cd0ebc1801 fix the info struct 2015-04-27 10:44:23 +08:00
CocosRobot 09cddb4d4b [AUTO]: updating luabinding automatically 2015-04-27 02:25:05 +00:00
minggo c500d6b0a7 Merge pull request #11588 from WenhaiLin/v3-jsb 
[js-tests]Fixed crash.
 2015-04-27 10:20:07 +08:00
minggo d932d1e7e1 [ci skip]update CHANGELOG 2015-04-27 10:17:56 +08:00
minggo 033cfaa30b Merge pull request #11592 from fusijie/add_EaseRateAction_create_method 
Add EaseRateAction::create() method.
 2015-04-27 10:16:38 +08:00
yangxiao 2dbb6a54b5 modify change log 2015-04-27 09:56:36 +08:00
minggo 838aa688b8 Merge pull request #11595 from loadrunner/seperate_typo 
fixed 'seperate' typo
 2015-04-27 09:33:12 +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
HueyPark 25a9c90b54 Fix android http client memory leak 2015-04-26 20:52:09 +09:00
Danut Chereches 5f692962b9 fixed 'seperate' typo 
issue #8408
 2015-04-25 00:02:39 +03:00
Jacky 633c1aed75 Add EaseRateAction::create() method. 2015-04-24 18:31:44 +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
Wenhai Lin 23f8fa817a [js-tests]Fixed crash on iOS/Mac 2015-04-24 18:14:24 +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
WenhaiLin 5e5cd5faa1 [js-tests]Fixed crash on Win32/Universal. 2015-04-24 17:12:46 +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
minggo 2199bf1799 Merge pull request #11580 from CocosRobot/update_cocosfiles_1429845211 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-24 11:14:38 +08:00
CocosRobot dbdb29464b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-24 03:13:32 +00:00
minggo 389121edcb Merge pull request #11575 from CocosRobot/update_cocosfiles_1429840412 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-24 11:11:41 +08:00
minggo 2245272922 Merge pull request #11560 from natural-law/v3-jsb 
Add js related files.
 2015-04-24 11:11:16 +08:00
zhangbin 252e5e1183 Make the lua projects temporarily works well. 2015-04-24 10:17:38 +08:00
CocosRobot 1ebcf7aeb4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-24 01:53:33 +00:00
minggo 4d3382b530 Merge pull request #11573 from pandamicro/v3_origin 
Sync Cocos2d-JS modifications to Cocos2d-x
 2015-04-24 09:51:26 +08:00
pandamicro c9fa9485a0 Update pluginx 2015-04-23 19:08:03 +08:00
pandamicro ec41965add Add get header and callback for Downloader 2015-04-23 19:07:07 +08:00
pandamicro 51f949540c Add ignore for v*-console-*.zip 2015-04-23 19:06:25 +08:00
pandamicro 6b4f8cc0ab Fix local storage get item issue when item inexist 2015-04-23 19:06:06 +08:00
pandamicro 3409f0fcd4 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into v3_origin 2015-04-23 18:58:59 +08:00
XiaoYang 5c89b3acda Merge pull request #309 from lvlonggame/v3 
memory leaks and UI action
 2015-04-23 18:13:41 +08:00
zhangbin 44d3846b35 Update the version of 3rd party libs. 2015-04-23 18:11:45 +08:00
WuHao 07349ff588 initial cpp test 2015-04-23 18:03:03 +08:00
zhangbin b42307286c Solve the error when run js-tests on linux. 2015-04-23 16:51:57 +08:00
XiaoFeng faddbd8e71 Add function to texture cache for studio to check if texture have been already loaded 2015-04-23 16:50:28 +08:00
WuHao ada7ced0a8 change getVecCount to ssize_t 2015-04-23 16:40:11 +08:00
lvlong d7fc85eb97 remove model ~~ !!! 2015-04-23 16:10:01 +08:00