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

25234 Commits

Author SHA1 Message Date
minggo 5f70b25d8e [ci skip] 2014-10-21 16:33:18 +08:00
minggo 367fca558f Merge pull request #8888 from minggo/update-release-note 
[ci skip]update release note
 2014-10-21 16:30:48 +08:00
minggo a9b8a63dfc update release note 2014-10-21 16:22:39 +08:00
minggo 09cc636d82 Merge pull request #8886 from Dhilan007/v3-testcase-android 
Replace CCLOG with log in ConfigurationTest
 2014-10-21 16:06:23 +08:00
minggo c7791a4492 Merge pull request #8887 from samuele3hu/v3_new_spine 
Update cocos2d basic lua files and LabelTestNew.lua
 2014-10-21 16:04:30 +08:00
samuele3hu 8a2c66fc0e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-21 15:58:07 +08:00
Dhilan007 4e7d03f0e5 Replace CCLOG with log in ConfigurationTest 2014-10-21 15:56:52 +08:00
samuele3hu 2f9dbb7142 Update cocos2d basic lua files and LabelTestNew.lua 2014-10-21 15:56:38 +08:00
minggo 6c895dabd1 Merge pull request #8884 from Dhilan007/v3-labelfix 
Rolling back text color of system font on Linux
 2014-10-21 15:53:01 +08:00
Dhilan007 b741767b37 Rolling back text color of system font on Linux 2014-10-21 14:14:08 +08:00
Dhilan007 948dcafbb5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-labeljags 2014-10-21 14:07:48 +08:00
minggo 65f007f5ff Merge pull request #8857 from zhongfq/patch-2 
fix memory leak when add listener to ui object
 2014-10-21 13:57:07 +08:00
minggo 60ecec2ff6 Merge pull request #8881 from super626/v3 
Fix Bugs
 2014-10-21 13:55:48 +08:00
minggo 5c2ad2b151 Merge pull request #8878 from minggo/fix-warning 
fix warning
 2014-10-21 13:54:49 +08:00
minggo cd61574c69 Merge pull request #8879 from samuele3hu/v3_new_spine 
Fix require error in the LuaBridgeTest
 2014-10-21 12:05:08 +08:00
yangxiao 25409b441a adjust code 2014-10-21 11:59:03 +08:00
minggo 38e4acb120 Merge pull request #8880 from huangshiwu/v3_wp8fixbug 
fix WP8 debug mode crash - update WP8's precompileshader.h
 2014-10-21 11:58:07 +08:00
samuele3hu e9a8b933bd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-21 11:53:39 +08:00
samuele3hu c5abef0a60 Fix LuaBridgeTest require error 2014-10-21 11:52:33 +08:00
XiaoYang 9a7ecbf22b Merge pull request #146 from tangziwen/v3 
fix some bugs when loading Animation3D from binary file
 2014-10-21 11:47:45 +08:00
minggo f3e4c705eb more warnings fixed 2014-10-21 11:47:28 +08:00
tangziwen 61a6fda1c0 fix some bugs when loading Animation3D from binary file 2014-10-21 11:43:28 +08:00
minggo db8dc25b01 fix warning 2014-10-21 11:40:34 +08:00
minggo 7eead2b75a Merge pull request #8877 from minggo/update-release-note 
[ci skip]update release note
 2014-10-21 11:19:12 +08:00
minggo c255ffd6a6 update release note 2014-10-21 11:18:15 +08:00
huanghsiwu e392bf9b17 fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify 2014-10-21 11:14:07 +08:00
minggo 0b77a907cc Merge pull request #8876 from SunLightJuly/fix_bug 
fixed bug of definition of utils:: getCascadeBoundingBox()
 2014-10-21 11:13:31 +08:00
SunLightJuly 0cb8a3922b fixed bug of definition of utils:: getCascadeBoundingBox() 2014-10-21 11:07:11 +08:00
Dhilan007 708d6b491d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-labeljags 2014-10-21 10:07:52 +08:00
XiaoYang bf931d5883 Merge pull request #145 from tangziwen/v3 
fix animation3D ID bug
 2014-10-21 10:04:46 +08:00
minggo 6313f9a622 Merge pull request #8868 from samuele3hu/v3_new_spine 
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
 2014-10-21 09:33:40 +08:00
yangxiao 1a72d89194 fix AABB computation 2014-10-20 22:53:24 +08:00
tangziwen 8f7d202816 fix animation3D ID bug 2014-10-20 19:22:00 +08:00
minggo 0f053a1367 Merge pull request #8872 from CocosRobot/update_lua_bindings_1413800099 
[AUTO]: updating luabinding automatically
 2014-10-20 18:18:19 +08:00
CocosRobot e02558e391 [AUTO]: updating luabinding automatically 2014-10-20 10:17:27 +00:00
minggo 2ff0bec6de Merge pull request #8871 from CocosRobot/update_cocosfiles_1413799960 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-20 18:13:31 +08:00
CocosRobot 2355be4e92 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-20 10:12:41 +00:00
minggo b2d1549686 Merge pull request #8869 from Dhilan007/v3-movefile 
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
 2014-10-20 18:10:52 +08:00
minggo e844c8d548 Merge pull request #8870 from minggo/update-release-note 
[ci skip]Update release note
 2014-10-20 18:08:12 +08:00
minggo 74f82577c2 update release note 2014-10-20 18:07:33 +08:00
minggo 2aeeea38dd fix some grammer 2014-10-20 17:58:35 +08:00
minggo 7b05d9e06f fix conflict 2014-10-20 17:55:48 +08:00
samuele3hu 20bcafa143 Fix the bug that callbacks aren’t triggered when response failed 2014-10-20 17:43:04 +08:00
minggo 8fea3f2c2c update release note 2014-10-20 17:34:02 +08:00
Dhilan007 ca5d4e2cdf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-labeljags 2014-10-20 16:53:35 +08:00
Dhilan007 47629aec64 Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:42:00 +08:00
minggo 0dd8e89bb2 Merge pull request #8863 from Dhilan007/v3-labelfix 
Fix wrong text color for system font on Linux/Window
 2014-10-20 16:38:32 +08:00
minggo 6db6eefe1a Merge pull request #8867 from super626/releasenote 
Wrong worlds and signs in Releasenote
 2014-10-20 16:37:23 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
samuele3hu 042969ce35 Remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini 2014-10-20 16:14:24 +08:00