Commit Graph

21087 Commits

Author SHA1 Message Date
2youyou2 db992b6d0f modify cocostudio Android.mk 2014-06-12 16:26:18 +08:00
2youyou2 f536020d26 remove unused files 2014-06-12 16:21:41 +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
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
gin0606 80c5349d75 Fix crash when videoView to remove in android 2014-06-12 16:47:08 +09:00
yangxiao ee5aa0f648 android work 2014-06-12 15:42:53 +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
Dhilan007 b2d8e4fc93 add assert. 2014-06-12 14:41:01 +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
yangxiao e37c6ab7ee test action sequence 2014-06-12 14:20:38 +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
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
minggo 6845a69655 issue #4693: remove unneede codes 2014-06-12 14:00:41 +08:00
minggo 990c491746 issue #4693: add test case for getName, setName, getChildByName and enumerateChildren 2014-06-12 13:55:23 +08:00
samuele3hu c2288936db Remove `handleStudioEventListener` of LuaEngine 2014-06-12 13:50:52 +08:00
samuele3hu f687f63bfd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-12 13:44:15 +08:00
samuele3hu 6c7b538ee1 Add deprecated support for the related UI addEventListener functions 2014-06-12 12:02:22 +08:00
Dhilan007 3511d1e87e 1.Support setting up the line height and additional kerning of label.
2.Add more annotation
2014-06-12 12:01:15 +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
samuele3hu 379db53673 Reconstruct the _sendRequest function of LuaMinXmlHttpRequest 2014-06-12 11:24:46 +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
minggo 05a65a68bb issue #4693: added enumerateChildren() 2014-06-12 10:41:08 +08:00
vision dc4cdc9c0f remove the comments 2014-06-12 10:19:08 +08:00
samuele3hu 5349125ad0 Reconstruct the addEventListener for cocostudio ui control 2014-06-12 10:10:37 +08:00
samuele3hu 108c0d0da9 Modify ini files for bindings-generator to fix the compile warning 2014-06-12 10:08:58 +08:00
lvlong 9fe7c1a9da loader 2014-06-12 10:01:54 +08:00
vision 97b578185d new parameter for setting blur shader effect 2014-06-12 09:49:48 +08:00
LinWenhai b268536385 fixed typo. 2014-06-12 09:46:18 +08:00
minggo e68c01eda9 Merge pull request #7041 from MSOpenTech/wp8-v3-update
added missing ObjectFactory files
2014-06-12 09:42:59 +08:00
2youyou2 4d1bf0c1a2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
Dale Stammen 775832a710 added missing files 2014-06-11 13:18:10 -07:00
youyou 28ae57c5fc add AsyncReader 2014-06-12 00:38:23 +08:00
Huabing.Xu 8ca8715a85 Merge pull request #35 from dabingnn/v3Animation
V3 animation
2014-06-11 23:23:55 +08:00
Dhilan007 7cc3879257 Ensuring release cache texture in timely. 2014-06-11 22:03:10 +08:00
Dhilan007 63a68632a5 fixed calculating height of multi-line string was incorrect on IOS. 2014-06-11 21:49:08 +08:00
2youyou2 aa06fab776 support relative path for reading json 2014-06-11 21:11:22 +08:00