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

6341 Commits

Author SHA1 Message Date
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
samuele3hu 6c79ce50d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
	tests/lua-tests/src/mainMenu.lua
 2014-10-15 15:07:30 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
samuele3hu a95e391756 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-15 11:24:27 +08:00
samuele3hu 70aa62a365 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-10-15 02:09:12 +08:00
CocosRobot 64a7ef9173 [AUTO]: updating luabinding automatically 2014-10-14 18:01:12 +00:00
samuele3hu 5b4e81aa3a Update Android.mk for libluacocos2d 2014-10-15 00:25:12 +08:00
samuele3hu 3e9900c40d Update win32 project config 2014-10-15 00:08:52 +08:00
samuele3hu 4a67963420 Update CSLoader lua-bindings and adjust project config 2014-10-14 23:37:00 +08:00
samuele3hu 735e86788e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-14 21:36:44 +08:00
samuele3hu 3b4fbd8fff Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes 2014-10-14 21:34:55 +08:00
minggo abd2687cf5 Merge pull request #8683 from dualface/update_lua_template_runtime 
update lua-template
 2014-10-14 17:01:19 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
andyque 5ea0f0c86a move include 2014-10-14 15:27:36 +08:00
andyque 2d4761966a fix jenkins linux compile error and add protobuf to ignore list 2014-10-14 15:11:50 +08:00
CocosRobot 51e714bdae [AUTO]: updating luabinding automatically 2014-10-14 06:32:12 +00:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +08:00
minggo dfdc446b34 Merge pull request #8204 from lite3/v3 
normalize path  on android.
 2014-10-14 11:50:03 +08:00
andyque 96660cb653 fix linux compile 2014-10-13 18:19:49 +08:00
minggo 1d5652ad48 Merge pull request #8635 from ahlwong/v3 
Fix UIButton setFontSize sync ContentSize
 2014-10-13 17:25:18 +08:00
pipu 7dc837338e Deleting cocos/scripting/lua-bindings/script/cocostudio 2014-10-13 16:34:31 +08:00
pipu a8febf9656 1. update wp8 projects. 2014-10-13 15:31:29 +08:00
yangxiao d81e4d7a92 fix light uniform array errors, and using shader without light by default fix #8612 2014-10-13 15:17:22 +08:00
pipu 72f5808678 Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-13 14:48:10 +08:00
minggo 0351000c97 Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap 
V3 add staggered tile map
 2014-10-13 13:50:50 +08:00
pipu fc8be6f0ff Reverting cocos/scripting/lua-bindings/auto 2014-10-13 13:06:42 +08:00
pipu 96c8fde63a 1. Modifying UIButton.cpp 
2.  Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
 2014-10-13 12:49:15 +08:00
minggo cb220fe528 Merge pull request #8657 from coldfog/v3 
Fix bug that ActionManagerEx::initWithBinary can only load one UI animation
 2014-10-13 10:20:27 +08:00
pipu 8040955062 Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt 2014-10-12 20:21:32 +08:00
pipu 2d51724686 1. Update wp8 projects. 2014-10-12 19:32:13 +08:00
pipu 93a7e22eb6 Modifying libcocos2d.vcxproj.filters 2014-10-12 18:55:43 +08:00
pipu 0d73c51a09 Modifying cocostudio/CSParseBinary.pb.h 2014-10-12 17:46:09 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
pipu 798d103479 Reverting cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj, cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters 2014-10-12 17:06:26 +08:00
pipu 86aee1e548 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
pipu 779e73dad0 1. change config.h in win32. 2014-10-12 15:27:41 +08:00
pipu 10e390557e Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-12 15:07:37 +08:00
Yuyao Feng cc22ba9854 Fix bug that ActionManagerEx::initWithBinary can only load one UI animation 2014-10-12 08:58:28 +08:00
maldewar e21dd9a10d Fixing conflict, use of macro function. 2014-10-11 13:06:42 -07:00
maldewar 5a7febdf25 Fixing merging, identation only conflicts. 2014-10-11 12:00:17 -07:00
lite3 3419a38961 Merge remote-tracking branch 'upstream/v3' into v3 2014-10-11 17:40:47 +08:00
minggo b144eb345a Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug 
fix DrawNode's memory leak -- delete vaos those are generated and forget...
 2014-10-11 17:31:17 +08:00
minggo 5a60e99131 Merge pull request #8577 from ntotani/detach-thread-on-exit 
call detach method on thread exit
 2014-10-11 16:54:59 +08:00
minggo c01d1b1166 Merge pull request #8646 from huangshiwu/v3_languagecode 
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
 2014-10-11 16:23:49 +08:00
minggo 8b34ea98de Merge pull request #8648 from Dhilan007/v3-zipfix 
fixed compile error
 2014-10-11 16:18:20 +08:00
CocosRobot 971d3a6653 [AUTO]: updating luabinding automatically 2014-10-11 08:12:44 +00:00
minggo 2db8217b09 Merge pull request #8543 from Dhilan007/v3-fixwarns 
fix warns and memory leak
 2014-10-11 16:07:54 +08:00
Dhilan007 d3733c4a45 fixed compile error 2014-10-11 16:05:34 +08:00
pipu 38ac6533a3 Removing ../../ in header file include 2014-10-11 15:50:44 +08:00