minggo
|
4895e6d54a
|
Merge pull request #7362 from geron-cn/chukongv3
Chukongv3
|
2014-07-10 21:17:19 +08:00 |
zhangcheng
|
a0ecae21c3
|
1. fixes TextReader load default font error.
|
2014-07-10 19:29:39 +08:00 |
geron-cn
|
1c4cb78745
|
deal with null in string
|
2014-07-10 18:24:11 +08:00 |
kaile.yin
|
04c63cc370
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:51:02 +08:00 |
kaile.yin
|
42f2302866
|
fixed call Bone::setRotation has no effect
|
2014-07-10 17:50:38 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |
andyque
|
41ccd5e465
|
add v1.4 tests
|
2014-07-10 16:37:15 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
minggo
|
7d74be3158
|
Merge pull request #7356 from 2youyouo2/v3
fixed Armature blend func effect
|
2014-07-09 18:37:15 +08:00 |
kaile.yin
|
c53cb42e83
|
fixed Armature blend func effect
|
2014-07-09 14:25:51 +08:00 |
zhangcheng
|
af0613cf32
|
1、fixes warning.
|
2014-07-09 00:09:35 +08:00 |
kaile.yin
|
f01b249880
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-08 10:21:00 +08:00 |
kaile.yin
|
d5a79f17ab
|
fixed set color to parent, it will effect its children
|
2014-07-08 10:13:15 +08:00 |
Dale Stammen
|
fa62f4273f
|
fixed missing zlib.h header path
|
2014-07-07 10:14:57 -07:00 |
andyque
|
037a7dc882
|
fix TextReader TTF font Reader issue
|
2014-07-07 15:22:14 +08:00 |
andyque
|
0483c64286
|
fix widget ignoreContentSize issue
|
2014-07-07 15:21:14 +08:00 |
minggo
|
a942aae84f
|
Merge pull request #7316 from cocoscodeide/v3
lua runtime template 1.2
|
2014-07-04 18:33:36 +08:00 |
chuanweizhang2013
|
39b03de8a9
|
revert Android.mk
|
2014-07-04 15:39:07 +08:00 |
andyque
|
c8165bb2d9
|
fix indent problems
|
2014-07-04 11:53:06 +08:00 |
andyque
|
a429182765
|
fix windows compile and running error
|
2014-07-04 11:22:36 +08:00 |
minggo
|
eb97b9ad45
|
Merge pull request #7305 from andyque/fixLayoutReader
fix layout background image default color & opacity
|
2014-07-03 17:16:56 +08:00 |
andyque
|
f82e96daf0
|
fix layout background image default color & opacity
|
2014-07-03 16:56:05 +08:00 |
minggo
|
0be6d27271
|
Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
|
2014-07-03 15:20:06 +08:00 |
andyque
|
32724e559d
|
fix container default color issue
|
2014-07-03 14:38:45 +08:00 |
minggo
|
fffdfb3711
|
Merge pull request #7290 from chengstory/v3_OpBinaryParse
V3 op binary parse
|
2014-07-03 14:00:01 +08:00 |
minggo
|
2cfea323b0
|
Merge pull request #7300 from 2youyouo2/v3
fixed add relative data bug
|
2014-07-03 13:56:04 +08:00 |
minggo
|
6cc600ccce
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
zhangcheng
|
d1db470cf2
|
Merge branch 'macLoader' into v3_OpBinaryParse
|
2014-07-02 16:11:02 +08:00 |
zhangcheng
|
2b1ef55ea9
|
1. fixes scene parse crash.
|
2014-07-02 15:58:42 +08:00 |
zhangcheng
|
9204ac28df
|
1. merge v3
|
2014-07-02 15:37:15 +08:00 |
zhangcheng
|
cf9b049926
|
1. fixes same name warning.
|
2014-07-02 10:53:35 +08:00 |
minggo
|
5b282e338f
|
Merge pull request #7279 from andyque/fixTextReader
fix Text reader font name
|
2014-07-02 10:04:00 +08:00 |
andyque
|
fb3e499d9d
|
fix Text reader font name
|
2014-07-02 10:08:04 +08:00 |
minggo
|
d9a1f76755
|
fix effect of spine
|
2014-07-02 09:58:07 +08:00 |
andyque
|
7d2685ba02
|
fix content Size
|
2014-07-01 21:02:37 +08:00 |
geron-cn
|
17c320f1e2
|
fix
|
2014-07-01 19:06:51 +08:00 |
geron-cn
|
c561f4e2f4
|
fix win can not compile
|
2014-07-01 18:55:09 +08:00 |
zhangcheng
|
02c7c93e43
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
|
2014-07-01 16:36:37 +08:00 |
zhangcheng
|
4b8f818a1d
|
1、Update binary parse lib.
|
2014-07-01 16:31:17 +08:00 |
geron-cn
|
dfdc4f6b66
|
fix bug: did not addarmature to the relativedata
|
2014-07-01 16:24:59 +08:00 |
andyque
|
fefdc70af9
|
add default value to widget reader
|
2014-07-01 14:01:27 +08:00 |
minggo
|
80204e3048
|
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
Cleanup binary loader add scene binary parse
|
2014-07-01 13:47:35 +08:00 |
andyque
|
b9a968680f
|
add default value to widgets reader
|
2014-07-01 10:57:12 +08:00 |
andyque
|
4e63a3da7d
|
modify nodeReader to support LabelAtlas and LabelBMFont
|
2014-07-01 10:11:36 +08:00 |
minggo
|
40e88ab6eb
|
Merge pull request #7251 from 2youyouo2/v3_current_frame_index
add gotoFrameAndPlay and setCurrentFrame interface
|
2014-06-30 17:32:24 +08:00 |
zhangcheng
|
a3fcddde39
|
1. NULL->nullptr.
2. bRet->ret.
|
2014-06-30 17:15:55 +08:00 |
2youyou2
|
b76127231c
|
add gotoFrameAndPlay and setCurrentFrame interface
|
2014-06-30 15:53:12 +08:00 |
pandamicro
|
bee41712ad
|
Fix Travis CI compilation issue
|
2014-06-30 11:58:15 +08:00 |
2youyou2
|
30a13c05c9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-30 11:08:22 +08:00 |
2youyou2
|
aba7421ef6
|
fixed crashed when remove armature in frame event.
|
2014-06-30 10:14:31 +08:00 |
2youyou2
|
1a9e42ef85
|
fixed armature blend func has no effect
|
2014-06-30 10:11:43 +08:00 |
andyque
|
d06ca0e75d
|
fix gui reader
|
2014-06-26 17:29:07 +08:00 |
zhangcheng
|
a6d6287b29
|
1. remove hungary style.
2. fixes build error.
|
2014-06-26 10:08:17 +08:00 |
Dale Stammen
|
3fd615845b
|
removed deleted header file from project
|
2014-06-25 10:08:54 -07:00 |
zhangcheng
|
98c21f6f57
|
1. remove Hungary style.
|
2014-06-25 18:10:06 +08:00 |
zhangcheng
|
bdf7be6fa0
|
1. add classname = "" log.
|
2014-06-25 14:32:38 +08:00 |
zhangcheng
|
644b61e261
|
1. add SceneBinary to 2.x
|
2014-06-25 11:58:36 +08:00 |
minggo
|
66703addb2
|
fixed #4693: override addChild by name
|
2014-06-25 11:27:48 +08:00 |
minggo
|
63d0f66553
|
Merge pull request #7189 from andyque/feature5161
replace size with contentSize
|
2014-06-24 18:43:33 +08:00 |
minggo
|
76e2540fd7
|
Merge pull request #7163 from darkdukey/fixNodeReader
Fix NodeReader crash
|
2014-06-24 10:49:10 +08:00 |
andyque
|
199ad9c623
|
issue #5161, replace deprecated methods
|
2014-06-24 10:18:01 +08:00 |
andyque
|
312ab4f396
|
Merge branch 'v3' into feature5161
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
|
2014-06-24 09:51:18 +08:00 |
Dale Stammen
|
44d6248056
|
added missing cocoloader files
|
2014-06-23 08:31:29 -07:00 |
minggo
|
fc7b42c0e5
|
Merge pull request #7157 from 2youyouo2/v3
update action timeline
|
2014-06-23 18:38:46 +08:00 |
andyque
|
d2680f2884
|
fix windows compile error
|
2014-06-23 18:29:23 +08:00 |
andyque
|
3e5ab0ec8e
|
fix linux compile error
|
2014-06-23 17:09:54 +08:00 |
andyque
|
ce58c2ddd6
|
remove unused header file
|
2014-06-23 16:53:06 +08:00 |
andyque
|
87455b0ecb
|
add constness to some function
|
2014-06-23 10:12:54 +08:00 |
andyque
|
8a463e7964
|
remove Hungry style
|
2014-06-23 10:02:09 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
Nite Luo
|
21330860a9
|
Fix NodeReader will crash when encountered unknown NodeType
|
2014-06-20 17:24:34 -07:00 |
Dale Stammen
|
5e1f0b5799
|
added missing files and tests that broke wp8 build
|
2014-06-20 09:07:51 -07:00 |
andyque
|
5f5b705bee
|
refactor setSize to setContentSize and deprecated the old interface
|
2014-06-20 14:03:33 +08:00 |
yinkaile
|
1aa07906a1
|
add new line at the end of the file
|
2014-06-20 11:36:48 +08:00 |
yinkaile
|
aac4ded898
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 11:24:12 +08:00 |
yinkaile
|
510bc23b16
|
1.fixed action may shake a little
2.fixed frame event will emit even they do not in current play section
|
2014-06-20 11:23:26 +08:00 |
yinkaile
|
043c640037
|
fixed warning and logic error
|
2014-06-20 10:52:14 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
minggo
|
e374bd67c7
|
Merge pull request #6946 from hanjukim/skip-utf8-bom
Skip UTF8 BOM if it exists and bug fix for unterminated string
|
2014-06-19 22:02:38 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
andyque
|
4d64b166cc
|
refactor - replace magic string with const string
|
2014-06-19 17:04:14 +08:00 |
andyque
|
a26ef87783
|
cleanup reader code
|
2014-06-19 15:16:56 +08:00 |
andyque
|
515de9eda5
|
remove magic string of widget json reader
|
2014-06-19 14:40:24 +08:00 |
2youyou2
|
0ce51162af
|
support Label widget
|
2014-06-19 14:11:37 +08:00 |
子龙山人
|
e1095c4f09
|
Merge pull request #9 from geron-cn/guanghuiv3
Guanghuiv3
|
2014-06-19 13:38:53 +08:00 |
geron-cn
|
6abc9aba0e
|
add binary read to test-cpp
|
2014-06-18 20:09:12 +08:00 |
andyque
|
b55b95adc3
|
fix linux compile error
|
2014-06-18 18:28:31 +08:00 |
andyque
|
20b41d2886
|
fix android compile error
|
2014-06-18 18:25:31 +08:00 |
geron-cn
|
5cfbd3a2bd
|
add binary decode to armature
|
2014-06-18 17:43:13 +08:00 |
andyque
|
9398395de8
|
fix custom property
|
2014-06-18 16:19:24 +08:00 |
andyque
|
1533374bd1
|
add ui animation for binary parsing
|
2014-06-18 15:55:01 +08:00 |
andyque
|
aa5df68b96
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
|
2014-06-18 15:13:34 +08:00 |
子龙山人
|
0b677a86d7
|
Merge pull request #8 from geron-cn/guagnhuiv3
Guagnhuiv3
|
2014-06-18 14:47:11 +08:00 |
andyque
|
63475a6f81
|
refactor Loader
|
2014-06-18 14:44:00 +08:00 |
geron-cn
|
12bb7564cd
|
fix cannot compile in windows
|
2014-06-18 14:35:43 +08:00 |
2youyou2
|
b323f5772e
|
optimize frame
|
2014-06-18 14:21:33 +08:00 |
andyque
|
615995af54
|
add base property parser for WidgetReader
|
2014-06-18 14:15:11 +08:00 |
minggo
|
08453b911d
|
Merge pull request #7071 from pandamicro/Script_onEnter_fix
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-18 13:37:57 +08:00 |
andyque
|
95f1bd7e72
|
update loader
|
2014-06-18 11:54:25 +08:00 |
pandamicro
|
94fdff1da9
|
Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
|
2014-06-18 11:51:52 +08:00 |
minggo
|
6ecca08340
|
Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-18 11:30:14 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
8a0a6a2ded
|
Merge pull request #7064 from kyokomi/TextReader_filePath_fix
Fix bug for TextReader #setFontName.
|
2014-06-18 10:36:29 +08:00 |
kyokomi
|
b6ed783b0b
|
fix use raw char* to represent string.
|
2014-06-17 17:05:44 +09:00 |
2youyou2
|
806d74b6f9
|
add change play section test
|
2014-06-17 15:57:30 +08:00 |
2youyou2
|
c221a59954
|
fixed frame's value not right when enter frame
|
2014-06-17 15:57:06 +08:00 |
2youyou2
|
d2a6782a9e
|
fixed start frame not right
|
2014-06-17 11:45:57 +08:00 |
2youyou2
|
02363c2ae4
|
read visible property
|
2014-06-16 17:20:59 +08:00 |
2youyou2
|
f9a817a2bf
|
read flip property
|
2014-06-16 15:19:58 +08:00 |
2youyou2
|
7bb188f15a
|
fixed not read zorder
|
2014-06-16 15:03:53 +08:00 |
pandamicro
|
d00c9fe70a
|
Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
|
2014-06-16 12:50:35 +08:00 |
2youyou2
|
c5fe56ef21
|
update CMakeLists.txt
|
2014-06-16 09:44:14 +08:00 |
andyque
|
1d01fe8bbc
|
refactor
|
2014-06-15 16:12:24 +08:00 |
kyokomi
|
d7199204bd
|
Fix bug for TextReader #setFontName.
|
2014-06-14 23:56:12 +09:00 |
2youyou2
|
d9f34a1412
|
change texture to textureName
|
2014-06-13 19:52:53 +08:00 |
2youyou2
|
5bce6b87ea
|
change ActionTimeline to cocostudio ActionTimeline folder
|
2014-06-13 18:51:32 +08:00 |
2youyou2
|
57fe37f9f1
|
add const word
|
2014-06-13 18:00:46 +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 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +08:00 |
2youyou2
|
b181eaf802
|
modify mk file
|
2014-06-13 14:43:53 +08:00 |
2youyou2
|
e0f6ae9db4
|
change TimelineAction to cocos/2d folder
|
2014-06-13 13:36:01 +08:00 |
pipu
|
65c2a5e3e1
|
add parse actionTag in loadWidget method of CCNodeReader
|
2014-06-13 10:49:57 +08:00 |
2youyou2
|
f09b1863a9
|
fixed read sprite
|
2014-06-12 20:16:39 +08:00 |
pipu
|
c0170d23c7
|
fixed warnings
|
2014-06-12 19:56:15 +08:00 |
2youyou2
|
b2c5334de1
|
change NodeCache to NodeReader
|
2014-06-12 19:24:27 +08:00 |
2youyou2
|
eb2e973e07
|
change read name
|
2014-06-12 19:12:05 +08:00 |
2youyou2
|
ea7e24ba24
|
add TimelineActionData
|
2014-06-12 18:50:37 +08:00 |
2youyou2
|
e4f1ac6126
|
add hd resource
|
2014-06-12 17:38:26 +08:00 |
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 |
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 |
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 |
youyou
|
28ae57c5fc
|
add AsyncReader
|
2014-06-12 00:38:23 +08:00 |
2youyou2
|
aa06fab776
|
support relative path for reading json
|
2014-06-11 21:11:22 +08:00 |
minggo
|
8a5bfb9840
|
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-11 16:57:43 +08:00 |
andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
andyque
|
f50263402a
|
improve parser
|
2014-06-11 14:56:12 +08:00 |
andyque
|
2f6f1b7151
|
improve binary format
|
2014-06-11 14:45:35 +08:00 |
andyque
|
7a8f27ee0b
|
remove unused parser code
|
2014-06-11 14:15:34 +08:00 |
2youyou2
|
09a2ceb7df
|
add TimelineAction
|
2014-06-11 11:10:07 +08:00 |
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
2youyou2
|
0c7cbda144
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-10 09:09:53 +08:00 |
andyque
|
6bbf5a1459
|
tests
|
2014-06-06 10:12:23 +08:00 |
andyque
|
c96a6086c3
|
improve parsing code
|
2014-06-05 11:43:43 +08:00 |
andyque
|
8690122c96
|
add version 300 parsing code in widget reader
|
2014-06-05 10:25:08 +08:00 |
andyque
|
b570487bf3
|
add cocostudio binary file parser
|
2014-06-05 10:24:12 +08:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |