geron-cn
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
geron-cn
9980397081
Make BoneNodes ordered in Skeleton
...
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
2015-08-05 16:33:32 +08:00
pandamicro
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
geron-cn
e4c47c811f
remove EMSCRIPTEN draw
2015-08-03 16:53:08 +08:00
geron-cn
cfc8da579f
fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed
2015-08-03 16:47:54 +08:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
takaken1994
93c47390c8
Fix : remove using namespace cocos2d from header file
2015-07-31 00:02:57 +09:00
geron-cn
0955b0f9de
fix comment by pandamicro
2015-07-30 19:28:00 +08:00
geron-cn
fa5d70fc04
add SkeletonNode Nest test case
2015-07-28 23:49:25 +08:00
geron-cn
d2de5b1c85
add test case for bug: #13060 and #13005
2015-07-28 19:18:58 +08:00
geron-cn
0275e3b773
fix set visible
2015-07-28 17:25:40 +08:00
geron-cn
c9991aea81
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible
2015-07-28 16:31:06 +08:00
XiaoFeng
bca6934786
Normalization function names
2015-07-28 14:05:56 +08:00
XiaoFeng
f410fcd737
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-27 11:55:18 +08:00
geron-cn
a5d41aac0d
fix bug:use wrong _modelviewTransform in director to draw bone
2015-07-24 19:48:05 +08:00
geron-cn
4327e4a532
remove include SkinNode.h in cpp
2015-07-24 12:31:45 +08:00
geron-cn
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
geron-cn
3341fa0f85
fix the vars' initialize in construct func, and remove using namespace
2015-07-24 10:28:10 +08:00
geron-cn
1389fc3d31
some doxygen comments and copyright
2015-07-24 01:30:34 +08:00
geron-cn
4d58aa2668
remove setcontentsize in skeletonnode
2015-07-23 17:41:37 +08:00
zhangcheng
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
geron-cn
7255b5308b
config for mac
2015-07-23 15:13:14 +08:00
geron-cn
915cefa208
bone node
2015-07-23 11:51:49 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
zhangcheng
1c983f1f39
GBKToUTF8
2015-06-17 13:16:06 +08:00
pandamicro
8e3e928efd
Merge pull request #12040 from geron-cn/v3
...
fix bug: fix actiontimeline can not step to last frame when loop play
2015-06-11 14:36:08 +08:00
子龙山人
e044b1ab11
Merge pull request #11785 from geron-cn/fixbug
...
fix crash when run TestTimelineFrameEvent in cpp-test
2015-05-27 16:28:13 +08:00
geron-cn
c19adbdc3c
fix bug: fix actiontimeline can not step to last frame when loop play
2015-05-27 10:24:50 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
geron-cn
3e0b0a0feb
fix crash when run TestTimelineFrameEvent in cpp-test
2015-05-11 23:04:26 +08:00
Vladislav Kaplun
f67b4761da
Fix a logical bug that may wrong behavior
2015-05-11 15:15:00 +03:00
Ricardo Quesada
10b71464a7
No throws in cocos2d-x code
2015-05-05 17:17:41 -07:00
Vladimir Timofeev
2d8c687d6e
Fix the Frame class:
...
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
2015-05-01 11:51:20 +03:00
XiaoFeng
9d0741544c
Fix a logical bug that may cause null pointer been used
2015-04-29 15:58:44 +08:00
XiaoFeng
28264c0742
Fix simulator crash when add animation under a user defined lua extension
2015-04-27 17:42:20 +08:00
xiaofeng11
a8fcaf4f4f
Merge pull request #17 from geron-cn/xiaov3
...
fix actiontimeline step over frame when (noloop play && timespeed>1)
2015-04-15 13:41:49 +08:00
geron-cn
7b376fd384
fix action timeline step over frame when no (loop play && timespeed>1)
2015-04-15 13:32:04 +08:00
pipu
755134ba3f
Update parse animation easing
2015-04-10 17:05:55 +08:00
xiaofeng11
5ec9b14a33
Merge pull request #13 from geron-cn/xiaov3
...
fix
2015-04-10 14:27:09 +08:00
geron-cn
b8083f2c99
fix
2015-04-10 14:24:48 +08:00
xiaofeng11
dda662a7c1
Merge pull request #12 from geron-cn/xiaov3
...
add blendfunc frame
2015-04-10 14:04:35 +08:00
geron-cn
d238f9905e
add blendfunc frame
2015-04-10 13:34:39 +08:00
xiaofeng11
ee98b40af9
Merge pull request #11 from geron-cn/xiaov3
...
add tween easing to ccframe
2015-04-10 10:46:58 +08:00
geron-cn
c206725be5
fix color
2015-04-09 19:13:14 +08:00
geron-cn
56bb0a68bb
add tween easing to carfare
2015-04-09 18:10:37 +08:00
pipu
e86071e77e
Rest CCFrame.
2015-04-09 17:21:52 +08:00
pipu
80ad7bbee8
Animation easing.
2015-04-09 16:55:15 +08:00
pipu
41661830ff
Remove CCNodeReader.h/.cpp.
2015-04-01 13:37:36 +08:00
pipu
bc7d8f0a09
Add method destroyCocosStudio() for CocoStudio
2015-03-31 19:55:56 +08:00
pipu
bb110449be
Reset method purge() definition for some Reader.
2015-03-31 14:56:24 +08:00
pipu
91acd6aea9
Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.
2015-03-31 14:21:10 +08:00
pipu
a0a461f319
Supplement some Reader.
2015-03-31 11:22:34 +08:00
pipu
6f20da4444
Add destroyCocosStudio()
2015-03-30 16:46:33 +08:00
zhangcheng
e2e0ed0595
Avoid timeline crash when custom widget is placed in scene.
2015-03-24 19:59:27 +08:00
pipu
787225ce21
Make _alpha of ColorFrame become deprecated attribute.
2015-03-23 15:45:32 +08:00
pipu
c068e60aa6
Reconstruct ColorFrame.
2015-03-23 13:37:24 +08:00
pipu
46741e1035
Fix that parse position from .csd file.
2015-03-19 11:22:11 +08:00
pipu
faf9d6b01c
Avoid crash during parse .csd file.
2015-03-18 10:28:12 +08:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
Nite Luo
cfa1f0c84f
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
...
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
Huabing.Xu
639ed335b3
Merge pull request #10839 from pipu/node_load_callback
...
To add the function node load callback called during create node from csb file.
2015-03-13 15:06:14 +08:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
pipu
56c3d1c6f6
To add the function node load callback called during create node from csb file.
2015-03-12 17:36:39 +08:00
pipu
c72c8e865d
To reconstruct object extension data.
2015-03-12 15:47:15 +08:00
pipu
1fa9b2577a
Merge branch 'v3' into reconstruct_parse_callbackbind
2015-03-09 10:16:14 +08:00
pipu
fadac31868
Serialize and parse attribute "inner speed" for ProjectNode.
2015-03-05 15:48:17 +08:00
pipu
010a077fa8
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
2015-03-04 17:29:40 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
andyque
ac3d79a516
add constructor to AnimationInfo
2015-01-28 16:59:27 +08:00
geron-cn
df10a974fa
fix projectnode
2015-01-27 23:19:27 +08:00
minggo
15bf919000
Merge pull request #10231 from geron-cn/fixanimationlistclone
...
FIX BUG: animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
geron-cn
390c336a19
FIX animationfio lost after actiontimeline clone
2015-01-27 12:04:14 +08:00
geron-cn
a1a7273436
fix bug: fix crash when lack of projected file
2015-01-26 21:20:26 +08:00
kompjoefriek
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
pipu
c0a662ff13
Modify bug that parses AnchorPointFrame.
2015-01-22 11:20:01 +08:00
geron-cn
2fc79e2da5
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
2015-01-21 15:21:23 +08:00
geron-cn
ab2b86b392
rename variables
2015-01-14 13:02:30 +08:00
pipu
a20cc2b151
Modify that parses plist for cocostudio editor simulator.
2015-01-13 11:12:28 +08:00
pipu
532269c44e
fix bug: cut inner timeline action as outer timeline action's length
2015-01-13 11:07:06 +08:00
pipu
c7a923b658
Update method clone() for InnerActionFrame.
2015-01-12 17:59:30 +08:00
pipu
d364a329db
Merge branch 'v3' into parse_inneractionframe
2015-01-12 14:26:05 +08:00
pipu
7e83336af8
Update InnerActionFrame.
2015-01-12 13:54:17 +08:00
jianglong0156
4cc0dd129a
issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public
2015-01-12 11:57:03 +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
youyou
1d7a4a5c05
fixed event frame will go twice loop when goto frame
2015-01-09 10:24:38 +08:00
yusheng.lu
ec540fcaa2
Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader
2015-01-05 13:26:46 +08:00
yusheng.lu
a7fb75dc7d
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-04 19:12:19 +08:00
yusheng.lu
89034469f5
Updated the version check description.
2014-12-31 16:01:11 +08:00
minggo
ad443da6a0
Revert "Feature of version check. "
2014-12-31 14:17:18 +08:00
yusheng.lu
505a4e8ab0
Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file.
...
Removed the version compatible control code before.
2014-12-29 19:37:53 +08:00
geron-cn
70eef1f660
fix play
2014-12-25 17:45:14 +08:00
geron-cn
490b33405d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist
2014-12-25 17:37:05 +08:00
geron-cn
79e5341742
remove animation list binary parse
2014-12-25 17:22:49 +08:00