2a806a82c6
Fix #24345
...
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
2015-12-09 15:07:58 +08:00
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +08:00
5ef1c92420
Merge pull request #14609 from zilongshanren/fixLabelClampIssue
...
fix horizontal clamp and shrink issue
2015-12-07 19:45:19 +08:00
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
6c17ef4baf
fix horizontal clamp and shrink issue
2015-12-07 18:13:03 +08:00
aebfefd7a8
Merge branch 'v3' into js_more_conversions
2015-12-04 19:01:20 -08:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
71217fd393
Fix indent
2015-12-04 15:14:47 +08:00
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
01644cb46e
Merge pull request #14569 from mogemimi/fix-docs-typo
...
Fix typos in documentation
2015-12-04 09:55:30 +08:00
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
3100cba5a1
Animation ported to JS
2015-12-03 15:02:39 -08:00
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
be213bf306
Fix typos in documentation
2015-12-03 21:03:00 +09:00
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
ed55d41858
fix label clamp when scaled with bmfont
2015-12-02 13:48:20 +08:00
89ef6da5b5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/2d/CCFontFNT.h
2015-11-28 12:48:55 +08:00
6e0525156b
no message
2015-11-27 23:33:20 +10:00
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
8b631f5c9f
Fix compile failed on mobile platform
2015-11-27 15:19:50 +08:00
d69453fa54
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine
2015-11-26 19:04:13 +08:00
52f696945d
Remove condition MACRO and remove ASSERT in Sprite::initWithFile function
...
Remove CameraFlag define for Cocos Studio only
2015-11-26 14:47:37 +08:00
5221f8a6fc
improve the code by code review suggestions.
2015-11-26 12:03:18 +08:00
397fa809da
Add default line width to create function
2015-11-26 09:32:57 +08:00
9ec451ca31
Update CCDrawNode, remove condition MACRO
2015-11-25 23:26:57 +08:00
584a5d7407
fix alphaThreshold undefined issue
2015-11-25 18:27:38 +08:00
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
03046d6fbd
change the default alphaThreshold
2015-11-25 14:31:32 +08:00
759c0bbf31
rename CCStencilBitsManager to StencilStateManager
2015-11-25 14:24:27 +08:00
5fef088695
refactor stencil state management code
2015-11-25 14:14:17 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
7676b1cb73
improve label layout logic
2015-11-23 17:47:30 +08:00
7ee82f20fc
fix getLetter crash issue.
...
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
2015-11-20 16:39:48 +08:00
8c25749366
minor improvement
2015-11-20 10:54:05 +08:00
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
ccdb2a75f9
Add Label Overflow and wrap option.
...
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
2015-11-19 16:06:13 +08:00
5369f9a84d
Add header file to make this pr can pass jenkins auto build
2015-11-19 10:14:27 +08:00
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
d47a79c0e4
Remove cocos studio limitation for new functions
2015-11-16 11:08:20 +08:00
140eaf7b6c
Fix function name in cpp file
2015-11-13 09:09:02 +08:00
4c8066e39f
Normalize function names.
2015-11-12 18:23:56 +08:00
1546a062a1
Update
2015-11-12 10:57:22 +08:00
c40a2a3301
Combine Studio change for 2d components
2015-11-12 09:49:49 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
dfe56769a1
added missing Light3DReader files
2015-11-03 08:04:55 -08:00
872141d547
update for light3d reader
2015-11-03 13:34:21 +08:00
ccf4cb5a74
improve scale9sprite
2015-10-29 10:41:58 +08:00
b72e4118f0
PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.
2015-10-28 16:56:36 +09:00
b6b9364a84
Merge pull request #14232 from xiaofeng11/v3
...
Fix FadeOutDownTilesTest won't show last tile
2015-10-28 15:44:28 +08:00
6029635493
Remove comment out codes
2015-10-27 18:43:51 +08:00
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +08:00
f374df408e
Fix FadeOutDownTilesTest won't show last tile
2015-10-27 14:41:31 +08:00
94ab41ceb3
use "const string &" in SpriteFrameCache
2015-10-26 09:36:01 +01:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
05b277752c
Merge pull request #14105 from WenhaiLin/v3.9-rc
...
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
2015-10-22 10:36:02 +08:00
c3194ac34d
Fix memory leak in TMXLayer
2015-10-19 19:47:36 +09:00
82881bf92f
Merge pull request #14109 from loadrunner/label3
...
Added line spacing/leading feature to Label
2015-10-19 10:55:53 +08:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
40aa4187be
Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2
...
fix the #23272 bug
2015-10-14 14:05:09 +08:00
02f20db82a
fix the #23272 bug
2015-10-14 13:24:38 +08:00
b19bf82170
Merge pull request #14108 from loadrunner/label2
...
Changed label font size type to float
2015-10-13 11:55:14 +08:00
5e43cfa129
Merge pull request #14107 from loadrunner/label1
...
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
e60ac24e5d
Check that textureAtlas isn't null before removing all quads in SpriteBatchNode
...
See issue #14122 .
2015-10-12 20:42:08 -04:00
3dde02ba93
Merge pull request #14106 from loadrunner/tilemap
...
TMXLayer cast bug
2015-10-11 18:43:24 +08:00
471c23930c
added line spacing/leading
2015-10-10 19:15:45 +03:00
019b549a20
changed font size type to float
2015-10-10 19:15:22 +03:00
aeb268f3cd
cast tile coordinates to int before calculating index
2015-10-10 19:05:51 +03:00
05c235f9fe
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory"
2015-10-10 17:55:05 +08:00
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
ee3399a4a4
Merge pull request #14097 from TheCodez/patch-1
...
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
493d95c3f6
Add missing getChildByTag<>() api
2015-10-10 00:08:38 +02:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
be4724ef47
issues #14050 ActionManager memory leak
2015-10-09 10:07:26 +08:00
a68d07b968
Merge pull request #14075 from TheCodez/getname_byref
...
Node::getName() now returns string by reference
2015-10-08 11:43:03 +08:00
5c816b5d9b
Merge pull request #14063 from kammy/improve_spriteframecache
...
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
2015-10-08 11:23:21 +08:00
eb747cf808
Node::getName() returns string by reference
2015-10-05 21:42:07 +02:00
1e298a2c1a
Merge pull request #14064 from MSOpenTech/v3-win10-fix
...
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-04 10:53:52 +08:00
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
0469632cf8
Inprove addSpriteFramesWithDictionary
...
- Moved initialization of image to an appropriate
location, because it always called twice in
SpriteFrameCache::addSpriteFramesWithFile()
2015-10-03 03:18:07 +09:00
9f768bc1ab
Add missing override keyword
2015-10-02 18:18:23 +09:00
c49b60ae40
SpriteFrameCache: added plist file format documentation, fixed broken link
2015-10-01 10:36:18 +02:00
9a0ea79b61
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
2015-09-30 15:20:53 +02:00
79656ffe13
fixed typo, indentation
2015-09-29 16:50:14 +02:00
ac24612e98
extend SpriteFrameCache to load PolygonInfo from plist file
2015-09-29 15:42:04 +02:00
87a406febe
update for light3d reader
2015-09-29 11:27:01 +08:00
8944f9e1cd
removed scale factor for label shadow
2015-09-28 16:27:20 +03:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
95379c5dc2
Merge pull request #13995 from xiaofeng11/v3
...
Fix issue http://punchbox.info:3000/issues/23146
2015-09-24 13:03:59 +08:00
6db2cd7b9c
Fix issue : http://punchbox.info:3000/issues/23182
...
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
2015-09-23 18:37:12 +08:00
6ebdd3baf9
allow to use custom shader uniforms and attributes on drawNode
2015-09-23 10:34:35 +01:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
08204ec0bd
Merge pull request #13991 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 02:44:45 +08:00
6a5db06115
added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project
2015-09-21 11:11:34 -07:00
b54a06a55e
Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType
...
Fix crash in destructor of FontFreeType
2015-09-22 01:59:34 +08:00
deacab9222
Merge pull request #13990 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
70e157a44a
removed CCComponentPhysics2d from Win10 UWP project
2015-09-21 10:44:30 -07:00
09b5b7fcc3
Fix crash in destructor of FontFreeType
2015-09-21 18:18:58 +03:00
5511d42cd4
Merge pull request #13716 from fusijie/particle_performance
...
Refactory particle system update.
2015-09-21 14:19:55 +08:00
d871b1aa8a
Refactory particle system.
2015-09-20 16:46:09 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
add24ccf95
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
...
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
13f3d46ad4
Merge pull request #13897 from super626/v3
...
SkyboxBrush : Make the shader parameter take effect at once
2015-09-18 16:14:06 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
23246b006b
fixed region x,y scale bug.
2015-09-18 13:39:22 +08:00
eb480fb021
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 11:31:37 +08:00
757209e59e
make the shader parameter take effect at once
2015-09-17 18:14:17 +08:00
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
73d2c5d1b8
Merge pull request #13577 from fusijie/fix_13454
...
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
f281ae31b0
Merge pull request #13725 from WenhaiLin/v3-comonent-refine
...
Refine ComponentContainer to improve performance
2015-09-10 18:04:26 +08:00
7611f99ee4
Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine
...
Uncoupling the implementation of MenuItemToggle dependence on tag.
2015-09-10 16:15:18 +08:00
98f29e4dee
Merge pull request #13764 from fusijie/fix_autopolygon_comments
...
[ci skip]Fixed autopolygon comments
2015-09-10 15:22:55 +08:00
d957e0c032
Fixed auto polygon comments out of date.
2015-09-10 15:18:04 +08:00
e251866d23
Uncoupling the implementation of MenuItemToggle dependence on tag.
2015-09-09 15:32:44 +08:00
34be2065e4
Refine ComponentContainer to improve performance
2015-09-09 11:53:55 +08:00
e592a1a02d
fix typos
2015-09-09 11:37:41 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
00abec6c2c
Merge pull request #13707 from pandamicro/fix_layerrgba
...
[ci skip] Fix compile error in __LayerRGBA
2015-09-07 17:27:46 +08:00
d77045818c
Fix compile error in __LayerRGBA
2015-09-07 17:25:56 +08:00
030157ded0
update libcococs2d name to v3.9 for WinRT platforms
2015-09-04 08:46:08 -07:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
c23805889f
add motionstreak3d
2015-09-01 11:02:22 +08:00
6fa6f1f0da
enable depth write
2015-08-28 11:46:11 +08:00
5f527bfc1d
Fixed sprite debug draw.
2015-08-26 18:18:58 +08:00
2f72a88a20
depth test always
2015-08-26 16:37:48 +08:00
7884138dcc
disable blend when drawing skybox
2015-08-25 14:32:25 +08:00
43687bf7a0
moved CCTextureCube from 3D to renderer
2015-08-24 03:45:55 -07:00
0c5b377f00
Merge pull request #13531 from pandamicro/texturecube
...
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:06:08 +08:00
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
be24586f4b
fix crash of CameraBackgroundColorBrush
2015-08-24 10:23:59 +08:00
b4f2fb0928
added missing CCCameraBackgroundBrush files
2015-08-21 09:23:01 -07:00
486af79a47
Merge pull request #13511 from fusijie/fix_13509
...
fixed renderTexture crash bug.
2015-08-21 18:24:27 +08:00
cbd7eed9c4
fixed renderTexture crash bug.
2015-08-21 17:38:56 +08:00
006f300ac9
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 12:42:36 +08:00
350182c1aa
Refactor BackGround to Background
2015-08-21 10:43:59 +08:00
3e2001bdb1
Add CCCameraBackgroundBrush
...
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
2015-08-21 10:43:59 +08:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
7bd5cc4e34
Merge pull request #13486 from fusijie/fix_11677
...
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 18:06:38 +08:00
f133e5a754
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 17:07:53 +08:00
f26509efe4
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
2015-08-19 14:02:12 +08:00
4f9a81198b
Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder
...
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
2015-08-19 13:46:00 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
827f05c5e1
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
2015-08-19 10:22:48 +08:00
47b72ba30e
Merge branch 'v3' into v3-win10
2015-08-18 11:07:38 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
593eb0737f
Merge pull request #13440 from WenhaiLin/v3.8-rc0
...
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 17:06:37 +08:00
6bf15885b8
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 15:42:05 +08:00
223d5a7a5c
fix copy construct & assignment operator memory leakage.
2015-08-18 14:48:16 +08:00
d2bc03f80f
Merge pull request #13424 from WenhaiLin/v3.8-rc0
...
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-18 10:00:36 +08:00
990a25f759
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-17 22:46:19 +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
83de0e798e
Merge pull request #13365 from WenhaiLin/v3-label-ignore-r
...
Label:ignore '\r' character.
2015-08-14 17:22:33 +08:00
d25decb414
Label:ignore '\r' character.
2015-08-14 11:07:34 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
c06994de34
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
2015-08-13 10:29:58 +08:00
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
2983aed0a9
Label:Fixed crash cause by access an invalid address
2015-08-10 16:50:59 +08:00
3cc06d3f9b
Merge pull request #13267 from yangws/bug_21796
...
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-10 12:40:32 +08:00
f4440f5613
Merge pull request #13229 from fusijie/fix_13228
...
Fixed SpriteBatchNode setFlipped bug.
2015-08-10 11:53:30 +08:00
56204dbef9
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-07 16:30:22 +08:00
9b148b08cd
Fixed SpriteBatchNode setFlipped bug.
2015-08-06 10:53:22 +08:00
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
b9edd6fc29
Fixed transform
2015-08-05 00:21:06 +08:00
2363622a67
Label:support auto batch with bitmap font or char map.
2015-08-04 21:49:14 +08:00
8d2da20e5f
fix spelling mistake.
2015-08-04 09:36:33 +08:00
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
aaa5793b86
add IF-CASE to fix debug draw under SpriteBatchNode.
2015-08-03 10:47:58 +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
0ca48a32f5
Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix
...
Label:Fixed the edge of character may be cropped.
2015-08-01 15:36:47 +08:00
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
dcef1e9d31
fix polygon sprite setflipped bug.
2015-07-31 15:49:44 +08:00
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
fc14efa034
update comment
2015-07-31 09:55:57 +08:00
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
bce279c52e
Label:Fixed the edge of character may be cropped.
2015-07-30 16:24:47 +08:00
17c7848e62
fix FastTiledMap auto-culling bug.
2015-07-30 15:07:03 +08:00
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
cd4d8b7880
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
...
Improve coding style
2015-07-30 13:44:53 +08:00
ee5e64825a
fix Sprite auto-culling bug.
2015-07-30 12:00:57 +08:00
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
c039c7a9bd
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
...
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
5d677d49bb
clamp sin value to -1, 1
2015-07-29 10:35:01 +08:00
cca95c3c51
Merge pull request #13041 from yangws/issue_10386
...
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-29 09:52:06 +08:00
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
c4112e1ce5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-28 17:02:30 +08:00
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
89c722ed4b
Add script invocation for onEnter, onExit etc in other classes
2015-07-28 16:07:14 +08:00
0d7f1e3672
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
2015-07-28 16:05:47 +08:00
3a58668d71
Merge pull request #12744 from fusijie/fix_pageturndown
...
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
7fb4dabcb7
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
2015-07-27 14:46:15 -07:00
2f996b24ef
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-27 16:59:35 +08:00
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
b1bd8338aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-24 21:30:28 +08:00
8940eb829f
added missing cocostudio files
2015-07-24 04:48:14 -07:00
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
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
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
5ffa8efee6
Merge pull request #12977 from chengstory/OptimizationExtensionData
...
Optimization extension data
2015-07-24 11:01:56 +08:00
be08de6780
Update libcocos2d_8.1 vs project.
2015-07-24 09:32:39 +08:00
13149a0bc5
updated version to 3.7.1
2015-07-23 13:26:32 -07:00
c3935b921c
updated version to 3.7.1
2015-07-23 13:02:42 -07:00
72427a0a64
updated version to 3.8
2015-07-23 12:46:47 -07:00
f91e812924
updated version to 3.8
2015-07-23 12:40:36 -07:00
e9cbb6b084
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:32:52 +08:00
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
915cefa208
bone node
2015-07-23 11:51:49 +08:00
19c8f337da
Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors
2015-07-23 11:01:51 +08:00
6029ca3edd
Merge pull request #12949 from yangws/issue_12906
...
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
741163db40
Merge pull request #12938 from WenhaiLin/v3.8-deps70
...
Update deps for support FullType.
2015-07-22 15:42:13 +08:00
e0e5ae9d99
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
...
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
d0d481fd67
updated version to v3-deps-70
2015-07-21 16:43:47 +08:00
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
c4d8ebc780
add Two APIs to Node.
...
1. add getNodeToParentTransform(Node* ancestor)
2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +08:00
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
731de26795
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-17 17:45:11 +08:00
0ea8dca299
Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-17 17:33:52 +08:00
d828c030cb
remove CCClippingRectangleNode transform error support.
2015-07-17 11:56:23 +08:00
89e5307f0c
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
...
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
0b0b25c517
Merge pull request #12872 from zilongshanren/remove-emscript-code
...
remove EMSCRIPTEN related code
2015-07-17 10:08:34 +08:00
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
a6f8031af9
Label:support font that contains GB2312 char map.[except android]
2015-07-16 17:10:05 +08:00
a72ea73e60
Merge pull request #12863 from fusijie/fix_polygonsprite_setColor
...
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-16 14:51:06 +08:00
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
e4b392d4c8
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-15 16:27:29 +08:00
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
49b47f576d
Merge pull request #12828 from WenhaiLin/v3-label-readability
...
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
8944e932a1
Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame
...
Add Animate:getCurrentFrameIndex
2015-07-13 20:48:01 +08:00
36e1f26570
Fix CCSprite ; missing
2015-07-13 16:44:33 +08:00
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
dee13756ec
Add Animate:getCurrentFrameIndex
2015-07-13 10:40:43 +08:00
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
07fd337052
Merge pull request #12763 from folgerhu/v3.7-release
...
CCTMXXMLParser code negligence
2015-07-10 11:49:30 +08:00
e50fc4f184
merge code
2015-07-09 17:12:48 +08:00
a79586c052
CCTMXXMLParser code negligence
2015-07-09 17:02:12 +08:00
8e256dcd09
Merge pull request #12718 from WenhaiLin/v3-label-addchild
...
Label:Support add child nodes.
2015-07-09 15:37:49 +08:00
cab670f0ff
Merge pull request #12748 from fusijie/refineSetTexture
...
refine setTexture.
2015-07-09 14:56:06 +08:00
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
1dbb2ab17a
refine setTexture.
2015-07-09 10:11:15 +08:00
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
a59828605b
Support TileGrid rectangle.
2015-07-08 17:47:04 +08:00
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
3f550ef331
Merge pull request #12663 from xiaofeng11/v3.7-release
...
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
2bcd70f681
Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite
...
Fixes some warnings and a related bug in CCSprite.
2015-07-08 14:12:40 +08:00
06c06a1f03
fix polygon sprite bug.
2015-07-08 10:07:35 +08:00
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
160bff8e13
Add a setter for line width in DrawNode
2015-07-07 18:48:02 +09:00
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
a6b29666c9
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
...
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
86cbd59bfd
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
2015-07-04 09:56:53 +09:00
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
64b8660873
update for skybox reader
2015-07-03 17:52:42 +08:00
ca02f167c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-03 15:43:58 +08:00
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
993e420ce4
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-03 11:30:38 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
e7aeb335a3
Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
...
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
a95edbfb65
Merge pull request #12618 from super626/clippingnode2
...
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
cb0e93fc08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-01 14:58:06 +08:00
322bd30d7b
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 14:57:01 +08:00
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
2774d6ff1d
Merge pull request #12602 from yangws/v3_scene3dtest
...
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
a64e50688e
Add the new files into CMake and Windows project configurations.
2015-07-01 12:21:42 +09:00
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
40521ad1c4
Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
...
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
3b4d134050
Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
...
change the file encoding,
2015-06-30 16:29:44 +08:00
bc341edf1f
change the file encoding,
...
It display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
25bac2f6a9
Fix SpriteBatchNode sort error.
2015-06-30 14:12:18 +08:00
3cb29bbc65
[ci skip]Fixed warns
2015-06-25 10:53:41 +08:00
9445aeacb7
Merge pull request #12456 from super626/camera
...
quaternion instead of euler angle
2015-06-23 13:16:39 +08:00
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
d252250968
quaternion instead of euler angle
2015-06-19 18:46:14 +08:00
869e3c5243
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
...
Label:Fixed line wrap error without space.
2015-06-19 15:08:13 +08:00
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
4d588c7837
Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
...
Fixed warn
2015-06-18 15:09:36 +08:00
05522afaa1
Fixed warn
2015-06-18 14:24:52 +08:00
92824537ac
fix compile error for linux
2015-06-18 11:15:45 +08:00
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
fd0605416e
moved clipper files to external/clipper filter in VS solution
2015-06-17 11:48:56 -07:00
9ef92b71dd
added missing external/clipper files. Removed obsolete files
2015-06-17 11:40:38 -07:00
bb275351f0
Merge pull request #12363 from super626/v3
...
Fix terrain lod computing bugs
2015-06-17 17:49:39 +08:00
6f6c317f87
Merge pull request #12386 from WenhaiLin/v3-label-spacefix
...
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 15:16:49 +08:00
cbd428f6ac
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 13:57:23 +08:00
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
13e0fb22f5
fix compile on linux platform.
2015-06-17 11:34:19 +08:00
c08a355a06
fix the bug of light
...
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
eb2bc78970
Merge branch 'v3' into v3-winrt-librecast
2015-06-16 07:13:53 -07:00
3b56d2a66f
fix cmake for cmake platforms
2015-06-16 16:15:19 +08:00
0866180918
Merge pull request #12162 from namezero111111/patch-4
...
JumpTo::clone() results in incorrect end position
2015-06-16 13:37:04 +08:00
aeeed0f4ab
Merge remote-tracking branch 'origin' into fix_spritepolygon
...
# Conflicts:
# external/config.json
2015-06-16 11:19:20 +08:00
8d8e7d6cb9
Merge branch 'v3' into v3-winrt-librecast
2015-06-15 19:27:40 -07:00
0b5c7d74b7
Merge pull request #12160 from namezero111111/patch-3
...
Blink::stop() access violation
2015-06-16 10:27:38 +08:00
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
03fc2eca5e
added missing navmesh files
2015-06-15 18:19:28 -07:00
9262cc95bf
fixed project filters broken by recent additions of files
2015-06-15 11:38:52 -07:00
c17da7e90d
Removes not-needed draws
2015-06-15 10:40:47 -07:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
16a0ddc74e
rename CCNavMeshTool to CCNavMeshUtils
2015-06-15 12:52:55 +08:00
32aae46343
fixes
2015-06-12 15:37:29 -07:00
2a3347dd49
RenderState: default state fixes
...
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
9806c09b0e
Merge pull request #12299 from WenhaiLin/v3-label-cropped
...
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
c01d1fe00a
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
...
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
29c108bdef
Merge remote-tracking branch 'origin' into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
9f5a36b817
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 11:03:32 +08:00
b1b9c808eb
Merge pull request #12074 from samuele3hu/v3_material
...
Issue #10570 : Make getItemForTouch of Menu virtual.
2015-06-12 08:21:18 +08:00
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
17b1dee363
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon
2015-06-11 14:39:35 +08:00
zhangcheng