lvlong
|
4ae01d148f
|
11
|
2014-06-13 19:26:46 +08:00 |
yangxiao
|
ff6ef1140d
|
two animate3d the same time
|
2014-06-13 19:20:19 +08:00 |
2youyou2
|
5bce6b87ea
|
change ActionTimeline to cocostudio ActionTimeline folder
|
2014-06-13 18:51:32 +08:00 |
2youyou2
|
c60e424ef2
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
|
2014-06-13 18:01:17 +08:00 |
2youyou2
|
57fe37f9f1
|
add const word
|
2014-06-13 18:00:46 +08:00 |
2youyou2
|
369ed3e6d3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-13 18:00:01 +08:00 |
pandamicro
|
d524ba1013
|
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-13 17:59:23 +08:00 |
yinkaile
|
f278c49c37
|
Merge pull request #10 from pipu/v3_kaile
V3 kaile
|
2014-06-13 16:35:39 +08:00 |
pipu
|
cb213183bc
|
adjust project.pbxproj and files associated with ActionTimeLine
|
2014-06-13 16:33:07 +08:00 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +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 |
2youyou2
|
b181eaf802
|
modify mk file
|
2014-06-13 14:43:53 +08:00 |
2youyou2
|
c37e2a6e4a
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
|
2014-06-13 14:41:52 +08:00 |
2youyou2
|
1c5d9ba212
|
remove resource to use armature resource
|
2014-06-13 14:41:28 +08:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
elsanide
|
4b7b32e81e
|
BUG FIX : #5553
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
|
2014-06-13 15:24:37 +09: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 |
samuele3hu
|
5b6330d59b
|
Add more conversion functions and manual binding functions
|
2014-06-13 14:10:08 +08:00 |
yinkaile
|
3340d48c63
|
Merge pull request #9 from pipu/v3_kaile
V3 kaile
|
2014-06-13 13:54:19 +08:00 |
pipu
|
320f04f79f
|
adjust files associated with TimeLineAction
|
2014-06-13 13:46:13 +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 |
2youyou2
|
e0f6ae9db4
|
change TimelineAction to cocos/2d folder
|
2014-06-13 13:36:01 +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 |
yangxiao
|
247734e2e0
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-13 12:25:04 +08:00 |
Huabing.Xu
|
638fdd62df
|
Merge pull request #37 from dabingnn/v3Animation
V3 animation
|
2014-06-13 12:12:44 +08:00 |
Huabing.Xu
|
4e94eaabed
|
Merge branch 'v3' into v3Animation
|
2014-06-13 12:06:11 +08:00 |
Huabing.Xu
|
9ece9cead4
|
Merge pull request #36 from dabingnn/v3Animation
V3 animation
|
2014-06-13 12:03:06 +08:00 |
Huabing.Xu
|
f7b8acd6fd
|
change pointer to std::vector for mesh
|
2014-06-13 11:59:13 +08:00 |
yinkaile
|
75ff67c0ec
|
Merge pull request #8 from pipu/v3_kaile
V3 kaile
|
2014-06-13 10:52:48 +08:00 |
pipu
|
65c2a5e3e1
|
add parse actionTag in loadWidget method of CCNodeReader
|
2014-06-13 10:49:57 +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 |
lvlong
|
3af0bdfef6
|
texture
|
2014-06-13 09:18:25 +08:00 |
yangxiao
|
09fe7e13b7
|
blendstate
|
2014-06-13 09:12:29 +08:00 |
Dale Stammen
|
2d913470a0
|
updated fast resume code for app
|
2014-06-12 16:36:53 -07:00 |
Dale Stammen
|
29b9da34ea
|
updated to latest version of Angle to fix memory leak when switching apps
|
2014-06-12 16:35:24 -07:00 |
Dale Stammen
|
b0bc971523
|
fixed reloading of cocos2d-x after app switch
|
2014-06-12 16:34:21 -07:00 |
Dale Stammen
|
70f3f0f913
|
release glTextures before reloading cached textures
|
2014-06-12 16:31:46 -07:00 |
Dale Stammen
|
48404a8fb5
|
fixed reloading of textures from VolatileTexture cache
|
2014-06-12 16:31:07 -07:00 |
Dale Stammen
|
49a94a20ef
|
added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures
|
2014-06-12 16:28:38 -07:00 |
Dale Stammen
|
2c5b449c9c
|
updated app name to App
|
2014-06-12 16:27:09 -07:00 |
2youyou2
|
f09b1863a9
|
fixed read sprite
|
2014-06-12 20:16:39 +08:00 |
yinkaile
|
8174481575
|
Merge pull request #7 from pipu/v3_kaile
update TimelineAction
|
2014-06-12 19:57:55 +08:00 |
pipu
|
c0170d23c7
|
fixed warnings
|
2014-06-12 19:56:15 +08:00 |
pipu
|
1cb7dd58ec
|
add CCNodeReader into project
|
2014-06-12 19:40:58 +08:00 |
2youyou2
|
b36741865c
|
add hd resource
|
2014-06-12 19:38:08 +08:00 |
2youyou2
|
f63939945d
|
change NodeCache to NodeReader
|
2014-06-12 19:34:22 +08:00 |