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