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

25816 Commits

Author SHA1 Message Date
samuele3hu 9900ccba4d Add support to clang3.4 because of using the ndk-r10c 2014-12-01 11:15:56 +08:00
honghui 118569c972 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-30 15:37:30 +08:00
Huabing.Xu c9d0b0f1f2 Merge pull request #9315 from dabingnn/v3_3rc1 
udpate changeLog
 2014-11-29 22:31:28 +08:00
Huabing.Xu 24fe7d9829 udpate changeLog 2014-11-29 22:30:54 +08:00
Huabing.Xu 6db15b09b9 Merge pull request #9314 from cocoscodeide/runtime 
update runtime template
 2014-11-29 22:24:26 +08:00
Huabing.Xu 0aa50b8b68 Merge pull request #9312 from dabingnn/v3_3rc1 
update releaseNotes
 2014-11-29 20:27:36 +08:00
honghui 047c36a270 update runtime template 2014-11-29 16:05:18 +08:00
Huabing.Xu 2d94a78baa update releaseNotes 2014-11-29 13:20:21 +08:00
Huabing.Xu 522a77e1a8 Merge pull request #9311 from andyque/fixLinuxTemplate 
fix linux cpp and lua template
 2014-11-29 09:20:22 +08:00
andyque 79918d789e fix cocos2d root 2014-11-28 08:24:48 -08:00
andyque bdd46f7e55 fix linux cpp and lua template 2014-11-28 08:20:02 -08:00
Park June Chul 9b792d97c4 Merge pull request #2 from cocos2d/v3 
update project
 2014-11-28 22:52:13 +09:00
Huabing.Xu 21653516d7 Merge pull request #9309 from CocosRobot/update_cocosfiles_1417164855 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-28 16:55:54 +08:00
CocosRobot ff8d2624eb [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-28 08:54:16 +00:00
honghui 9fefad5f35 debugging lua code in package support 2014-11-28 15:40:12 +08:00
Huabing.Xu 639a654232 Merge pull request #9307 from andyque/change3rdparty 
change 3rd party dependency to 26
 2014-11-28 15:14:50 +08:00
yangxiao b476e65c6a Merge branch 'newcode' into fixsprite 2014-11-28 14:33:04 +08:00
andyque 09e41f5f19 change 3rd party dependency to 26 2014-11-28 14:25:48 +08:00
yangxiao 437ee04d5d fix linux 2014-11-28 14:12:38 +08:00
XiaoYang 16ce7ac50f Merge pull request #168 from lvlonggame/v3 
fix bug: if the material's content  that version 0.1 is empty.
 2014-11-28 13:54:04 +08:00
Huabing.Xu 1fbf153454 Merge pull request #9304 from Dhilan007/v3-lua-fix 
Update the reference of submodule cocos2d-console
 2014-11-28 13:50:01 +08:00
Dhilan007 6603d7183a Update the reference of submodule cocos2d-console 2014-11-28 13:41:52 +08:00
samuele3hu 802ba311d6 Fix the error that SpritePerformanceTest lua does’t work 2014-11-28 11:54:38 +08:00
samuele3hu 3ee29b3124 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-11-28 10:48:13 +08:00
samuele3hu c1f718c3fd Fix cpp-test compile error and a bug of Confined 2014-11-28 10:40:41 +08:00
minggo 9894c738c1 Merge pull request #9294 from starwing/check_settexture 
nullptr check when Sprite::setTexture with non-exists file
 2014-11-28 10:19:01 +08:00
minggo be0f6751a7 Merge pull request #9292 from CocosRobot/update_lua_bindings_1417097061 
[AUTO]: updating luabinding automatically
 2014-11-28 09:37:14 +08:00
minggo f3e53d7700 Merge pull request #9299 from CocosRobot/update_cocosfiles_1417117059 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-28 09:36:53 +08:00
minggo 839a8c2dd4 Merge pull request #9289 from Dhilan007/v3-lua-fix 
Fixed compiling and linking error of new lua projects when using NDK r10 above.
 2014-11-28 09:35:19 +08:00
CocosRobot 38c3bc7b4f [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-27 19:37:40 +00:00
Ricardo Quesada 2362ea372c new console version 2014-11-27 11:34:43 -08:00
Ricardo Quesada 4a5069244f Ouch. DEBUG instead of RELEASE for Build on Xcode 2014-11-27 10:54:09 -08:00
Ricardo Quesada 154a059d1c mend 2014-11-27 10:53:29 -08:00
Ricardo Quesada 83f9d5d536 Updates CHANGELOG 2014-11-27 10:51:46 -08:00
Ricardo Quesada ab8838f0c0 New cocos2d-console version 2014-11-27 10:48:19 -08:00
Ricardo Quesada fe4b34fcc3 Merge pull request #9260 from ricardoquesada/sprite_perf_test_automated 
Sprite Performance Test automation works OK
 2014-11-27 10:06:10 -08:00
Ricardo Quesada 7c89e9e94d Compiles on VS2012 
...hopefully. Using _MSC_VER < 1800 for CC_ROUND
 2014-11-27 08:58:07 -08:00
Ricardo Quesada 1a2acb9039 including <math.h> to make VS2012 Express happy 2014-11-27 07:28:07 -08:00
CocosRobot d7cdafbd77 [AUTO]: updating luabinding automatically 2014-11-27 14:06:30 +00:00
minggo 95a99b7772 Merge pull request #9287 from CocosRobot/update_lua_bindings_1417095414 
[AUTO]: updating luabinding automatically
 2014-11-27 22:04:06 +08:00
minggo 6db7cfb68b Merge pull request #9039 from pandamicro/v3_origin 
#9061: Polish AssetsManagerEx, bug fixes and feature added
 2014-11-27 22:01:03 +08:00
Dhilan007 3025e937f6 Fixed compiling and linking error of new lua projects when using NDK r10 above. 2014-11-27 21:56:06 +08:00
pipu dfc98ae620 Merge pull request #16 from stammen/v3_flatbuffers_fix 
V3 flatbuffers fix for WP8 and Universal App
 2014-11-27 21:41:06 +08:00
CocosRobot f0c31172b8 [AUTO]: updating luabinding automatically 2014-11-27 13:39:15 +00:00
Dale Stammen 117d7bd5e8 fixed universal app project files for flatbuffers 2014-11-27 05:34:36 -08:00
minggo cc1a19efaa Merge pull request #9281 from Dhilan007/v3-lua-fix 
Add FlatBuffer to ignore list
 2014-11-27 21:32:36 +08:00
Dale Stammen 267edeafd3 fixed wp8 project files for flatbuffers 2014-11-27 05:22:07 -08:00
Dale Stammen 301e947c37 no initialization list for WP8 2014-11-27 05:21:04 -08:00
StarWing d5125ae179 nullptr check when Sprite::setTexture with non-exists file 2014-11-27 21:15:09 +08:00
minggo 2936f79c4d [ci skip] update deps version 2014-11-27 20:56:15 +08:00