minggo
fe63a1a46c
[ci skip]update version
2015-01-12 11:31:09 +08:00
pipu
82be4701b5
Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline
2015-01-12 11:12:38 +08:00
pipu
6237115fbf
Fixes bug that clone InnerActionFrame.
2015-01-12 11:09:19 +08:00
pipu
78b32332d3
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
2015-01-12 10:55:15 +08:00
minggo
45f54e8358
Merge pull request #9923 from natural-law/v3
...
[ci skip] Update the reference of submodule cocos2d-console.
2015-01-12 10:29:50 +08:00
zhangbin
489dc2da16
Update the reference of submodule cocos2d-console.
2015-01-12 10:27:14 +08:00
Huabing.Xu
20f6839821
[ci skip] update CHANGELOG(fix typo)
2015-01-12 10:25:15 +08:00
Jialong Zhai
6f99e161f8
Change the order of detach and attach of TextField::upadate
2015-01-12 10:18:55 +08:00
yangxiao
6d297d377b
camera visible check
2015-01-12 10:08:55 +08:00
htl
ae77d6fef1
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
2015-01-12 09:59:23 +08:00
Edward Zhou
c2929a30d5
fix compile error
2015-01-11 23:01:13 +08:00
Edward Zhou
5bd9e7f1a7
support to loading folder structured lua(a.k.a normal zip file) for luaLoadChunksFromZIP
2015-01-11 22:57:14 +08:00
Satoshi SUZUKI
b0d1dd2435
FileUtils::fullPathForFilename should return "" if resource is not found.
...
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
2015-01-10 19:30:42 +09:00
Nite Luo
6dfc021c02
Merge renderqueue to one
2015-01-09 14:06:21 -08:00
Huabing.Xu
6984e7097f
Merge pull request #9909 from dabingnn/v3_updateReleaseNotes
...
V3 update release notes
2015-01-09 21:57:37 +08:00
Huabing.Xu
df9713e060
[ci skip] update release notes
2015-01-09 21:55:59 +08:00
Huabing.Xu
23f20ef910
[ci skip] update release notes
2015-01-09 21:52:54 +08:00
Huabing.Xu
ad42e15b62
[ci skip]Update CHANGELOG
2015-01-09 21:22:55 +08:00
minggo
15220c7499
[ci skip] Update CHANGELOG
2015-01-09 19:29:50 +08:00
minggo
a6e6dc2605
Merge pull request #9906 from Dhilan007/v3-video-android-fix
...
Fixed VideoPlayer can't play when passing the full path of video resource
2015-01-09 19:24:17 +08:00
WenhaiLin
57cd4cd3c6
Fixed VideoPlayer can't play when passing the full path of video resource
2015-01-09 19:14:19 +08:00
minggo
e04087ea41
[ci skip] Update CHANGELOG
2015-01-09 19:09:43 +08:00
minggo
c1b958c540
Merge pull request #9904 from Dhilan007/v3-systemfont-android-fix
...
Fixed dead loop when the width of label[system font] smaller then one word of the string on android
2015-01-09 19:07:24 +08:00
WenhaiLin
e2c7743db1
Add test case
2015-01-09 18:51:30 +08:00
minggo
4939a25593
Merge pull request #9900 from samuele3hu/v3_4_fix_bug
...
[ci skip]Fix some lua-tests bugs
2015-01-09 16:53:42 +08:00
WenhaiLin
d92a525bfa
Fixed dead loop when width of label[system font] smaller then one word of the string on android
2015-01-09 16:52:40 +08:00
samuele3hu
6a55fef70e
Update the VideoPlayerTest to passing the fullpath of video resource
2015-01-09 16:45:51 +08:00
minggo
e1c575b7b7
[ci skip]Update Authors
2015-01-09 15:36:23 +08:00
XiaoYang
1fb89c3aff
Merge pull request #206 from songmiao/626_v3
...
add fog test and arcball camera test
2015-01-09 15:35:23 +08:00
minggo
2c1f9f39de
[ci skip] Update CHANGELOG
2015-01-09 15:35:02 +08:00
minggo
a0aa5e716e
Merge pull request #9489 from newnon/v3_clang_static_analyzer_fix
...
Clang static analyzer crash fix
2015-01-09 15:32:46 +08:00
samuele3hu
08ec8cc8bf
Fix some lua-tests bugs
2015-01-09 15:23:54 +08:00
minggo
4715de4591
[ci skip] Update CHANGELOG
2015-01-09 15:07:06 +08:00
minggo
f37ff51d8a
Merge pull request #9897 from Dhilan007/v3-android-project-fix
...
Fixed can't run new CPP project on android by Eclipse
2015-01-09 15:03:23 +08:00
WenhaiLin
2c728fa341
Fixed can't run new CPP project on android by Eclipse
2015-01-09 15:01:08 +08:00
minggo
465bf48442
Merge pull request #9879 from suzukaze/fix-indents
...
Replace tabs with spaces in cocos/2d dir
2015-01-09 14:59:27 +08:00
Huabing.Xu
ca7fe406f4
[ci skip] update Authors
2015-01-09 14:56:00 +08:00
minggo
5f6d8f11e2
Merge pull request #9896 from yinjimmy/bugfix_runtime
...
Support `isLandscape` field in config.json
2015-01-09 14:52:08 +08:00
yinjimmy
f98ff24e97
Support `isLandscape` field in config.json
2015-01-09 14:39:45 +08:00
minggo
4818c7bbd1
Merge pull request #9889 from 2youyouo2/v3
...
fixed event frame will go twice loop when goto frame
2015-01-09 14:35:45 +08:00
Huabing.Xu
8f0eb300e0
[ci skip] update changelog
2015-01-09 14:32:53 +08:00
Huabing.Xu
275c7d180c
[ci skip] update changelogs
2015-01-09 14:31:31 +08:00
minggo
7514ce4d62
[ci skip] Update CHANGELOG
2015-01-09 14:20:26 +08:00
Huabing.Xu
1ec1d7a61c
Merge pull request #9887 from takaokato/bugfix
...
fixed getParentToNodeTransform. it returned a wrong transform if _transf...
2015-01-09 14:11:17 +08:00
minggo
3eba14c8c9
Merge pull request #9888 from Dhilan007/v3-physics-testcase-fix
...
Fixed display wrong in LuaTests:Physics:Pump test case
2015-01-09 13:37:20 +08:00
minggo
e0625ad1db
Merge pull request #9892 from yinjimmy/bugfix_runtime
...
Fix: can not load BYTECODE Lua project
2015-01-09 13:35:02 +08:00
yinjimmy
db80ab0028
update lua default template
2015-01-09 13:21:19 +08:00
yinjimmy
2f3270fa0b
Fix: can not load Lua project with command `cocos run -p mac -m release`
2015-01-09 12:32:54 +08:00
minggo
bfc116d32a
Merge pull request #9881 from dualface/add_package_manager_support
...
Add package manager support
2015-01-09 12:03:05 +08:00
yinjimmy
349f5d1a87
add config.json
2015-01-09 11:43:41 +08:00