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 |