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
Dale Stammen
1f9d260207
added updated template files
2014-09-26 11:03:10 -07:00
yangxiao
1e5a02df2b
add to template
2014-09-26 23:13:20 +08:00
huanghsiwu
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
CocosRobot
87c04a3e5d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-26 07:00:12 +00:00
minggo
ebf0562b84
remove armv7s support on iOS
2014-09-26 10:35:50 +08:00
CocosRobot
1f2fc054fe
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-25 10:05:55 +00:00
minggo
b0f2fd965a
Merge pull request #8151 from CocosRobot/update_cocosfiles_1411623783
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-25 13:45:19 +08:00
CocosRobot
e0d14458a5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-25 05:43:04 +00:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
minggo
aec6cf1e81
Merge pull request #8143 from cocoscodeide/v3
...
read config.json may failed caused by syntax error
2014-09-25 13:36:08 +08:00
honghui
206e158596
performance improvement for lua runtime on Run mode
2014-09-25 12:01:16 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
honghui
8079722aff
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-09-25 09:55:00 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
Dale Stammen
1146f1a8db
use CCGLViewImpl.h
2014-09-24 08:38:48 -07:00
CocosRobot
02d343fefc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 09:03:33 +00:00
CocosRobot
78b51b3ffd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 05:43:25 +00:00
honghui
b513dbafb5
read config.json may failed caused by syntax error
2014-09-24 11:43:21 +08:00
CocosRobot
671739e9a8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 02:57:48 +00:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
CocosRobot
2c1649f773
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-23 01:26:04 +00:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
minggo
3f7fc6ead1
Merge pull request #8111 from joewan/v3
...
fix compile on ubuntu.
2014-09-22 09:38:52 +08:00
CocosRobot
93bfc08d67
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-22 01:32:19 +00: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
45d311bb34
remove dependence of CoreGraphics for on mac
2014-09-19 14:02:13 +08:00
honghui
11c0d6ff25
fix:runtime crash when upload file to Mac/Win32
2014-09-18 12:40:26 +08:00
honghui
fa4a6fae32
fix bug: response not been sent completely
2014-09-17 18:01:25 +08:00
honghui
86416e73ca
sync code from default template
2014-09-16 16:19:05 +08:00
honghui
c34eedae1c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-09-16 11:53:55 +08:00
samuele3hu
2fa87b9c38
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
2014-09-16 09:57:45 +08:00
samuele3hu
0c2268d85e
Update release configure setting for cpp template
2014-09-16 09:57:10 +08:00
CocosRobot
34f679a88a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 19:27:41 +00:00
Giuseppe Lapenta
3c76e6fecd
Update Reference for template
2014-09-15 17:55:39 +02:00
minggo
d62e3762d2
Merge pull request #8054 from andyque/fixWin32Template
...
fix resource path
2014-09-15 16:42:46 +08:00
andyque
d6bacea506
fix resource path
2014-09-15 16:40:32 +08:00
minggo
d96050e1ce
Merge pull request #8048 from Dhilan007/v3-audio903
...
update LUA templates for AudioEngine.
2014-09-15 16:00:11 +08:00
andyque
b6bd70f119
fix lua runtime compile error
2014-09-15 15:35:04 +08:00
andyque
36feb8e47b
fix lua win32 template compile error
2014-09-15 15:10:55 +08:00
andyque
8b4a7902ec
fix cpp template compile
2014-09-15 14:43:41 +08:00
minggo
7084070c4a
Merge pull request #8049 from natural-law/v3
...
Modify the config file in template for the folder rename.
2014-09-15 13:59:37 +08:00
zhangbin
0f62ac19c0
Modify the config file in template for the folder rename.
2014-09-15 13:56:15 +08:00
Dhilan007
1639d759af
update LUA templates for AudioEngine.
2014-09-15 13:51:18 +08:00
CocosRobot
5e936ec8ca
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 05:46:24 +00:00
minggo
9e36be70f8
Merge pull request #8035 from andyque/fixLuaTemplate
...
adjust registering ui module before extension module
2014-09-15 13:40:56 +08:00
andyque
2cfff1813b
modify comments
2014-09-15 12:06:34 +08:00
CocosRobot
dcdabb404a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 03:11:35 +00:00
huangshiwu
42c193c424
change-template-folder-name --win32 and wp8
2014-09-15 11:04:07 +08:00
andyque
2f85310348
adjust registering ui module before extension module
2014-09-15 09:46:07 +08:00
minggo
a9232a14ea
res->Resources src->Classes for cpp template
2014-09-13 17:50:02 +08:00
minggo
11f9eaa4a0
fix template compiling error
2014-09-12 15:02:18 +08:00
honghui
cb0faeac7e
fix merge error
2014-09-11 17:50:46 +08:00
honghui
59c8c3abf2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-09-11 17:19:31 +08:00
honghui
83d7bdcae9
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-09-11 17:07:55 +08:00
honghui
d5a8904fbb
open WIFI is not necessary for runtime
2014-09-11 17:04:26 +08:00
CocosRobot
827679099c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 08:31:19 +00:00
minggo
bb0b7a9b8a
Merge pull request #7950 from super626/billboard
...
3D BillBoard
2014-09-11 16:29:05 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
CocosRobot
974e810bb2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 07:48:14 +00:00
CocosRobot
11005a6ce9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 06:48:54 +00:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
CocosRobot
deef5cb3d7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 06:07:55 +00:00
CocosRobot
15254a5ddb
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 01:50:11 +00:00
yangxiao
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
yangxiao
d183e64c83
add to template
2014-09-04 16:52:45 +08:00
CocosRobot
6bd05770e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 06:00:43 +00:00
minggo
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
CocosRobot
4b21972d8b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 05:42:22 +00:00
Huabing.Xu
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
CocosRobot
071aedaa51
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 02:56:25 +00:00
cocoscodeide
da057b5a68
Merge pull request #69 from cocos2d/v3
...
update v3
2014-09-03 15:30:40 +08:00
samuele3hu
d681bdce92
Fix the crash of project which was created by the lua-template-runtime
2014-09-03 14:54:58 +08:00
CocosRobot
1ec9933045
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 05:37:45 +00:00
minggo
66943eec98
Merge pull request #7932 from minggo/remove-unneeded-files
...
remove unneeded files
2014-09-03 13:36:31 +08:00
CocosRobot
61a3c80cb9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 04:05:23 +00:00
minggo
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
CocosRobot
2dea7c3a18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 03:26:30 +00:00
Huabing.Xu
05d0e04073
[ci skip] update template for triangles command
2014-09-02 15:05:21 +08:00
chuanweizhang2013
4ada914426
mac writable path
2014-09-01 02:35:08 -07:00
chuanweizhang2013
5af89f5d46
fixed error
2014-09-01 01:57:08 -07:00
chuanweizhang2013
77a5e35ea8
Merge pull request #31 from cocos2d/v3
...
update v3
2014-09-01 14:08:06 +08:00
cocoscodeide
dd09c784d1
Merge pull request #65 from cocos2d/v3
...
update v3
2014-08-29 18:12:30 +08:00
chuanweizhang2013
303b391657
fixed writablePath
2014-08-29 16:21:34 +08:00
chuanweizhang2013
0d8c9eeb19
add link resource support
2014-08-29 15:05:55 +08:00
CocosRobot
d0ac64b2e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-29 05:43:47 +00:00
chuanweizhang2013
37b71ec0cc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-08-29 09:35:21 +08:00
zhangbin
e24a903c88
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
2014-08-28 16:13:11 +08:00
chuanweizhang2013
29234a3c58
Fix an issue that the break point stops twice at the same function
2014-08-28 10:54:47 +08:00
chuanweizhang2013
688ad1b3b9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
2014-08-28 10:28:31 +08:00
CocosRobot
27b8fd02ad
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-28 02:18:38 +00:00
CocosRobot
f1914f3fa1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-27 05:40:25 +00:00
samuele3hu
471820568f
Update android.mk of cocos and lua-templates
2014-08-27 10:28:04 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00