chuanweizhang2013
|
9e62cc9c31
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:28:25 +08:00 |
cocoscodeide
|
8a1d170f0d
|
Merge pull request #35 from bofeng-song/v3
fix can`t debug vs project
|
2014-06-19 17:27:20 +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 |
chuanweizhang2013
|
e1d7871089
|
add mac android support
|
2014-06-19 11:27:31 +08:00 |
chuanweizhang2013
|
69a55e2cfa
|
add protobuf-lite source
|
2014-06-18 15:43:38 +08:00 |
bofeng-song
|
d97b28db76
|
modify copy script & modify release version`s outfile addr
|
2014-06-17 18:17:35 +08:00 |
bofeng-song
|
5e03cab7cc
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
|
2014-06-16 18:31:43 +08:00 |
cocoscodeide
|
b00e7a3b86
|
Merge pull request #36 from cocos2d/v3
merge from cocos2d-x
|
2014-06-16 17:50:28 +08:00 |
bofeng-song
|
64f517a1b8
|
redirect function: setSearchPaths
|
2014-06-16 14:47:14 +08:00 |
minggo
|
c4d4d6b34e
|
Merge pull request #7075 from CocosRobot/update_lua_bindings_1402886913
[AUTO]: updating luabinding automatically
|
2014-06-16 14:12:53 +08:00 |
CocosRobot
|
30c91729eb
|
[AUTO]: updating luabinding automatically
|
2014-06-16 02:49:38 +00:00 |
minggo
|
ed40e48607
|
[ci skip]
|
2014-06-16 10:46:16 +08:00 |
minggo
|
111e08062f
|
Merge pull request #7056 from visiblelight/render_texture
Use RGBA when saving a file from render texture
|
2014-06-16 10:44:30 +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 |
minggo
|
6c6d07cb67
|
[ci skip]
|
2014-06-15 17:31:51 +08:00 |
bofeng-song
|
bca578c2f8
|
fix can`t debug vs project normally
|
2014-06-13 16:34:39 +08:00 |
vision
|
0b8e6a6a83
|
The filename should be converted to lower case before comparing.
|
2014-06-13 15:32:49 +08:00 |
vision
|
33fb1dd050
|
Make the API more extendable
|
2014-06-13 15:27:59 +08:00 |
minggo
|
7c789e6a36
|
Merge pull request #7049 from dabingnn/v3_fixDeleteTexture
fix bug for deleteTexture
|
2014-06-13 15:26:16 +08:00 |
minggo
|
405186a415
|
Merge pull request #7055 from pandamicro/origin_v3
Fixed #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
|
2014-06-13 15:21:20 +08:00 |
minggo
|
fbae2e96f1
|
Merge pull request #7058 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-06-13 14:22:56 +08:00 |
zhangbin
|
60c08dcb47
|
Update the reference of submodule cocos2d-console.
|
2014-06-13 14:15:17 +08:00 |
cocoscodeide
|
2d4297d14e
|
Merge pull request #34 from cocos2d/v3
merge from cocos2d-x
|
2014-06-13 14:14:25 +08:00 |
minggo
|
19fa4733c5
|
Merge pull request #7029 from samuele3hu/v3_lua_ui_fix
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
|
2014-06-13 13:41:52 +08:00 |
vision
|
7e99121af7
|
Change the default pixel format from RGB to RGBA for render texture when saving as PNG.
|
2014-06-13 13:35:18 +08:00 |
chuanweizhang2013
|
2eac73cde3
|
add protobuf win32
|
2014-06-13 11:19:04 +08:00 |
pandamicro
|
7ccff325b6
|
Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
|
2014-06-13 10:29:40 +08:00 |
minggo
|
1b24af95f1
|
[ci skip]
|
2014-06-12 18:23:31 +08:00 |
minggo
|
cf7c603d79
|
Merge pull request #7036 from visiblelight/new_blur_shader
New shader for the blur effect
|
2014-06-12 18:20:38 +08:00 |
minggo
|
1187cfff6d
|
[ci skip]
|
2014-06-12 16:19:05 +08:00 |
minggo
|
d1ca81634a
|
[ci skip]
|
2014-06-12 16:18:22 +08:00 |
minggo
|
eb21bf1ad1
|
Merge pull request #7030 from Rumist/v3
#5506 bug fix
|
2014-06-12 16:16:13 +08:00 |
minggo
|
f6913fc931
|
[ci skip]
|
2014-06-12 16:12:03 +08:00 |
samuele3hu
|
c6b913145c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 15:41:52 +08:00 |
samuele3hu
|
27a3a46d62
|
Modify the implemetation of `LuaStack::executeScriptFile`
|
2014-06-12 15:39:59 +08:00 |
Huabing.Xu
|
9acf8e6253
|
fix bug for deleteTexture
|
2014-06-12 15:22:41 +08:00 |
minggo
|
bb5471ca8b
|
[ci skip]
|
2014-06-12 15:07:29 +08:00 |
minggo
|
77fdd124a1
|
[ci skip]
|
2014-06-12 15:05:31 +08:00 |
minggo
|
5a28ba68b4
|
Merge pull request #7031 from sachingarg05/GLProgramNoAbort
GLProgram should not abort() if shader compilation fails, returning false is better.
|
2014-06-12 15:03:29 +08:00 |
minggo
|
22f445d56f
|
[ci skip]
|
2014-06-12 14:47:42 +08:00 |
minggo
|
ed14108ab1
|
Merge pull request #7042 from Dhilan007/v3-systemfont-ios
LinWenhai fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-12 14:44:26 +08:00 |
minggo
|
85a9e85dfd
|
Merge pull request #7045 from heliclei/commit-status-desc
[ci skip] Set github commit status context & description
|
2014-06-12 14:40:55 +08:00 |
samuele3hu
|
5bdecadd70
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 14:09:00 +08:00 |
minggo
|
cc683ff00f
|
[ci skip]
|
2014-06-12 11:40:41 +08:00 |
minggo
|
5c718e27da
|
Merge pull request #7044 from Dhilan007/v3-label-improve
Ensuring release cache texture in timely.
|
2014-06-12 11:39:36 +08:00 |
minggo
|
70147e9a20
|
[ci skip]
|
2014-06-12 11:38:28 +08:00 |
minggo
|
c5a8ba3a2c
|
Merge pull request #7043 from Dhilan007/v3-texturecachefix
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:35:34 +08:00 |
heliclei
|
87ac4c660d
|
[ci skip] Set github commit status context & description
|
2014-06-12 11:30:37 +08:00 |
Dhilan007
|
d755b7ffcb
|
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:21:42 +08:00 |