Wenhai Lin
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
mogemimi
07673f71cd
Fix inconsistent header include guards
2015-12-12 21:05:22 +09:00
James Chen
462796d2dd
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
2015-12-07 15:06:50 +08:00
mogemimi
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
pandamicro
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
Shun Lin
d0ce2473a1
Merge pull request #14499 from xiaofeng11/v3_combine_safety
...
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
Xpol Wan
d6ddb365b6
Remove boring logs in cocos studio supporting module.
...
They are helpless for debugging, we should use break points for debugging.
2015-11-27 14:43:25 +08:00
XiaoFeng
f5f09133e6
Change ASSERT to safety mode
2015-11-26 16:49:01 +08:00
zilongshanren
097f7a34e0
Merge pull request #14379 from mogemimi/fix-deprecated-warnings
...
Fix deprecated warnings
2015-11-17 11:19:07 +08:00
XiaoFeng
e313f7be8b
Combine Studio change for ActionTimeline
2015-11-16 15:56:23 +08:00
mogemimi
9ec1e2069a
Fix deprecated warnings
2015-11-13 14:38:48 +09:00
XiaoFeng
1f0c498bcb
Fixed actionNode position error bug
2015-11-09 19:45:17 +08:00
mogemimi
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
liamcindy
872141d547
update for light3d reader
2015-11-03 13:34:21 +08:00
unknown
917edbcf62
update for light3d reader
2015-10-29 09:53:54 +08:00
XiaoFeng
036585ef95
Fix ActionManagerEx some times crash when reload action frames.
2015-10-26 10:38:17 +08:00
fuyifan
5065a542f7
fix the issue #14113
2015-10-23 00:00:18 +08:00
pandamicro
0a6360eee0
Merge pull request #14196 from geron-cn/v3
...
AnchorPointFrame animation performance diffrent
2015-10-22 14:37:26 +08:00
pandamicro
f98d0cc115
Merge pull request #14166 from webcrawler/my_fix_branch
...
remove duplicate include
2015-10-22 10:33:05 +08:00
geron-cn
be8a158bd7
fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio
2015-10-20 15:49:12 +08:00
Liam
7280a963b3
fix light3D reader error
2015-10-20 15:24:34 +08:00
fjut
4c3d0c62bb
remove duplicate include
...
duplicate include: #include "ui/CocosGUI.h"
2015-10-16 21:41:40 +08:00
pandamicro
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro
db0d23ede4
Merge pull request #14087 from geron-cn/v3
...
fix code error, redundant interface
2015-10-10 09:39:35 +08:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
geron-cn
6b9890472b
fix code error, redundant interface
2015-10-08 14:14:49 +08:00
dimon4eg
168b295b2e
fix crash if csb file is missing
2015-09-30 14:44:30 +03:00
Liam
8368762b37
update for light3D
2015-09-29 18:33:28 +08:00
Liam
87a406febe
update for light3d reader
2015-09-29 11:27:01 +08:00
Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
geron-cn
f93cfac0f7
rename setAnimationEndCallFunc
2015-09-20 16:24:41 +08:00
geron-cn
0cfc33e4d3
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
2015-09-20 12:34:34 +08:00
pandamicro
6bf54a3eda
Merge pull request #13770 from geron-cn/v3
...
add Frame End Call Back and Animation Clip End Call Back
2015-09-19 00:24:21 +08:00
WenhaiLin
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
geron-cn
e6fb2f8924
fix ReEntry a same frame when scale action's speed.
2015-09-16 15:44:43 +08:00
pandamicro
5e037c9ad8
Merge pull request #13806 from xiaofeng11/v3
...
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
2015-09-15 14:05:02 +08:00
pandamicro
dbe3e062bc
Merge pull request #13801 from chengstory/OptimizateDoLayout
...
Move "ui::Helper::DoLayout" to "CreateNode"。
2015-09-15 13:37:00 +08:00
XiaoFeng
12f0f7f580
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
2015-09-14 17:36:19 +08:00
zhangcheng
224f392a9c
Add createNodeWithVisibleSize to CSLoader.
2015-09-14 16:51:58 +08:00
geron-cn
c800d0d824
fix crash recall a cached timeline after exit scene
2015-09-14 14:24:42 +08:00
zhangcheng
f88b23f52b
Move "ui::Helper::DoLayout" to "CreateNode".
2015-09-14 13:07:15 +08:00
geron-cn
966e568051
add ActionTimeline Frame End Call Back and Animation Clip End Call Back
2015-09-10 18:29:09 +08:00
pandamicro
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
WenhaiLin
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
子龙山人
59c1b21d0b
Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine
...
This is a small optimization about TextReader.
2015-09-01 09:40:52 +08:00
WenhaiLin
df383de894
This is a small optimization about TextReader.
2015-08-31 17:06:11 +08:00
geron-cn
e7c7b248d6
fix bug: bone can be see by other cameras
2015-08-31 16:04:17 +08:00
Liam
ed49250b9b
update for reader
...
1.update for sprite3d cullface
2.sync js code
2015-08-27 18:29:45 +08:00
pandamicro
405e6c24c8
Merge pull request #13578 from geron-cn/v3.8
...
bone's color and opacity cannot cascade to bone
2015-08-26 22:33:31 +08:00
geron-cn
7d01b16f62
bone's color and opacity cannot cascade to bone, also bone can not cascade from its parent.
2015-08-26 20:24:20 +08:00
Liam
5a997cec1c
update reader with skybox valid
2015-08-26 10:22:20 +08:00
Liam
c998639c30
update interface for gamenode3d
2015-08-25 15:18:09 +08:00
Liam
650a5c2318
update reader with new skybox
2015-08-25 13:20:19 +08:00
pandamicro
11113c85da
Improved logic of skybox reader fix
2015-08-24 10:02:38 +08:00
Liam
110de9ee3e
fix skybox crash with error data
2015-08-24 10:02:37 +08:00
pandamicro
81ca089d27
Merge pull request #13479 from liamcindy/V3.8_reader
...
fix object size error while data is error
2015-08-20 18:09:28 +08:00
Liam
788be3016a
update annotation
2015-08-20 18:04:49 +08:00
XiaoFeng
6bdb5431f1
Update code, using condition macro to determine studio or user project
2015-08-20 13:33:48 +08:00
Liam
aa6f2ec4b6
fix object size error while data is error
2015-08-20 11:27:01 +08:00
XiaoFeng
93f026f8e6
Fix https://github.com/cocos2d/cocos2d-x/issues/9488
2015-08-20 11:18:59 +08:00
XiaoFeng
935b0f006b
Fix https://github.com/cocos2d/cocos2d-x/issues/10205
2015-08-20 10:55:30 +08:00
肖峰
0473b08dbb
Fix gamenode3d parse failed error
...
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
2015-08-17 22:42:21 +08:00
pandamicro
f1cbd00b30
Merge pull request #13414 from liamcindy/V3.8_reader
...
fix code informal
2015-08-17 17:21:01 +08:00
Liam
b40ef51337
fix code informal
2015-08-17 17:16:26 +08:00
pandamicro
d0580f09e8
Merge pull request #13383 from geron-cn/3.7.1
...
add blendfunc cascade to its skin in BoneNode
2015-08-17 17:12:04 +08:00
pandamicro
096410a31a
Merge pull request #13406 from xiaofeng11/v3_reader_update
...
Add BlendFrame supporting to Skeleton Animation
2015-08-17 17:09:25 +08:00
pandamicro
66d99d392c
Merge pull request #13409 from liamcindy/V3.8_reader
...
fix userCamera flag error with old version files
2015-08-17 17:01:59 +08:00
XiaoFeng
442669d6f1
Remove unused easing data processing in blend frame parsing
2015-08-17 16:19:29 +08:00
Liam
e3ac9414f4
fix userCamera flag error with olg version files
2015-08-17 14:37:28 +08:00
geron-cn
008b06c01c
set blendfunc cascade to its skin in BoneNode
2015-08-17 13:44:00 +08:00
XiaoFeng
72d21ff810
Update reader, add BlendFrame supporting to Skeleton Animation
...
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
2015-08-17 13:05:29 +08:00
Liam
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
子龙山人
86d674030e
Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip
...
fix cocostudio skin setfliped.
2015-08-12 14:34:46 +08:00
fusijie
aa1b1831e9
fix cocostudio skin setfliped.
2015-08-11 10:34:22 +08:00
geron-cn
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
geron-cn
e1108c594c
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
2015-08-07 15:48:33 +08:00
geron-cn
c7bc84e19b
fix crash when BoneNode destruct after skeleton destructed.
2015-08-07 15:41:31 +08:00
geron-cn
c6bc81d420
add destruct
2015-08-07 13:13:48 +08:00
geron-cn
c569e70aea
fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode
2015-08-07 11:44:06 +08:00
geron-cn
7b572bed9d
Fix crash when call removeChild from a bone which is already removed.
2015-08-07 09:37:18 +08:00
geron-cn
3ae3020d61
fix crash when fore call remove child bone from a bone which already removed from a skeleton.
2015-08-06 19:43:11 +08:00
Liam
34000f4bde
fix particle3d crash with error file
2015-08-06 15:13:54 +08:00
Vladimir Perminov
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
geron-cn
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
pandamicro
dae4385b61
Merge pull request #13214 from pandamicro/skeleton-fix
...
Make BoneNodes ordered in Skeleton
2015-08-05 16:36:18 +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
b9602127a4
Merge pull request #13187 from xiaofeng11/v3.7.1
...
Remove file error notice label from TextBMFontReader
2015-08-04 13:38:17 +08:00
XiaoFeng
0f90999419
Remove file error notice label from TextBMFontReader to keep consistency with other components
2015-08-04 11:45:29 +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
pandamicro
6d3a00ad67
Merge pull request #13173 from geron-cn/3.7.1
...
fix bug: crash when use bone after erase it form Vector.
2015-08-03 19:45:54 +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
330eaf5239
Merge pull request #13161 from xiaofeng11/v3.7.1
...
Fix 3d particle can not show in simulator
2015-08-03 11:11:39 +08:00
XiaoFeng
17a5d07183
Fix 3d particle can not show in simulator
2015-08-03 09:53:16 +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
pandamicro
3524af1ad6
Merge pull request #13059 from geron-cn/3.7.1
...
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
2015-07-30 20:31:34 +08:00
geron-cn
0955b0f9de
fix comment by pandamicro
2015-07-30 19:28:00 +08:00