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

25052 Commits

Author SHA1 Message Date
Dhilan007 ed4e800d70 Add audio resource. 2014-09-23 15:38:40 +08:00
minggo 62697bbb42 Merge pull request #8122 from andyque/fixJenkins 
uncomment 3rd part bins check
 2014-09-23 11:57:57 +08:00
minggo bb1771a000 [ci skip] 2014-09-23 11:18:56 +08:00
minggo 34799958b5 Merge pull request #8101 from SunLightJuly/get_cascade_bounding_box 
added utils::getCascadeBoundingBox()
 2014-09-23 11:13:09 +08:00
andyque 0267712531 uncomment 3rd part bins check 2014-09-23 10:55:34 +08:00
minggo db0e203447 Merge pull request #8121 from CocosRobot/update_cocosfiles_1411435563 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-23 10:18:45 +08:00
CocosRobot 2c1649f773 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-23 01:26:04 +00:00
minggo 66896fd4f6 Merge pull request #8119 from SmartCat/v3 
* added default value for _batchNode in CCSprite
 2014-09-23 09:23:56 +08:00
Dmitry Bushtets d242d79443 * added default value for _batchNode in CCSprite 2014-09-22 19:00:21 +03:00
SmartCat 76fffb9402 Merge pull request #1 from cocos2d/v3 
- fastforward
 2014-09-22 18:54:53 +03:00
Sergey b8b5397e4e Tests for Mac/iOS android Linux & Windows 2014-09-22 17:54:49 +04:00
Guy Kogus 908311ff7f Added tests for opening a URL. 2014-09-22 17:51:05 +04:00
Guy Kogus 6e91c65e74 Windows Phone 8 can now open URLs. 2014-09-22 17:47:38 +04:00
Guy Kogus a9a0ff35f6 Added method for converting from std::string to Platform::String. 2014-09-22 17:47:38 +04:00
Sergey 2255cf91ba openUrl function for all platform but on windows RT empty function 2014-09-22 17:47:38 +04:00
minggo ebfdd956c3 Merge pull request #8117 from minggo/use-submodule-for-external 
Use submodule for external
 2014-09-22 21:37:17 +08:00
minggo f890ad0d00 add external submodule 2014-09-22 18:29:21 +08:00
songchengjiang 216c40fe9e Modified Light Shader 2014-09-22 18:08:58 +08:00
Dhilan007 ac916c3027 Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7. 2014-09-22 18:01:13 +08:00
Dhilan007 c37371a543 fix noise on mac 2014-09-22 16:59:24 +08:00
minggo bf7f0801c4 update submodule on download-deps.py 2014-09-22 16:32:52 +08:00
minggo 3eafe9b53a add external submodule 2014-09-22 16:30:54 +08:00
Dhilan007 1651c6ab23 update project 2014-09-22 15:58:50 +08:00
Dhilan007 077ffb2b43 update lua binding 2014-09-22 15:54:35 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
minggo c4cd78cc96 remove external 2014-09-22 14:50:03 +08:00
cpascal fe07589141 Fixed my mistakes - preprocessor. 2014-09-22 14:25:47 +09:00
cpascal 07f5568ae8 Using CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION instead of CC_USE_PHYSICS 2014-09-22 14:19:08 +09:00
yangxiao 61def04ca6 add light mask 2014-09-22 11:14:30 +08:00
minggo 533a454914 Merge pull request #8113 from huangshiwu/v3_wp8test 
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
 2014-09-22 09:54:39 +08:00
huanghsiwu 41b4ba8307 fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp 2014-09-22 09:42:33 +08:00
minggo 3f7fc6ead1 Merge pull request #8111 from joewan/v3 
fix compile on ubuntu.
 2014-09-22 09:38:52 +08:00
minggo 81c7d4f638 Merge pull request #8112 from CocosRobot/update_cocosfiles_1411349538 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-22 09:33:30 +08:00
minggo 0368d5ace4 [ci skip] 2014-09-22 09:33:09 +08:00
CocosRobot 93bfc08d67 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-22 01:32:19 +00:00
minggo dd264316d2 [ci skip] 2014-09-22 09:31:57 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
joewanchen f22c15bf1c fix. 2014-09-22 00:08:44 +08:00
joewanchen 3f2895beab fix compile on ubuntu. 2014-09-21 23:49:43 +08:00
minggo c2bac086a7 [ci skip]update version info 2014-09-19 21:54:01 +08:00
minggo 0483589041 Merge pull request #8110 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-19 17:05:34 +08:00
minggo a1c0761107 [ci skip] 2014-09-19 17:04:41 +08:00
zhangbin 3b007e0845 Update the reference of submodule cocos2d-console. 2014-09-19 17:03:34 +08:00
minggo a1052e0384 [ci skip] 2014-09-19 17:02:09 +08:00
minggo 6569f1a7f0 Merge pull request #8108 from huangshiwu/v3_wp8test 
fix wp8 directory control bug
 2014-09-19 16:57:02 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
minggo 681621805d Merge pull request #8109 from andyque/fixTests 
fix editbox test
 2014-09-19 16:29:07 +08:00
minggo 653986a3a2 Merge pull request #8106 from super626/v3 
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
 2014-09-19 16:16:33 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00