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

23990 Commits

Author SHA1 Message Date
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
minggo 20c0ec7301 Merge pull request #8132 from CocosRobot/update_cocosfiles_1411537404 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-24 13:50:55 +08:00
CocosRobot 78b51b3ffd [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 05:43:25 +00:00
minggo 0dd889683e Merge pull request #8129 from andyque/fixSubmodule 
remove submodule, use download.py instead
 2014-09-24 13:41:33 +08:00
andyque a158b79fb6 add more prompt to debug 2014-09-24 12:57:47 +08:00
andyque d066d02be5 add downloading prompt 2014-09-24 12:53:30 +08:00
andyque f8a05c9e1e recheck download.py 2014-09-24 12:42:53 +08:00
andyque 972c5f8ab2 adjust config 2014-09-24 12:03:17 +08:00
andyque a0d6bbbf9a add back config.json 2014-09-24 12:01:34 +08:00
minggo 2f3e64ab0c Merge pull request #8128 from CocosRobot/update_cocosfiles_1411527466 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-24 11:16:32 +08:00
minggo 8ce2b152c2 [ci skip] 2014-09-24 10:58:06 +08:00
CocosRobot 671739e9a8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 02:57:48 +00:00
minggo 5d59890455 Merge pull request #8127 from newnon/v3_precompiled_headers 
Precompiled headers improvements
 2014-09-24 10:55:45 +08:00
andyque ceb4932fd1 remove submodule 2014-09-24 10:27:53 +08:00
andyque 7e9ede728f revert download.py and delete submodule 2014-09-24 10:26:56 +08:00
Sergey Perepelitsa 0a46a83794 fix missing includes 2014-09-23 23:19:25 +04:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
minggo a5724a5be4 Merge pull request #8126 from minggo/v3 
update submodule
 2014-09-23 17:22:22 +08:00
minggo a711ca1b3d update submodule 2014-09-23 17:14:52 +08:00
minggo a51254decf Merge pull request #8124 from Dhilan007/v3-res 
Add audio resource.
 2014-09-23 17:10:50 +08:00
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
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
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
minggo c4cd78cc96 remove external 2014-09-22 14:50:03 +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