beichen.liu
|
f1d8a28b96
|
Add FlatBuffers serialize function for language data used in Cocos Studio.
|
2016-02-24 14:59:37 +08:00 |
pandamicro
|
cb4d24e1ee
|
Merge pull request #14759 from pandamicro/hbmemory
Implement Full GC Relied memory model
|
2016-02-14 14:48:01 +08:00 |
mogemimi
|
44d2a161dc
|
Remove unnecessary c_str() calls
|
2016-02-04 11:52:14 +09:00 |
Wenhai Lin
|
4992037c5c
|
Avoid creating temporary string objects
|
2016-02-03 23:12:37 +08:00 |
pandamicro
|
e2568b3a6f
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
|
2016-01-28 01:12:49 +08:00 |
zilongshanren
|
be7c8c7553
|
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
Fix when add two ActionTimeLine object in one node, play state is wrong
|
2016-01-21 15:35:30 +08:00 |
geron-cn
|
7b405b29bc
|
fix code indent
|
2016-01-21 11:33:13 +08:00 |
geron-cn
|
be6fd6a2ee
|
format code indent
|
2016-01-21 10:27:37 +08:00 |
geron-cn
|
87434e2774
|
add scrollview bar parse for cocostudio in reader
|
2016-01-20 21:13:59 +08:00 |
pandamicro
|
fc19435123
|
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
|
2016-01-18 16:40:00 +08:00 |
James Chen
|
e7ed79f655
|
const Data -> const Data& for function argument, performance improvement.
|
2016-01-15 00:55:10 +08:00 |
XiaoFeng
|
0f3cb16efd
|
Fix when add two ActionTimeLine object in one node, play state is wrong
|
2016-01-14 16:16:37 +08:00 |
zilongshanren
|
9c86d1f0f1
|
Merge pull request #14880 from mogemimi/fix-minor-typo
Fix typos in comments and documentation
|
2016-01-14 09:58:29 +08:00 |
geron-cn
|
eab1de0f1e
|
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
|
2016-01-13 16:34:04 +08:00 |
geron-cn
|
e3c50caf11
|
add test case for PlayableFrame
|
2016-01-13 15:25:31 +08:00 |
geron-cn
|
0babe85947
|
add PlayableFrame
|
2016-01-12 17:21:01 +08:00 |
mogemimi
|
18a793792e
|
Fix typos in comments and documentation
|
2016-01-12 13:27:06 +09:00 |
pandamicro
|
34c7331b99
|
Issue fixes for new memory model
|
2015-12-21 00:16:17 +08:00 |
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 |