d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
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
788be3016a
update annotation
2015-08-20 18:04:49 +08:00
6bdb5431f1
Update code, using condition macro to determine studio or user project
2015-08-20 13:33:48 +08:00
aa6f2ec4b6
fix object size error while data is error
2015-08-20 11:27:01 +08:00
93f026f8e6
Fix https://github.com/cocos2d/cocos2d-x/issues/9488
2015-08-20 11:18:59 +08:00
935b0f006b
Fix https://github.com/cocos2d/cocos2d-x/issues/10205
2015-08-20 10:55:30 +08:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07: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
f1cbd00b30
Merge pull request #13414 from liamcindy/V3.8_reader
...
fix code informal
2015-08-17 17:21:01 +08:00
b40ef51337
fix code informal
2015-08-17 17:16:26 +08:00
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
096410a31a
Merge pull request #13406 from xiaofeng11/v3_reader_update
...
Add BlendFrame supporting to Skeleton Animation
2015-08-17 17:09:25 +08:00
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
442669d6f1
Remove unused easing data processing in blend frame parsing
2015-08-17 16:19:29 +08:00
e3ac9414f4
fix userCamera flag error with olg version files
2015-08-17 14:37:28 +08:00
008b06c01c
set blendfunc cascade to its skin in BoneNode
2015-08-17 13:44:00 +08:00
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
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
bc964e8314
Merge pull request #13335 from pandamicro/v3
...
Upgrade Spine runtime
2015-08-12 18:46:59 +08:00
cb143963ce
Upgrade Spine runtime
2015-08-12 18:07:28 +08:00
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
f3f67a10f9
Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
...
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
aa1b1831e9
fix cocostudio skin setfliped.
2015-08-11 10:34:22 +08:00
789da4edd8
compiles on xcode7
2015-08-07 14:00:18 -07:00
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
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
c7bc84e19b
fix crash when BoneNode destruct after skeleton destructed.
2015-08-07 15:41:31 +08:00
c6bc81d420
add destruct
2015-08-07 13:13:48 +08:00
c569e70aea
fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode
2015-08-07 11:44:06 +08:00
7b572bed9d
Fix crash when call removeChild from a bone which is already removed.
2015-08-07 09:37:18 +08:00
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
34000f4bde
fix particle3d crash with error file
2015-08-06 15:13:54 +08:00
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
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
dae4385b61
Merge pull request #13214 from pandamicro/skeleton-fix
...
Make BoneNodes ordered in Skeleton
2015-08-05 16:36:18 +08:00
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
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
0f90999419
Remove file error notice label from TextBMFontReader to keep consistency with other components
2015-08-04 11:45:29 +08:00
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
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
e4c47c811f
remove EMSCRIPTEN draw
2015-08-03 16:53:08 +08:00
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
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
17a5d07183
Fix 3d particle can not show in simulator
2015-08-03 09:53:16 +08:00
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
93c47390c8
Fix : remove using namespace cocos2d from header file
2015-07-31 00:02:57 +09:00
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
0955b0f9de
fix comment by pandamicro
2015-07-30 19:28:00 +08:00
Dale Stammen