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
CocosRobot
8d88109db7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 06:57:10 +00:00
minggo
37aeb5b114
Merge pull request #7872 from samuele3hu/v3_3_new_module
...
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
2014-08-25 14:55:46 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
CocosRobot
b165137f40
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 03:19:31 +00:00
minggo
ba4825a5fa
Merge pull request #7869 from huangshiwu/v3_glviewattrs
...
OpenGL context attributions setting revise -modify lua template
2014-08-25 11:18:15 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
huangshiwu
9eda72f54a
OpenGL context attributions setting revise -modify lua template
2014-08-25 10:57:58 +08:00
minggo
dcea3b6134
Merge pull request #7843 from huangshiwu/v3_glviewattrs
...
V3 glviewattrs
2014-08-25 09:46:19 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
CocosRobot
b55c174bba
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:56:17 +00:00
CocosRobot
91eba38eda
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:40:55 +00:00
huangshiwu
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
samuele3hu
a3e4402c5f
Adjust cpp-template-default template
2014-08-22 13:50:28 +08:00
teivaz
312f57d7a6
- [WP8] Now replacing application display name with project name
2014-08-21 18:49:52 +03:00
CocosRobot
9c2cbaf742
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-20 05:37:22 +00:00
andyque
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +08:00
teivaz
ebb0876d29
* [WP8] Fixed resource search path in template
2014-08-19 21:44:46 +03:00
teivaz
5cdbf4c04c
* [WP8] Fixed paths in template
2014-08-19 19:57:06 +03:00
CocosRobot
218cee5e05
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:55:40 +00:00
CocosRobot
94b45d55ef
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:43:41 +00:00
samuele3hu
f36e7c6617
Add register_cocos3d_module for lua template
2014-08-18 19:46:11 +08:00
samuele3hu
22a48fb760
Update cpp and lua template to support cocos3d lib
2014-08-18 19:23:03 +08:00
CocosRobot
128d06076a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-15 07:41:13 +00:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
minggo
965f4f8ef4
Merge pull request #7791 from xiangxw/fix_replaceAll
...
fix replaceAll()
2014-08-15 15:03:06 +08:00
xiangxw
8b83419a32
fix replaceAll()
...
This function will never return if new_value contains old_value.
For example, old_value = "'", new_value = "''".
2014-08-15 11:48:33 +08:00
samuele3hu
76a9382a91
Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8
2014-08-15 00:08:15 +08:00
samuele3hu
55180c63e4
Add modules register functions for lua-template-runtime on android
2014-08-14 23:22:24 +08:00
samuele3hu
97d8d27eec
Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android
2014-08-14 21:58:40 +08:00
samuele3hu
1976b66ab8
Make lua-template-default support all modules
2014-08-14 21:27:02 +08:00
yangxiao
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
CocosRobot
2d4f23d9e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 10:36:05 +00:00
minggo
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
samuele3hu
02da839798
Make lua-template-default support all modules
2014-08-14 16:54:33 +08:00
minggo
3ab8bed741
Merge pull request #7745 from samuele3hu/v3_module
...
Modify cpp-template-default project configure
2014-08-14 09:46:37 +08:00
CocosRobot
6510d74ff7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 01:29:42 +00:00
samuele3hu
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
zhangbin
e766a22bda
Adjust the lua templates for the lua modules.
2014-08-13 14:29:14 +08:00
chuanweizhang2013
fc429154a9
add getplatform function
2014-08-13 11:30:43 +08:00
CocosRobot
93800c5821
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-13 01:27:24 +00:00
gin0606
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
samuele3hu
d9fdfb2659
Modify cpp-template-default project configure
2014-08-12 17:05:39 +08:00
CocosRobot
f8f15df530
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 07:06:46 +00:00
minggo
43a3603a8b
Merge pull request #7720 from samuele3hu/v3_module
...
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
2014-08-11 15:01:28 +08:00
yangxiao
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +08:00
samuele3hu
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
CocosRobot
076a2f9d1a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 01:32:55 +00:00
samuele3hu
2dacbf6f26
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-08 16:59:33 +08:00
samuele3hu
2ffc0e2e53
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 16:56:22 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
samuele3hu
4fe1b2e6bc
Fix the target dependencies error of lua-runtime-template
2014-08-08 16:10:31 +08:00
CocosRobot
1b4cd7e58e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 07:58:25 +00:00
minggo
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
samuele3hu
00865c8abb
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 15:22:12 +08:00
yangxiao
97edd303b5
remove DrawNode3D
2014-08-08 15:06:45 +08:00
gin0606
6722f8d546
Fix typo
2014-08-08 13:27:09 +09:00
CocosRobot
75bd97b82e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 03:51:09 +00:00
minggo
b9e84370f6
Merge pull request #7699 from huangshiwu/v3_wp8fix
...
V3 wp8fix
2014-08-08 11:49:02 +08:00
yangxiao
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
gin0606
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
samuele3hu
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
samuele3hu
0421c24d16
Modify lua-template-default and lua-template-runtime project
2014-08-07 13:54:54 +08:00
samuele3hu
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
huangshiwu
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
huangshiwu
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
CocosRobot
92bb832d18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-07 02:54:38 +00:00
CocosRobot
075c890ef1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 09:51:57 +00:00
minggo
7a833d66d1
Merge pull request #7676 from samuele3hu/v3_module
...
Split luabindings into serval modules and adjust project settings of test cases
2014-08-06 17:09:12 +08:00
CocosRobot
35a19dd0ea
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 07:24:27 +00:00
minggo
fdcf6a0c7c
Merge pull request #7672 from xiangxw/show_lua_error_message
...
show error after a win32 lua program crashes
2014-08-06 14:39:25 +08:00
minggo
08cc7982d7
Merge pull request #7666 from zawasp/template_fix
...
Template fix
2014-08-06 10:03:12 +08:00
samuele3hu
63b3f838b6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-06 09:56:07 +08:00
samuele3hu
0daa30419b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
2014-08-06 00:37:19 +08:00
xiangxw
78587254a5
show error after a win32 lua program crashes
2014-08-05 21:10:30 +08:00
CocosRobot
eacb8fa120
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 10:23:15 +00:00
CocosRobot
3a3cf0383d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 08:38:41 +00:00
Mircea Rila
119ca86e3f
additional fixes for win32 project
2014-08-05 11:29:04 +03:00
Mircea Rila
d808581d2b
fix win32 template project
2014-08-05 10:43:29 +03:00
Mircea Rila
5720df4336
add VS 2013 support for C++ template
2014-08-05 10:11:04 +03:00
samuele3hu
da18657f4f
Add module Android.mk config and adjust related test cases
2014-08-05 13:29:54 +08:00
CocosRobot
1772ab78ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:13:45 +00:00
CocosRobot
0f3fbfa07f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:00:57 +00:00
samuele3hu
cd0c82f8b7
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
2014-08-04 17:11:57 +08:00
yangxiao
d6d3ea6b18
fix template
2014-08-04 13:12:59 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
samuele3hu
c5c394846c
Adjust iOS and Mac tempts for Lua
2014-08-04 10:25:17 +08:00
CocosRobot
ea1d9d4657
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 07:58:06 +00:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
CocosRobot
ce8c5ee327
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 03:58:50 +00:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
CocosRobot
6dd02ade69
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 07:51:17 +00:00
CocosRobot
06d43ed2fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 01:28:27 +00:00
CocosRobot
a743590ac5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 08:09:10 +00:00
CocosRobot
3d7cced94e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 06:30:39 +00:00
shinriyo
3da15a7f92
typo function
...
however it is not the dog.
squirrel....
2014-07-29 00:37:55 +09:00
chuanweizhang2013
2bde043346
add config window top support
2014-07-24 10:30:39 +08:00
CocosRobot
ea69a2c72d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-23 16:38:00 +00:00
Sergey
5c62a2fea7
template fix
2014-07-22 15:49:38 +04:00
CocosRobot
19d01ae17b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-22 09:06:42 +00:00
CocosRobot
eee5934b03
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 08:48:07 +00:00
minggo
4d78dd60c2
Merge pull request #7527 from chenguangqi/v3
...
Fixed error for importing project
2014-07-21 12:03:40 +08:00
CocosRobot
afe3760aa0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 03:54:57 +00:00
陈广歧
5063ec465b
Fixed error for importing project
...
fixed error for importing android project to Eclipse
```
The import org.cocos2dx.lib cannot be resolved ...
```
2014-07-19 19:35:30 +08:00
minggo
f6b5f8e6ce
Merge pull request #7509 from chuanweizhang2013/v3luaruntime
...
runtime 1.3.1 fixed log bug
2014-07-18 09:25:41 +08:00
chuanweizhang2013
3e6dd0b8d2
1.3.1
2014-07-17 09:30:56 -07:00
minggo
7b7d4d6aa0
Merge pull request #7500 from cocoscodeide/v3
...
lua runtime 1.3
2014-07-17 18:01:21 +08:00
chuanweizhang2013
f906880c70
modify size
2014-07-17 02:48:32 -07:00
CocosRobot
5de1256005
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 08:01:08 +00:00
CocosRobot
1544081284
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 07:42:19 +00:00
chuanweizhang2013
5d1de7e9a9
console port android 6010
2014-07-17 15:37:37 +08:00
CocosRobot
924b8b23f2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 06:28:22 +00:00
chuanweizhang2013
a51332e955
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-16 22:37:16 +08:00
chuanweizhang2013
c7579c2cd3
rename local variable GameScene to gameScene
2014-07-16 22:36:47 +08:00
chuanweizhang2013
211c79eefa
fixed mac ios reload bug
2014-07-16 07:10:46 -07:00
chuanweizhang2013
fc420abec6
add GameScene.lua
2014-07-16 21:22:13 +08:00
chuanweizhang2013
5a4aa64f48
modify lua name
2014-07-16 21:20:48 +08:00
chuanweizhang2013
04b9457ed2
add local for main.lua
2014-07-16 20:49:24 +08:00
chuanweizhang2013
897f42c6fd
add consolePort
2014-07-16 20:30:11 +08:00
chuanweizhang2013
390dc3781b
support custom console port
2014-07-16 20:19:19 +08:00
chuanweizhang2013
67c078197d
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-16 19:35:28 +08:00
chuanweizhang2013
da74684cf1
fixed android debuginfo
2014-07-16 19:35:04 +08:00
chuanweizhang2013
e160474f23
rename menu title
2014-07-16 04:33:45 -07:00
chuanweizhang2013
31aa374fe8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-16 18:20:44 +08:00
chuanweizhang2013
f55b9422f6
fixed living code bug
2014-07-16 18:19:33 +08:00
Dale Stammen
d0c15bc1d8
updated cpp template to support EVENT_RENDERER_RECREATED
2014-07-15 07:23:40 -07:00
chuanweizhang2013
53fde9d7c6
add support x86 atomicops_internals_x86_gcc
2014-07-15 17:40:43 +08:00
CocosRobot
c1bb801dc5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 09:06:46 +00:00
chuanweizhang2013
445409c1aa
remove comment
2014-07-15 15:56:31 +08:00
chuanweizhang2013
9334863da6
Merge pull request #30 from cocos2d/v3
...
update cocos2d-x
2014-07-15 15:26:01 +08:00
chuanweizhang2013
0346fccbc3
fixed bug runtime
2014-07-15 15:07:01 +08:00
CocosRobot
d90effbe09
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 05:46:51 +00:00
chuanweizhang2013
03982a7f6e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-15 10:34:00 +08:00
chuanweizhang2013
a4c4c14c3c
remove change project fecture
2014-07-14 19:31:32 -07:00
chuanweizhang2013
6098531fd4
add set window top
2014-07-14 19:26:24 -07:00
Ricardo Quesada
cc0a27e83e
default OS Target for OS X is 10.7
2014-07-14 18:39:36 -07:00
chuanweizhang2013
3788df5e53
add support program to top
2014-07-14 16:23:57 +08:00
chuanweizhang2013
1db6daa60a
modify lua template source code
2014-07-14 13:58:21 +08:00
minggo
62b9c72609
Merge pull request #7281 from aslmaswd/v3-cmake
...
CMake Fix:GLFW header
2014-07-14 11:18:51 +08:00
chuanweizhang2013
b8767420db
Add support keep screen on when is debug
2014-07-12 16:29:39 +08:00
chuanweizhang2013
d4834202b5
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-12 14:55:29 +08:00
chuanweizhang2013
f22ae76c58
modify version num
2014-07-12 14:50:23 +08:00
chuanweizhang2013
e1d6e5aec3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-12 14:39:21 +08:00
chuanweizhang2013
11838f20f4
fixed release error
2014-07-11 23:14:32 -07:00
cocoscodeide
4a63f29f8a
Merge pull request #48 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-07-12 11:48:43 +08:00
chuanweizhang2013
56a95a2e52
move setDisplayStats function
2014-07-12 11:42:39 +08:00
CocosRobot
4b9ce2e663
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 11:11:12 +00:00
chuanweizhang2013
47fa341934
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-11 16:19:41 +08:00
samuele3hu
175ff37302
Remove glView setting form cpp to lua script and remove lua bindings for Bone3D
2014-07-11 16:00:02 +08:00
CocosRobot
57827e9465
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 06:14:32 +00:00
chuanweizhang2013
683ba200f5
move getIPAddress function
2014-07-11 11:34:15 +08:00
chuanweizhang2013
0c6383ecfe
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-11 10:42:44 +08:00
chuanweizhang2013
ca6bff963d
fixed transfor file error which size is 0
2014-07-11 10:38:55 +08:00
CocosRobot
463a2ab5ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 01:43:39 +00:00
CocosRobot
e1559c4828
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-10 14:06:29 +00:00
samuele3hu
521f805219
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
2014-07-08 14:57:19 +08:00
zhangbin
af5cf0a33f
Add configuration in templates to set the bundle identity of Mac & iOS project.
2014-07-08 10:22:08 +08:00
CocosRobot
142ac9a413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-04 17:07:04 +00:00
chuanweizhang2013
bad371fbf0
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-04 02:33:51 -07:00
chuanweizhang2013
d7bf9598f1
version1.2
2014-07-04 02:31:13 -07:00
chuanweizhang2013
39b03de8a9
revert Android.mk
2014-07-04 15:39:07 +08:00
chuanweizhang2013
04a9b5c2c6
add setXXTEAKeyAndSign
2014-07-04 13:40:49 +08:00
chuanweizhang2013
e32eadc364
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-04 13:36:51 +08:00
chuanweizhang2013
eb7523e0c6
version.json
2014-07-03 19:56:21 -07:00
chuanweizhang2013
c1e8cc974b
add call encript lua function
2014-07-03 19:53:17 -07:00
chuanweizhang2013
d8f01215f0
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-03 16:30:51 +08:00
chuanweizhang2013
10595394e3
copy res when update resource
2014-07-03 01:00:24 -07:00
chuanweizhang2013
9b1771d60e
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-03 00:55:26 -07:00
minggo
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
chuanweizhang2013
b88b5e4c3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-03 11:13:59 +08:00
minggo
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
CocosRobot
0b0b9ccdf3
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-02 08:21:52 +00:00
chuanweizhang2013
7eec8fbb3a
add arm64 bit support
2014-07-02 11:55:20 +08:00
GS
8a4fab2b1f
add another possible GLFW header location
2014-07-02 10:11:51 +08:00
CocosRobot
32c88f6189
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 10:04:00 +00:00
CocosRobot
5ab6d5557b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 07:52:35 +00:00
samuele3hu
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
chuanweizhang2013
4481149a30
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-30 17:53:46 +08:00
CocosRobot
6eb0d3cc86
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 09:26:15 +00:00
CocosRobot
f06061dfec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 01:42:06 +00:00
CocosRobot
c52fe48484
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-29 08:42:40 +00:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
chuanweizhang2013
a8f4dcb59f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-28 18:10:17 +08:00
chuanweizhang2013
e57ea32e58
1.2 template
2014-06-28 18:08:40 +08:00
chuanweizhang2013
618682def4
add ios search path
2014-06-27 18:15:39 +08:00
yangxiao
f38f0b00aa
fix templates
2014-06-27 18:01:39 +08:00
CocosRobot
054f8c5d11
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-27 08:38:35 +00:00
samuele3hu
cfb992e7cf
Upate templates project setting
2014-06-27 14:52:32 +08:00
chuanweizhang2013
09d1ee8fcf
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-06-26 05:02:34 -07:00
chuanweizhang2013
b80d825421
commit
2014-06-26 04:41:54 -07:00
CocosRobot
a3de7c00c8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-26 06:40:58 +00:00
Dale Stammen
33e39b5786
added source files for component to be consistent with other platforms templates
2014-06-25 09:51:32 -07:00
Dale Stammen
97d126d300
added source files for component to be consistent with other platforms templates
2014-06-25 09:50:40 -07:00
chuanweizhang2013
cee5754db4
modify mac out file
2014-06-25 19:33:38 +08:00
CocosRobot
486bf9ad12
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-25 09:21:01 +00:00
chuanweizhang2013
0c84dc3e6e
modify debug output file to runtime mac folder
2014-06-25 01:11:14 -07:00
chuanweizhang2013
90bd722bd2
remove rtres
2014-06-25 13:42:33 +08:00
chuanweizhang2013
ac539131e2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-25 11:39:17 +08:00
chuanweizhang2013
ec0eb7b6d6
modify filetime save formate
2014-06-25 11:36:59 +08:00
CocosRobot
7f104f4bf7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:47:56 +00:00
CocosRobot
cb9e5c2d77
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:31:03 +00:00
chuanweizhang2013
7f75b58acf
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
...
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
2014-06-23 17:30:33 +08:00
chuanweizhang2013
a170342f01
modify release output
2014-06-23 16:56:23 +08:00
zhangbin
dd49c4ccbc
Solve the error in Xcode project of lua runtime template.
2014-06-23 15:41:58 +08:00
chuanweizhang2013
e1333da7e4
add stubs head
2014-06-23 15:07:49 +08:00
chuanweizhang2013
f283ec69a1
add head
2014-06-23 15:04:28 +08:00
CocosRobot
2c04d00425
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-20 16:25:25 +00:00
chuanweizhang2013
a45056dbd7
add protobuf
2014-06-20 11:32:22 +08:00
CocosRobot
ffb96092fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:57:10 +00:00
CocosRobot
54b2a15886
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:24:14 +00:00
minggo
7553060ba7
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
...
[ci skip]Add new line at the end of a file to *.[cpp|h]
2014-06-19 20:47:17 +08:00
gin0606
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
gin0606
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
gin0606
2c837b0960
add new line at the end of a file to *.mk
2014-06-19 20:43:27 +09:00
chuanweizhang2013
9e62cc9c31
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-06-19 17:28:25 +08:00
chuanweizhang2013
be8775e314
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-06-19 17:23:36 +08:00
chuanweizhang2013
1153531448
add response error
2014-06-19 16:50:16 +08:00
zhangbin
3b19b07915
Modify the lua runtime template for prebuilt engine.
2014-06-19 11:33:39 +08:00
chuanweizhang2013
e1d7871089
add mac android support
2014-06-19 11:27:31 +08:00
zhangbin
1b056b6c49
Remove the debug symbols for release mode in xcode projects.
...
Modify the template of lua runtime.
2014-06-18 17:06:56 +08:00
chuanweizhang2013
69a55e2cfa
add protobuf-lite source
2014-06-18 15:43:38 +08:00
CocosRobot
9aeb1510ed
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-18 05:36:54 +00:00
CocosRobot
a292f7d063
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 13:09:25 +00:00
minggo
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
bofeng-song
d97b28db76
modify copy script & modify release version`s outfile addr
2014-06-17 18:17:35 +08:00
CocosRobot
7f9c86ab44
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:58:26 +00:00
minggo
a2a6a4e70a
Merge pull request #7087 from MSOpenTech/wp8-v3-template
...
Wp8 v3 template and missing texture after app switch fixes
2014-06-17 13:49:24 +08:00
CocosRobot
0bbce49012
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:38:36 +00:00
Huabing.Xu
f0fd7897be
update template
2014-06-17 13:25:05 +08:00
Dhilan007
648e7767d4
fixed can't move app to SD card after installed on android.
2014-06-17 12:03:20 +08:00
Dale Stammen
1a5d148d8e
updated template code
2014-06-16 10:29:40 -07:00
Dale Stammen
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
bofeng-song
64f517a1b8
redirect function: setSearchPaths
2014-06-16 14:47:14 +08:00
bofeng-song
b3fe030b90
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-06-16 10:07:24 +08:00
bofeng-song
bca578c2f8
fix can`t debug vs project normally
2014-06-13 16:34:39 +08:00
cocoscodeide
2d4297d14e
Merge pull request #34 from cocos2d/v3
...
merge from cocos2d-x
2014-06-13 14:14:25 +08:00
chuanweizhang2013
2eac73cde3
add protobuf win32
2014-06-13 11:19:04 +08:00
Dale Stammen
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
Dhilan007
5cd7ab97d9
fixed wrong WP8 project name when create project by console.
2014-06-09 16:17:19 +08:00
CocosRobot
70a4fd173c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 03:12:43 +00:00
minggo
24f7c9019a
Merge pull request #7005 from andyque/refactorUITouchEvent
...
refactor UI framework touch handling
2014-06-09 11:11:40 +08:00
CocosRobot
b2ca17e00b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 02:53:03 +00:00
andyque
1a933807b5
remove UIInterface.h header file
2014-06-09 10:35:54 +08:00
chuanweizhang2013
ddaf8f9ec5
modify play action
2014-06-06 16:24:09 +08:00
Dhilan007
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
chuanweizhang2013
f9b747cf1f
modify runtime
2014-06-05 18:03:38 +08:00
CocosRobot
b218f8ec13
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-05 03:51:15 +00:00
minggo
366beedbb2
Merge pull request #6955 from samuele3hu/v3_fix
...
Add xxtea encrypt support for lua and update the console submodule
2014-06-05 11:49:40 +08:00
CocosRobot
bd018ea645
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-04 09:18:03 +00:00
minggo
7a4d46dc1b
Merge pull request #6965 from Dhilan007/v3-wp8fix
...
Support Fast App Resume and fixed black screen may arise when using third sdk.
2014-06-04 17:15:13 +08:00
andyque
ab8a68f53b
fix template
2014-06-04 15:55:52 +08:00
andyque
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
Dhilan007
3fcb75c82f
Fixed black screen may arise when using third SDK.
2014-06-04 13:54:44 +08:00
samuele3hu
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
Dhilan007
52ad2063bd
Support Fast App Resume.
2014-06-04 11:19:53 +08:00
samuele3hu
55bb9a7d09
Update setting for different platform
2014-06-03 17:15:28 +08:00
cw
9d14a179db
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-06-03 11:28:18 +08:00
cw
521fa3118d
config template
2014-06-03 11:25:16 +08:00
chuanweizhang2013
72ce393d60
remove rtres floder
2014-05-30 14:25:37 +08:00
cw
3807c7cffc
resource to binary
2014-05-30 13:53:49 +08:00
chuanweizhang2013
4b812f8b80
modify runtime folder
2014-05-30 11:00:26 +08:00
chuanweizhang2013
29cc2905f4
add tip
2014-05-30 09:43:39 +08:00
chuanweizhang2013
188f4ddcca
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-05-29 18:19:30 +08:00
chuanweizhang2013
201900e110
action
2014-05-29 18:19:19 +08:00
cocoscodeide
672ff4f7b3
Merge pull request #29 from bofeng-song/v3
...
add lock to get file name
2014-05-29 18:17:57 +08:00
minggo
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
CocosRobot
c441b869ec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-29 06:08:40 +00:00
CocosRobot
73f3361b0e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-28 05:49:49 +00:00
minggo
3d3fb6ad7e
Merge pull request #6914 from andyque/refactorLayoutExecutant
...
refactor: rename UILayoutExecutant to UILayoutManager
2014-05-28 13:47:54 +08:00
samuele3hu
90cac02de6
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:27:03 +08:00
andyque
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
samuele3hu
c52132179a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-28 10:05:41 +08:00
samuele3hu
04d2d4a22e
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:04:29 +08:00
minggo
c5dd99edd1
Merge pull request #6911 from cocoscodeide/v3
...
fixed win no log
2014-05-27 18:43:10 +08:00
cw
f2b243dff5
fixed win no log
2014-05-27 18:21:54 +08:00
minggo
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
bofeng-song
3aa7f7b504
show tips while launch app
2014-05-27 02:26:47 +08:00
bofeng-song
ba6348c35d
add lock to get file name
2014-05-27 01:21:57 +08:00
CocosRobot
cc41694077
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-26 05:42:20 +00:00
cw
c38f2bf92b
1.1.2
2014-05-23 19:17:43 +08:00
cw
3727c14cb8
runtime 1.1.2
2014-05-23 18:26:36 +08:00
cocoscodeide
58ed156cec
Merge pull request #27 from chuanweizhang2013/v3luaruntime
...
move runtime res path
2014-05-23 13:38:47 +08:00
cocoscodeide
5e198aaae2
Merge pull request #26 from cocos2d/v3
...
update cocos2d-x
2014-05-23 12:46:42 +08:00
chuanweizhang2013
1b3af4be19
move runtime res path
2014-05-22 22:08:04 +08:00
Dale Stammen
f3eb0d7722
updated cpp template file
2014-05-22 06:58:05 -07:00
chuanweizhang2013
111840f37b
add play ui
2014-05-22 11:52:49 +08:00
CocosRobot
a07b2dae75
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-21 07:25:16 +00:00
CocosRobot
5fe36c55c7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-20 11:49:30 +00:00
Sergey
49f26f3fbf
lua template & android-build.py updated
2014-05-20 13:49:02 +04:00
Sergey
1ff2a03d16
debug mode by default
...
configuration switched to -b debug/release
2014-05-20 13:00:21 +04:00
minggo
47482f8a3a
Merge pull request #6825 from cocoscodeide/v3
...
[ci skip] update template project lua
2014-05-20 15:45:03 +08:00
cw
1aa92bdef0
add java nativeIsDebug
2014-05-20 13:53:52 +08:00
cw
84d66219c8
fixed android degbug
2014-05-20 11:44:46 +08:00
zhangbin
2b3f236792
Support generate release apk with prebuilt libs.
2014-05-20 10:47:27 +08:00
Sergey
a489c19535
Android project improvements
...
(release/debug builds)
native debug support
2014-05-19 17:47:17 +04:00
cocoscodeide
a2be97380b
Merge pull request #14 from bofeng-song/v3
...
show uploading file in play scene
2014-05-19 13:35:31 +08:00
samuele3hu
e2a0029c4e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-19 10:50:15 +08:00
samuele3hu
6dc7f5a2b5
fix compile error for lua template
2014-05-19 10:38:59 +08:00
Huabing.Xu
b69efe00a7
fix cpp template linux
2014-05-18 18:34:53 -07:00
Huabing.Xu
94228df977
fix cpp_template
2014-05-18 18:04:12 -07:00
CocosRobot
794ba83495
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-18 22:25:49 +00:00