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 |
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 |