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

1103 Commits

Author SHA1 Message Date
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
CocosRobot 945be7529d [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-19 01:34:14 +00:00
CocosRobot f9192835c9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-16 16:13:41 +00:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy 6e8188d4ff Fix lang file path for vs project 2015-01-15 14:04:15 +08:00
yinjimmy 9f60e82cc7 Fix compile error with lua-tempate-default / lua-template-runtime 2015-01-15 13:34:23 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
CocosRobot b2db3c13dd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 15:39:55 +00:00
yinjimmy 49869847cc add default `-workdir` for vs project 2015-01-14 18:45:18 +08:00
CocosRobot b703c7b169 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 09:30:59 +00:00
CocosRobot 88029d33bd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 08:45:40 +00:00
yinjimmy f2ab171fab Merge branch 'v3' into combine 2015-01-14 16:38:06 +08:00
yinjimmy a80e26f680 cleanup 2015-01-14 16:27:29 +08:00
CocosRobot 29d85ca8c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 08:12:14 +00:00
yinjimmy bd3c250a6d add proj.linux support 2015-01-14 14:44:48 +08:00
CocosRobot 5faeb6919a [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 03:39:38 +00:00
yinjimmy bdf4393be0 Fix runtime output directory for Windows release mode 2015-01-14 10:18:00 +08:00
yinjimmy 49b265d147 cleanup 2015-01-13 19:44:46 +08:00
yinjimmy 54443a7a9b add missing runtime/config.json 2015-01-13 18:41:05 +08:00
yinjimmy dc019defc1 Merge branch 'v3' into combine 2015-01-13 18:32:32 +08:00
yinjimmy c3a536bcf0 add lua-template-runtime 2015-01-13 18:28:33 +08:00
Dale Stammen f53a493ac7 fixed automatic adding of resources 2015-01-12 11:56:58 -08:00
Dale Stammen f466f4e986 added missing arial font that is required by WP8 2015-01-12 11:32:51 -08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
CocosRobot 27da58e4b5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-12 12:13:39 +00:00
yinjimmy d1205ceeea remove lua-template-runtime folder 2015-01-12 17:55:41 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy d1821fb1ef update template for iOS 2015-01-12 12:46:43 +08:00
WenhaiLin 2c728fa341 Fixed can't run new CPP project on android by Eclipse 2015-01-09 15:01:08 +08:00
yinjimmy f98ff24e97 Support `isLandscape` field in config.json 2015-01-09 14:39:45 +08:00
yinjimmy db80ab0028 update lua default template 2015-01-09 13:21:19 +08:00
yinjimmy 2f3270fa0b Fix: can not load Lua project with command `cocos run -p mac -m release` 2015-01-09 12:32:54 +08:00
yinjimmy 349f5d1a87 add config.json 2015-01-09 11:43:41 +08:00
dualface 9030e32adc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-09 11:30:35 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
dualface 7046f508da update proj.win32 for templates 2015-01-09 03:10:54 +08:00
CocosRobot f6de697bde [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-08 06:05:46 +00:00
dualface 8066343c69 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 17:39:30 +08:00
CocosRobot 6a88a51e24 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-07 02:23:16 +00:00
dualface 156e9eb4f2 update templates 2015-01-06 08:31:43 +08:00
dualface efada94e18 update proj.ios_mac 2015-01-05 17:56:34 +08:00
yinjimmy d4681c1150 update google analytics tid 2015-01-05 12:15:52 +08:00
yinjimmy fb5bd01ac1 fix: compile error on win32 with release model 2014-12-31 20:00:51 +08:00
dualface df82dfc873 update config.json 2014-12-31 18:49:02 +08:00
dualface 3077e294b7 update runtime version 2014-12-31 18:39:51 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
minggo 2495d698c0 Merge pull request #9745 from huangshiwu/iosnetwork_template 
iOS runtime template add security.framework
 2014-12-31 15:20:20 +08:00
minggo 50914665e6 Merge pull request #9742 from huangshiwu/iosnetwork_template 
ios template add security.framework
 2014-12-31 15:15:08 +08:00
huangshiwu 7702c102a2 iOS runtime template add security.framework 2014-12-31 15:15:01 +08:00
CocosRobot 85ccfb2209 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 07:14:27 +00:00
huangshiwu ac2ff38624 ios template add security.framework 2014-12-31 14:46:34 +08:00
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08:00
CocosRobot ced43a1c2b [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 05:50:50 +00:00
CocosRobot d4c9205320 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 05:01:17 +00:00
CocosRobot 1f8bb3f808 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 04:51:26 +00:00
CocosRobot a3e15a3d29 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 01:59:46 +00:00
CocosRobot cb7a63b413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-30 10:34:54 +00:00
minggo a1e8dec384 use cocos console in build_native.py and android-build.py 2014-12-30 16:24:16 +08:00
yinjimmy 2652a67040 cleanup 2014-12-30 16:02:05 +08:00
yinjimmy d986c974d7 compatible code 2014-12-30 16:01:47 +08:00
yinjimmy 4c57a29455 fix: init config on all platform & stop runtime when exit 2014-12-30 15:59:52 +08:00
CocosRobot e7a7ee750f [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 05:48:30 +00:00
dualface 82c40ca5e8 add Cocos Studio support 2014-12-29 13:41:21 +08:00
dualface 653b15b4b8 add UIWidget support, fix typo 2014-12-29 13:37:20 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
dualface 0acdd4f4a3 cleanup lua-template-runtime 2014-12-29 10:55:05 +08:00
CocosRobot b385ce58d0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 02:31:59 +00:00
minggo 87a9039065 Merge pull request #9660 from yinjimmy/newLuaRuntime 
add new lua runtime
 2014-12-29 10:04:02 +08:00
minggo 212684fcd4 Merge pull request #9665 from andyque/fixLibpngWarning 
Fix libpng warning
 2014-12-29 10:00:43 +08:00
CocosRobot 0a4785d6fc [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 01:45:01 +00:00
yinjimmy e75d283455 1. do not setFrameSize when resetDesignResolution 
2. read config.json when ConfigParser init
 2014-12-29 09:16:07 +08:00
dualface a4d17998d3 update lua-template-runtime 2014-12-29 05:55:56 +08:00
dualface 2ba25a473f update lua-default-template 2014-12-29 05:51:49 +08:00
andyque 9c974eebd0 fix libpng warning 2014-12-27 20:47:59 +08:00
yinjimmy 4280ffcf58 add new lua runtime 2014-12-27 02:21:55 +08:00
CocosRobot a8fedda82c [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-26 01:29:15 +00:00
CocosRobot 542b2b6bd2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-25 06:10:51 +00:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
Igor Mozharovsky d0c223c3e0 Rewrite using already existing director's variable 2014-12-24 19:21:32 +02:00
CocosRobot 95df9ba145 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-24 09:37:39 +00:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
CocosRobot 94d96b5ad1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-23 04:01:55 +00:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
CocosRobot 7170e85a7a [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-19 22:37:52 +00:00
honghui 3c3b190be8 update runtime version 2014-12-12 15:47:12 +08:00
honghui ab162a01f4 runtime's setSearchPaths failed 2014-12-11 22:16:39 +08:00
minggo 73ece5ad09 Merge pull request #9385 from samuele3hu/v3_cocostudio 
Remove useless copy about luasocket on the android platform
 2014-12-09 18:28:08 +08:00
youyou 5bcc1c29d9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua
 2014-12-05 20:13:27 +08:00
honghui 61e13bf2a1 update runtime version to 1.6 2014-12-05 16:09:43 +08:00
samuele3hu 3e0852eb7a Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
CocosRobot b7d553f5db [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-04 07:13:03 +00:00
minggo 3faeee66e3 Merge pull request #9358 from cocoscodeide/v3 
merge runtime to v3
 2014-12-04 14:00:17 +08:00
honghui 2aa05bff39 revert file commit by mistake 2014-12-04 13:53:55 +08:00
CocosRobot 918372556b [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-04 02:08:20 +00:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
honghui 118569c972 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-30 15:37:30 +08:00
honghui 047c36a270 update runtime template 2014-11-29 16:05:18 +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
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
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
CocosRobot 38c3bc7b4f [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-27 19:37:40 +00: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
Filipe Lemos b722df671b Fix CPU check on android template 2014-11-26 11:02:22 +00:00
honghui 52780dff28 fix some memory leak 2014-11-26 14:58:23 +08:00
Dale Stammen 6ad3a23ed3 added support for lost directx device 2014-11-25 08:25:34 -08:00
Dale Stammen 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate 2014-11-25 08:07:29 -08:00
CocosRobot 0b286aa412 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-25 14:48:14 +00:00
CocosRobot 8c20e7a5c6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-25 01:35:25 +00:00
CocosRobot 451cbe52d2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-24 09:54:39 +00:00
honghui 0e73301fc4 remove "using namespace" from header files 2014-11-24 17:13:24 +08:00
honghui 84a8c75ad5 Split Runtime.cpp to individual class files 2014-11-24 11:14:35 +08:00
youyou d04945d77c update templates 2014-11-24 11:08:37 +08:00
honghui 3477e0fa19 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 10:43:34 +08:00
Dale Stammen a607d41454 implemented lostDevice support when app loses the directx device 2014-11-21 16:24:51 -08:00
Dale Stammen 2a86c77066 added foreground, background, lostdevice support 2014-11-21 10:31:57 -08:00
CocosRobot 2398712b9d [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-21 01:57:39 +00:00
honghui 941c8281cd revert commit a7f8199e65 2014-11-20 21:20:54 +08:00
honghui a97386f8d7 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-20 21:20:54 +08:00
Dale Stammen 5d2857b3c4 updated angle to commit 4a980d2612 2014-11-19 15:55:18 -08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
CocosRobot 18b0a6cacc [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-16 17:32:13 +00:00
CocosRobot c227ba9e40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-14 21:10:45 +00:00
zhangbin 4ef7c9f948 Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console. 2014-11-14 16:48:14 +08:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
minggo 5f1ca44f0c Merge pull request #9071 from mikandi/feature/android-build-native-with-spaces 
Android build_native.py with spaces in path
 2014-11-13 18:37:37 +08:00
CocosRobot 4ae4932e8a [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-11 22:17:01 +00:00
Vladimir Timofeev 77ab866090 Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications. 2014-11-11 10:30:48 +03:00
Christopher O'Connell 5d26bc045c Fixed failure in call to make when the android app folder contains spaces in the path. 2014-11-10 00:38:32 -07:00
CocosRobot 80ce1537e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-07 02:34:46 +00:00
honghui 8af00cdb06 runtime demo is ugly when screen orientation is portrait 2014-11-06 11:30:01 +08:00
minggo 5ee8f0a134 Merge pull request #8976 from hongliang-goudou/runtime_addSearchPath_argc 
overrided addSearchPath() by Runtime.cpp should support second argument
 2014-11-01 11:35:05 +08:00
hongliang adb221babe init arg1 as false for safety 2014-10-31 15:23:46 +08:00
minggo e87e0290fd Merge pull request #8958 from MSOpenTech/wp8-shader-fix 
WP8 Shader fix for cocos2d-x issue 8933
 2014-10-31 09:43:31 +08:00
hongliang 0d006ce6d1 overrided addSearchPath() by Runtime.cpp should support second argument as CCFileUtils.cpp does. 2014-10-30 17:07:37 +08:00
samuele3hu c9daa8244e Add include directories to fix compile error on the window and remove useless `PreBuildEvent` 2014-10-29 16:09:35 +08:00
Dale Stammen af14b40ba0 must call DisplayInformation::GetForCurrentView() from main UI thread 2014-10-27 13:40:19 -07:00
Dale Stammen 510c8caed7 added DPI support for universal app 2014-10-27 11:12:54 -07:00
CocosRobot 29264db249 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-25 07:47:09 +00:00
minggo b99f0bf321 Merge pull request #8926 from MSOpenTech/wp8.1-universal 
WP8.1 universal app
 2014-10-25 15:45:50 +08:00
Dhilan007 788c793147 Fix CPP template on Window 2014-10-24 23:18:35 +08:00
Dale Stammen 3b8537b7e4 updated template files 2014-10-24 06:08:38 -07:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen c38a37837a added cpp template for windows 8.1 universal apps 2014-10-23 07:40:42 -07:00
Dale Stammen f359c7285e remove PhoneDirect3DXamlAppComponent namespace refactor 2014-10-23 07:21:48 -07:00
Dale Stammen 4596417a0b remove PhoneDirect3DXamlAppComponent namespace. Updated edit text code 2014-10-23 07:19:05 -07:00
Dale Stammen b7fd0dd722 remove PhoneDirect3DXamlAppComponent namesapce refactor 2014-10-23 07:17:58 -07:00
honghui e394a0cc30 update runtime version to 1.5 2014-10-21 18:48:14 +08:00
CocosRobot 2355be4e92 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-20 10:12:41 +00:00
CocosRobot aa7478d375 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-19 12:09:52 +00:00
minggo 8318b16922 Merge pull request #8827 from cocoscodeide/v3 
don't show runtime on top by default
 2014-10-18 15:12:17 +08:00
minggo 8218804c52 Merge pull request #8820 from Dhilan007/v3-audioengine-lua 
[LUA]Add New AudioEngine on window
 2014-10-18 15:11:29 +08:00
huanghsiwu f549aa3747 fix wp8 template crash bug by modefy font resource's properties 2014-10-18 11:20:12 +08:00
honghui f2647e56e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-18 09:45:25 +08:00
minggo b4ffad06eb Merge pull request #8822 from huangshiwu/v3_fixtemplate 
change ios and mac template's resource struct
 2014-10-17 23:00:42 +08:00
huangshiwu 4802821efd change ios and mac template's resource struct 2014-10-17 18:22:25 +08:00
huangshiwu 60429247ea edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 18:17:49 +08:00
Dhilan007 a65b5d7541 Fix CPP template project crash 2014-10-17 18:17:49 +08:00
honghui 788c58ec90 don't show runtime on top by default 2014-10-17 18:00:26 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
minggo 8b0f61dfb0 Merge pull request #8817 from huangshiwu/v3_luaruntimelaunchimage 
edit lua-template-runtime's ios info.plist to change launch image's disp...
 2014-10-17 17:52:29 +08:00
honghui f6b5ebb53b delete unused code 2014-10-17 17:36:45 +08:00
huangshiwu 9f4689b3ce edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 17:29:35 +08:00
Dhilan007 4bede5067e Fix CPP template project crash 2014-10-17 17:02:22 +08:00
honghui 8c0af59f9a open lua debugger only when IDE connected 2014-10-17 14:55:20 +08:00
honghui 8a38d192bb win32 runtime need more dll files 2014-10-17 14:55:20 +08:00
CocosRobot 592c39fd96 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-17 05:47:13 +00:00
minggo aa303e975f Merge pull request #8776 from huangshiwu/v3_iphone6hires 
add launch images to templates to support iPhone6 and iPhone6+'s native ...
 2014-10-17 12:03:56 +08:00
huangshiwu d05aa84699 add launch images to templates to support iphone6 and iphone6+'s native resolution mode 2014-10-17 11:40:22 +08:00
ledenis 33d01965be Changed deprecated LabelTTF::create() to Label::createWithTTF() in the HelloWorld 2014-10-16 16:58:24 +02:00
minggo b4867bf6e5 Merge pull request #8715 from iSevenDays/v3 
CMakes support for Mac Os X & iOS
 2014-10-16 21:16:02 +08:00
CocosRobot 39d3cb20b5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 13:12:34 +00:00
CocosRobot 6f79cbd64c [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 10:16:52 +00:00
CocosRobot f50989fa79 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 09:51:29 +00:00
CocosRobot ec067b15ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 09:25:47 +00:00
minggo 08c1f58398 Merge pull request #8740 from natural-law/v3 
Solve the error effect of lua runtime template on iOS.
 2014-10-16 16:22:23 +08:00
zhangbin a7cb5f74e6 Solve the error effect on iOS. 2014-10-16 16:19:50 +08:00
CocosRobot a6f0c1322c [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 06:02:13 +00:00
minggo 1692ee715f Merge pull request #8728 from Dhilan007/v3-templatefix 
Make resources output by Cocos Studio automatically packed into ipa
 2014-10-16 14:00:48 +08:00
Dhilan007 fcee230cab Make resources output by Cocos Studio automatically packed into ipa 2014-10-16 13:56:03 +08:00
CocosRobot ac3753092b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 03:56:42 +00:00
minggo 8461165fad Merge pull request #8722 from samuele3hu/v3_assetsmanager 
Add AssetsmanagerEx and adjust related project configure and files
 2014-10-16 11:55:24 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
CocosRobot cbdbee1876 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 01:35:18 +00:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
Dale Stammen 5d479a30aa updated wp8 cpp template 2014-10-15 09:49:24 -07:00
Anton Sokolchenko 60f4f71a83 small comment fix 2014-10-15 16:51:49 +03:00
Anton Sokolchenko 4f1430d25d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-10-15 16:36:18 +03:00
Anton Sokolchenko 41b51168d0 CMake fix for template projects 2014-10-15 16:33:58 +03:00
minggo 16ad1977b0 Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode 
Add clipping rectangle node
 2014-10-15 15:09:29 +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
CocosRobot 65aefcd5a3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 05:56:51 +00: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
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
CocosRobot da3f7ebe23 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 02:37:42 +00:00
Dale Stammen 420a19f222 run app after setting delegates 2014-10-14 18:12:24 -07:00
Dale Stammen 4313ff8cc9 updated wp8 include file 2014-10-14 16:53:56 -07:00
honghui 718b5a3cf8 Windows runtime response uncorrect 2014-10-15 00:20:18 +08:00
honghui 445c9dcde4 copy dll files to win32 runtime 2014-10-14 23:32:25 +08:00
dualface f45d9de8f2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update-lua-template-runtime 2014-10-14 23:11:12 +08:00
dualface 963474e43c update lua-template-runtime 2014-10-14 23:08:42 +08:00
minggo dc3997d41c Merge pull request #8691 from minggo/fix-runtime 
[ci skip]fix runtime error
 2014-10-14 21:38:33 +08:00
minggo 39bce5c22f fix runtime error 2014-10-14 21:37:04 +08:00
dualface 23781f7b92 fix coded debugger support 2014-10-14 18:26:56 +08:00
CocosRobot c816ea443d [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 09:10:38 +00: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
minggo 3274b6f9df Revert "[AUTO][ci skip]: updating cocos2dx_files.json" 2014-10-14 14:41:45 +08:00
CocosRobot 96954d1188 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 06:34:13 +00:00
Huabing.Xu b3be90bc5e Fix lua cocos console on linux 2014-10-13 17:42:59 +08:00
Huabing.Xu fcc892d90e add missed external module for cocos console on linux 2014-10-13 16:52:14 +08:00
SunLightJuly a36dbf5362 ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CocosRobot 7cb2cd8608 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-11 02:16:23 +00:00
dualface 74ec90f90f remove unused codes 2014-10-11 03:14:06 +08:00
dualface b49d2351ff update lua-template-default 2014-10-11 02:55:04 +08:00
CocosRobot 127b8acd14 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 14:23:42 +00:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
SunLightJuly ba064167a8 modified project files and make files 2014-10-10 18:43:40 +08:00
CocosRobot 80a92066c2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 08:42:41 +00:00
NeoLeeee a5a16eecbf the android library path is wrong 
if you run the following command in your game forder 

cocos run -p android

it will give you the following error since the path is wrong

BUILD FAILED
/Users/lifeng/dev/adt_bundle_mac/sdk/tools/ant/build.xml:459: ../../../cocos/platform/android/java resolve to a path with no project.properties file for project /Users/lifeng/study/cosco2dx/MyFirstGame/proj.android
 2014-10-10 01:33:41 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
CocosRobot 0b5122a11b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 05:49:41 +00:00
CocosRobot 79e641b3ff [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 02:06:14 +00:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
honghui de9a52892c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-08 17:11:19 +08:00
honghui 91901c16cb delete tip when reload file is empty(it's normal) 2014-10-08 17:06:58 +08:00
CocosRobot 75f21f9c10 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-08 01:41:20 +00:00
minggo 3873bbc5f7 Merge pull request #8060 from giuslape/v3 
Update Reference plugin-x
 2014-10-08 09:39:45 +08:00
CocosRobot d090576b94 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-06 13:11:39 +00:00
minggo bb6ba600a3 Merge pull request #8219 from cocoscodeide/v3 
runtime template support Xcode6
 2014-09-30 17:10:51 +08:00
honghui 62e06d25ed runtime template support Xcode6 2014-09-30 17:08:14 +08:00
honghui 7dbac13993 runtime template support Xcode6 2014-09-30 15:49:58 +08:00
CocosRobot 181ef40285 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 07:10:16 +00:00
CocosRobot f834ae8d07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 03:15:35 +00:00
minggo d1e41c771b Merge pull request #8162 from super626/light 
3D Light
 2014-09-30 11:13:59 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
CocosRobot 2f35269bf9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 18:08:55 +00:00
CocosRobot 13b165cf75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 10:31:52 +00:00
minggo 8a5829631d Merge pull request #8171 from huangshiwu/v3_Teivaz 
Enable screen orientation change handling - by Teivaz
 2014-09-29 18:02:03 +08:00
honghui 82eb6eeff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-29 16:28:18 +08:00
honghui 7a7a83020d change script file modified time will cause Cocos Code IDE reload file. 2014-09-29 16:27:13 +08:00
minggo 6583bf6b1f Merge pull request #8179 from MSOpenTech/wp8-v3-fix 
WP8 fixes for v3.3 app certification tests
 2014-09-29 13:42:40 +08:00
yangxiao e8904454e9 add to template 2014-09-28 16:08:05 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
Krzysztof Jusiak bb01201fa6 fix for wrong directory in linux cpp-template 2014-09-27 10:38:10 +01:00