zhangbin
36892c3a98
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880
2014-03-25 16:21:41 +08:00
zhangbin
d6ad9274c4
closed #2880 , Generate mipmap for the texture has mipmaps when reload textures.
2014-03-25 16:19:34 +08:00
Dhilan007
674dffce21
Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs
2014-03-25 16:10:47 +08:00
James Chen
34245d4bd0
Merge pull request #5953 from dumganhar/merge5934
...
closed #4541 : [ui] Removed Widget::addNode, added ProtectedNode.
2014-03-25 15:46:56 +08:00
minggo
3fc15e5e7d
Merge pull request #5896 from splhack/remove_nativeactivity
...
Remove NativeActivity
2014-03-25 15:37:12 +08:00
minggo
cab21adf4a
Merge pull request #5919 from boyu0/bug4499_ParticleSystem_endRadiusVar_bug
...
closed #4499 : Read ParticleSystem::modeB.endRadiusVar from "minRadiusVariance...
2014-03-25 15:34:36 +08:00
James Chen
45b98e7dc0
issue #4541 : s_globalOrderOfArrival is an static variable of Node class.
2014-03-25 15:07:11 +08:00
LinWenhai
19341ceaf4
add getter of ClipMarginEnabled.
2014-03-25 14:54:42 +08:00
CaiWenzhi
2dffcb9808
Add ProtectedNode and remove "addNode"
2014-03-25 14:28:58 +08:00
James Chen
093b792221
Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected
...
closed #3804 : Change private functions and variables in Image class to protected, since its subclasses may need them.
2014-03-25 14:07:58 +08:00
James Chen
32f647d38b
Merge pull request #5940 from boyu0/iss4513_particle_readd_bug
...
closed #4513 : Particle doesn't animate when it was removed and re-added to another node.
2014-03-25 14:05:12 +08:00
James Chen
8d28884c9f
Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel
...
issue #3821 : Uses new label instead of LabelTTF in engine.
2014-03-25 13:46:17 +08:00
James Chen
5625c98443
Merge pull request #5942 from Dhilan007/develop_label2
...
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
2014-03-25 11:39:53 +08:00
boyu0
db0fe60974
closed #3804 : Change Image private function and variable to protected, for the subclasses can use them.
2014-03-25 11:13:44 +08:00
Kazuki Sakamoto
3fba61f384
Remove NativeActivity
2014-03-24 19:57:29 -07:00
Dhilan007
8278a510aa
Label:fixed shadow offset didn't consider 'contentScaleFactor'
2014-03-25 10:41:53 +08:00
Dhilan007
859fe98502
label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor'
2014-03-25 09:58:16 +08:00
Dale Stammen
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
pandamicro
45d4397d20
Issue #3897 : Make Constructors public in Cocos2d-JS
2014-03-24 22:05:19 +08:00
boyu0
759ec61639
closed #4513 : Particle doesn't animate when readd it.
2014-03-24 18:08:55 +08:00
pandamicro
bdfcc6c8cc
Issue #3897 : Add missed constructors
2014-03-24 17:44:01 +08:00
James Chen
6defa062a8
closed #4530 : Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7.
2014-03-24 16:58:31 +08:00
James Chen
db7057e6f2
closed #4529 : Stroke size and shadow offset don't consider ContentScaleFactor
2014-03-24 16:58:31 +08:00
James Chen
892662c5ef
Merge pull request #5932 from pandamicro/ComponentScriptSupport
...
Component script support
2014-03-24 14:41:16 +08:00
pandamicro
6a8dfc4664
Fixed #4512 : JSB script support added to Component
2014-03-24 14:24:27 +08:00
Dhilan007
538c01e76e
label:support clip blank of upper and lower margin.
2014-03-24 14:16:27 +08:00
andyque
4a974e24df
revert vcxproj files
2014-03-24 10:50:48 +08:00
andyque
f5795c25b6
remove warnings under win32
2014-03-24 10:12:40 +08:00
Dale Stammen
aa0dae4d1f
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:10:07 -07:00
Dale Stammen
6ee7f5d325
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:09:48 -07:00
Dale Stammen
bfaa5882fe
fix for RELATIVE reserved word in wp8 compiler
2014-03-22 06:09:16 -07:00
Dale Stammen
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07:00
Dale Stammen
b50a158b62
need to terminate variable args list with NULL. nullptr will not work with wp8 compiler
2014-03-22 06:04:36 -07:00
Dale Stammen
2577fc39d8
#pragma mark for ios and mac only
2014-03-22 05:58:37 -07:00
Dale Stammen
fb574697aa
added support for precompiled shaders in wp8
2014-03-22 05:58:07 -07:00
Dale Stammen
5e402ee433
fix for generic already defined in wp8
2014-03-22 05:56:49 -07:00
Dale Stammen
294341d0ab
fixed texture memory leak and added comments to indicate problem
2014-03-22 05:56:08 -07:00
Dale Stammen
65400bf87b
added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added
2014-03-22 05:55:08 -07:00
Dale Stammen
f6b57df505
added WP8 and WINRT platforms
2014-03-22 05:53:09 -07:00
Dale Stammen
77ab59ebab
#pragma mark for ios and mac only
2014-03-22 05:52:45 -07:00
Dale Stammen
409ad77b6c
disabled webp for wp8 and winrt
2014-03-22 05:51:39 -07:00
Dale Stammen
e3e4e88bce
added WP8 and WINRT platforms
2014-03-22 05:50:55 -07:00
James Chen
da0c15c982
Merge pull request #5847 from newnon/develop_small_improvements
...
Adds getCurrentLanguageCode() which returns iso 639-1 language code
2014-03-21 16:33:43 +08:00
boyu0
5edb9b9f86
closed #4499 : Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist.
2014-03-21 16:25:22 +08:00
James Chen
c30f466d56
Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background
...
closed #3509 : PhysicsBody moves randomly when switch foreground/background
2014-03-21 15:25:52 +08:00
boyu0
bc13956981
closed #3509 : PhysicsBody moves randomly when switch foreground/background.
2014-03-21 15:16:55 +08:00
James Chen
cecc00c650
Merge pull request #5893 from Dhilan007/develop_label
...
closed #4489 : Label: Refactoring relevant functions of setting text color.
2014-03-21 14:52:55 +08:00
Dhilan007
1a08cd9b32
fix typo.
2014-03-21 13:52:12 +08:00
James Chen
f51c39c034
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
...
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
Dhilan007
6b74794c74
fix typo and mistake in Label::setTextColor.
2014-03-21 09:47:29 +08:00
Dhilan007
9dfa099bef
Label:Refactoring related functions of color.
2014-03-20 20:56:10 +08:00
andyque
f26ae8a019
remove unused params warnings
2014-03-20 16:34:42 +08:00
andyque
7ab639ec0f
fix lots compile warnings
2014-03-20 16:24:55 +08:00
andyque
8c1bf48357
fixed label font size: from int to float
2014-03-20 15:03:48 +08:00
andyque
2dcc600fa1
remove unused accelerometer
2014-03-20 14:29:05 +08:00
andyque
8a409db1b6
change setFontSize from int to float
2014-03-20 14:14:02 +08:00
andyque
957eb9363e
fix win32 compile error
2014-03-20 13:42:09 +08:00
andyque
ca6851f114
fix warnings of font and RichText
2014-03-20 11:58:36 +08:00
andyque
6c16f16b1d
fix CCDirectorCaller warnings
2014-03-20 11:32:43 +08:00
andyque
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
Sergey
13df593ae7
file attributes fixed
2014-03-19 18:58:19 +04:00
James Chen
bed76d4460
Merge pull request #5870 from dabingnn/fix_scale0Bug
...
closed #4382 : added missed scaleZ feature in ScaleTo and ScaleBy.
2014-03-19 18:28:12 +08:00
James Chen
db4dd81030
Merge pull request #5871 from dumganhar/iss4450-missing-slash
...
closed #4450 : FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
2014-03-19 17:57:40 +08:00
James Chen
a84873a67b
closed #4450 : FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
2014-03-19 17:56:29 +08:00
James Chen
740aa30713
closed #4447 : [Desktop] Can't receive touchEnded event when mouse up outside of window
2014-03-19 17:09:10 +08:00
andyque
c90ef00668
add bool support for other platform
2014-03-19 16:47:57 +08:00
andyque
cadbfbe9b1
add Bool Integer Float Double support to CCDictionary
2014-03-19 16:47:57 +08:00
andyque
00249328a6
add boolean support for mac and ios
2014-03-19 16:47:57 +08:00
Huabing.Xu
dc9baa7c72
closed #4382 : added missed scaleZ feature for scaleZ
2014-03-19 16:23:14 +08:00
James Chen
7061641dd8
Merge pull request #5860 from Dhilan007/develop_label
...
closed #4434 : Label's color is incorrect if it's created by font name
2014-03-19 14:09:32 +08:00
Dhilan007
bb17da8f88
add override for Label::updateDisplayedColor
2014-03-19 10:36:44 +08:00
Dhilan007
f76460aee8
closed issue#4434:fixed display incorrect color of label if create by font name.
2014-03-19 10:10:47 +08:00
James Chen
a5e9630db1
Merge pull request #5843 from Dhilan007/develop_label
...
closed #4428 : fixed display incorrect of multi-line label if invoking 'getLetter'.
2014-03-19 09:52:14 +08:00
Dhilan007
a286ed8374
fixed typo.
2014-03-18 13:48:41 +08:00
samuele3hu
76abe8d1c9
make FileUtilsWin32::getWritablePath() return value unified whether release or debug
2014-03-18 10:51:07 +08:00
Sergey
f65ef462e5
getCurrentLanguageCode() for all platforms return iso 639-1 language code
...
iPhone template improvements(for game center support)
2014-03-17 22:34:21 +04:00
Dhilan007
46a4c17097
change access specifier of SpriteBatchNode::addSpriteWithoutQuad.
2014-03-17 19:31:58 +08:00
Dhilan007
cc671835f8
closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line.
2014-03-17 18:33:15 +08:00
James Chen
2e13d45848
Merge pull request #5819 from Dhilan007/develop_menu
...
fixed content size of MenuItem is incorrect when font size or font name ...
2014-03-15 01:27:05 +08:00
Dhilan007
e20676f939
fixed content size of MenuItem is incorrect when font size or font name change.
2014-03-15 01:24:23 +08:00
James Chen
a47923e06d
Fix potential overflow in Texture::getCachedTextureInfo.
2014-03-15 01:09:22 +08:00
James Chen
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
James Chen
306df0537e
Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen.
2014-03-15 00:10:39 +08:00
Dhilan007
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
James Chen
9bc48a7ac1
PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm.
2014-03-14 18:40:04 +08:00
James Chen
a5775e9e6a
Merge pull request #5793 from koowolf/win32_crash
...
Crash while clicking close button on desktop platforms
2014-03-14 18:26:34 +08:00
James Chen
edde48e132
Merge pull request #5798 from Dhilan007/develop_label
...
closed #4377 : LabelAtlas::setColor takes no effect.
2014-03-14 18:07:36 +08:00
Dhilan007
c4d91f512d
LabelAtlas:fixed display incorrect color.
...
MenuItem:using Label to replace LabelTTF.
2014-03-14 17:36:05 +08:00
koowolf
ad5f870f7c
fix close crash in linux and mac
2014-03-14 17:21:27 +08:00
koowolf
90f5d6511e
fix win32 crash while click close button.
2014-03-14 16:13:32 +08:00
James Chen
8c7bc11931
Merge pull request #5790 from dumganhar/warning-fix-and-project-update
...
Warning fix and update VS project to fix compilation errors when building in Release mode
2014-03-14 15:48:55 +08:00
James Chen
177bf4df9d
Some warning fixes.
2014-03-14 15:38:43 +08:00
James Chen
a94b82e738
Updates VS project to fix compilation errors when building in Release mode.
2014-03-14 15:30:12 +08:00
Dhilan007
5f6fbc6a33
label:fixed getter for font size and font name.
2014-03-14 15:18:45 +08:00
Dhilan007
971b1dd557
Label:fixed text display incorrect when come to foreground on android.
2014-03-14 14:59:26 +08:00
Dhilan007
36bfd6d2c2
label:fixed incorrect effect of outline.
2014-03-14 09:51:39 +08:00
James Chen
8743b00d9f
Merge pull request #5768 from Dhilan007/develop_label2
...
Refactor setter of label's font name and font size.
2014-03-13 21:14:36 +08:00
Dhilan007
fe6f485a6b
label:rename some API for clearly.
2014-03-13 21:00:36 +08:00
Dhilan007
62d0fa8564
label:rename some API for clearly.
2014-03-13 20:52:33 +08:00
andyque
c4e20dd63a
fix ease action error
2014-03-13 19:53:06 +08:00
Dhilan007
bc68c6b629
Refactor setter of label's font name and font size.
2014-03-13 18:46:35 +08:00
heliclei
c26b103b23
remove node name related features from v3.0
2014-03-13 10:45:02 +08:00
James Chen
ac0aecb394
Merge pull request #5737 from dumganhar/runtime-fix
...
Lua Runtime fix
2014-03-12 21:48:35 +08:00
James Chen
77a8476c80
GLView::end needs to release self.
2014-03-12 21:45:57 +08:00
James Chen
ac4faeb8c4
Merge pull request #5730 from Dhilan007/develop_label
...
Label:Fixes the font rendering on Windows and possible crash when create the label by font name.
2014-03-12 21:25:38 +08:00
Dhilan007
3acaf3ece5
1.Label:Fixes the font rendering on Windows.
...
2.fixed Label::setColor crash when create the label by font name.
2014-03-12 20:39:13 +08:00
James Chen
f609d57a00
Merge pull request #5671 from heliclei/walk-node-tree
...
Add enumerateChildrenByName for walking through node tree with callback
2014-03-12 18:23:43 +08:00
heliclei
2a3cb0847e
refactor api name
2014-03-12 18:10:45 +08:00
James Chen
f01ca554aa
Merge pull request #5708 from Dhilan007/develop_label
...
fixed incorrect initial value of label's TextVAlignment.
2014-03-12 16:46:22 +08:00
Dhilan007
c11ef679da
fixed incorrect initial value of label's TextVAlignment.
2014-03-12 16:11:12 +08:00
James Chen
2ae283d506
Merge pull request #5702 from dumganhar/glview-inherit-order
...
Changes the order of inheritance for GLView. Reason:
2014-03-12 15:34:53 +08:00
James Chen
a974e5e42b
Merge pull request #5704 from Dhilan007/develop_label
...
label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
2014-03-12 15:33:30 +08:00
Dhilan007
f5daf1af24
label:change default font size
2014-03-12 15:30:14 +08:00
James Chen
ca27bc4d6f
Merge pull request #5703 from Dhilan007/develop_label
...
label:fixed crash and incorrect getter.
2014-03-12 15:23:06 +08:00
Dhilan007
2786b40dc3
using string::empty() for judge whether string is empty.
2014-03-12 15:03:22 +08:00
Dhilan007
233b04269b
label:
...
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
2014-03-12 14:49:19 +08:00
James Chen
42c724a59d
Changes the order of inheritance for GLView. Reason:
...
```
bool ok = true;
JSObject *obj = JS_THIS_OBJECT(cx, vp);
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL); // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
if (argc == 3) {
double arg0;
```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
2014-03-12 14:43:51 +08:00
heliclei
d57d2f3059
Merge remote-tracking branch 'upstream/develop' into walk-node-tree
2014-03-12 14:19:55 +08:00
heliclei
a907580d0a
use lambda callback
2014-03-12 14:15:45 +08:00
James Chen
4b4b706066
Merge pull request #5635 from andyque/fix_ease_action
...
fix wrong display of ease elastic action test.
2014-03-12 12:07:26 +08:00
James Chen
0bf58c8096
Merge pull request #5690 from Dhilan007/develop_labelttf
...
issue #3821 : LabelTTF was re-implemented as a wrapper of Label.
2014-03-12 11:18:40 +08:00
Dhilan007
6f165bb592
fixed incorrect initial value of label type.
2014-03-12 11:06:51 +08:00
Dhilan007
aefafdbe77
Add conditions to evaluate for setter of font size and font name.
2014-03-12 10:53:51 +08:00
Dhilan007
bc7e39283f
issue #3821:LabelTTF re-implemented as a wrapper of Label.
2014-03-12 10:19:33 +08:00
Dhilan007
d96cc9ecb9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-12 10:08:57 +08:00
minggo
b2e27947a3
Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement
...
Develop render texture improvement
2014-03-11 18:50:51 +08:00
Dhilan007
df12ca963e
issue #4337:label support create by font name,compatible with old labelTTF
...
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
2014-03-11 18:06:14 +08:00
Dhilan007
b72d009eac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-11 16:16:07 +08:00
heliclei
80417f0f35
correct naming convetion
2014-03-11 15:27:28 +08:00
Dhilan007
c2ef7b8796
fix incorrect implementation of Label::getContentSize
2014-03-11 15:03:16 +08:00
Dhilan007
792e182e12
typo fix and coding style improvements.
2014-03-11 14:32:07 +08:00
heliclei
8db680b9ee
add EnumChildNodesByName, walk node tree with callback
2014-03-11 13:58:43 +08:00
minggo
2aa5c7aadd
Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug
...
closed #4315 : fixed clippingNode alphaTest Bug
2014-03-10 21:45:47 +08:00
Dhilan007
11d3acd478
fixed inappropriate usage of inline.
2014-03-10 20:35:36 +08:00
Dhilan007
8bac35ae2a
closed #4337:label support create by font name,compatible with old labelTTF.
2014-03-10 19:42:43 +08:00
James Chen
63292b5ba6
Merge pull request #5544 from heliclei/node-string-tag
...
CCNode:Add String tag, to support runtime manipulation
2014-03-10 18:26:51 +08:00
heliclei
83c4d5b479
fix comments
2014-03-10 18:21:53 +08:00
Huabing.Xu
f0ae3fd4dc
Merge branch 'develop' into develop_RenderTextureImprovement
2014-03-10 18:11:55 +08:00
Huabing.Xu
e15d0a9d20
RenderTexture saveToFile will return true
2014-03-10 17:42:27 +08:00
Huabing.Xu
f8f2373c2a
closed #4315 : fixed clippingNode alphaTest Bug
2014-03-10 15:12:44 +08:00
James Chen
eca0bce1be
Merge pull request #5633 from huangml/patch-1
...
closed #4319 : Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
2014-03-10 10:55:54 +08:00
James Chen
2784955845
Merge pull request #5636 from dumganhar/iss3290-onenter-order
...
closed #3290 : The order of onEnter / onExit work correctly on JSB and LuaBindings.
2014-03-08 22:35:09 +08:00
James Chen
7aec578b35
closed #3290 : The order of onEnter works correctly on JSB and LuaBindings.
2014-03-08 22:07:55 +08:00
andyque
82fcf939d0
fix ease elastic action error
2014-03-08 21:51:17 +08:00
黄梦龙
8b737d8aab
Update CCNode.cpp
...
removeAllChildrenWithCleanup() not remove PhysicsBody
2014-03-08 17:42:35 +08:00
minggo
c291cb32a0
Merge pull request #5624 from Dhilan007/develop_label
...
label:fixed vertical alignment is incorrect.
2014-03-07 21:07:09 +08:00
James Chen
84a76db060
Merge pull request #5622 from pandamicro/MotionStreakFix
...
closed #4294 : Added unimplemented position getter/setter in MotionStreak.
2014-03-07 19:10:02 +08:00
pandamicro
2427314a65
Issue #4294 : MotionStreak: Improve position setters
2014-03-07 19:06:51 +08:00
Dhilan007
4905acfa0b
label:fixed vertical alignment is incorrect.
2014-03-07 18:31:33 +08:00
pandamicro
e94cd2357d
Issue #4294 : Add override declaration
2014-03-07 18:11:37 +08:00
Huabing.Xu
ad9c104cfd
migrate saveToFile compatible with new renderer
2014-03-07 17:41:51 +08:00
pandamicro
a005fa1dce
Issue #4294 : Add unimplemented position getter/setter in MotionStreak
2014-03-07 16:32:00 +08:00
minggo
07c0fac44f
Merge pull request #5620 from Dhilan007/develop_label
...
closed #4301:Label support vertical alignment and assign dimensions.
2014-03-07 16:12:21 +08:00
Dhilan007
ac944cd42b
fixed incorrect display when the size of label not enough to support display all text.
2014-03-07 15:58:49 +08:00
minggo
4251bcf425
Merge pull request #5469 from natural-law/issue3991
...
Add method to reload cached texture & update the nodes used the texture.
2014-03-07 15:58:17 +08:00
Dhilan007
c233b636cd
closed #4301:Label support vertical alignment and assign dimensions.
2014-03-07 14:58:44 +08:00
James Chen
9b0c0ab44e
Merge pull request #5616 from dumganhar/glview-refactor
...
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
2014-03-07 14:15:20 +08:00
James Chen
e0e9e1723c
Merge pull request #5612 from Dhilan007/develop_label
...
fixed #4300:fixed Label:draw location and BBOX is incorrect.
2014-03-07 14:09:39 +08:00
James Chen
1cfd14f27d
Tab -> 4 spaces, remove unused spaces for CCGLView.h
2014-03-07 14:03:57 +08:00
James Chen
ae2f7a4a7d
updateDesignResolution -> updateDesignResolutionSize.
2014-03-07 14:01:30 +08:00
James Chen
d699f62193
Tab -> 4 spaces, remove unused spaces.
2014-03-07 13:59:56 +08:00
James Chen
8b359dd90e
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
2014-03-07 13:51:12 +08:00
Dhilan007
f0119ef62f
fixed horizontal kerning is incorrect.
2014-03-07 12:03:45 +08:00
Dhilan007
063bde51c3
fixed #4300:fixed Label:draw location and BBOX is incorrect.
2014-03-07 11:42:13 +08:00
Huabing.Xu
5c1be5f2ef
Merge branch 'develop' into develop_fix_node_transform_bug
...
* develop:
Improved documentation
better doctrings
fixes for linux
small setup.py fixes
Update CHANGELOG [ci skip]
closed #4291:open CCEditBox as modal dialog
Fixes 'schedule test/issue#2268' crashes
closed #4150 : fix physics position/rotation tag bug.
2014-03-07 10:07:19 +08:00
Huabing.Xu
9fc6177570
fix bug for outdated transform status
2014-03-07 10:03:34 +08:00
Ricardo Quesada
57b6478de7
Improved documentation
2014-03-06 16:14:06 -08:00
Ricardo Quesada
77d19e9bc2
better doctrings
...
improved documentation for Node
2014-03-06 14:04:19 -08:00
zhangbin
56a46892fe
closed #3991 , Remove the method CCTextureCache::updateTexture().
2014-03-06 17:38:18 +08:00
zhangbin
822ef8d588
Merge branch 'develop' into issue3991
2014-03-06 17:28:20 +08:00
zhangbin
fec04dd6ae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-06 11:03:49 +08:00
James Chen
87b657b5bb
Merge pull request #5575 from dumganhar/iss4286-event-crash
...
closed #4286 : 'EventDispatcherTest/Issue 4129' crashes on Windows.
2014-03-06 11:03:34 +08:00
Ricardo Quesada
273d0d22f1
little performance improvement in quad command
2014-03-05 18:50:09 -08:00
James Chen
183622c718
'EventDispatcherTest/Issue 4129' crashes on Windows.
2014-03-06 10:45:29 +08:00
heliclei
73a3011b11
fix comments
2014-03-06 10:31:29 +08:00
heliclei
08d0cde490
Merge remote-tracking branch 'upstream/develop' into node-string-tag
2014-03-06 10:02:50 +08:00
zhangbin
6da0afdd03
Solve the crash in CocoStudioComponentsTest.
2014-03-06 09:23:27 +08:00
Ricardo Quesada
a0ab8fcdf3
onDraw() updated
...
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.
`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
2014-03-05 15:49:08 -08:00
Ricardo Quesada
0cb759cab8
Better names for tests
2014-03-05 11:50:12 -08:00
minggo
b7df75745e
Merge pull request #5562 from Dhilan007/develop_label
...
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
2014-03-05 17:28:37 +08:00
heliclei
55080d713b
refactor string tag to name
2014-03-05 17:03:25 +08:00
Dhilan007
dfdf19daff
remove unused shader and also did adjust FontAtlas::getTexture
2014-03-05 16:51:16 +08:00
Dhilan007
23501b40aa
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
2014-03-05 15:54:40 +08:00
James Chen
20146c3ecb
Merge pull request #5558 from Dhilan007/develop_label
...
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 15:24:36 +08:00
James Chen
9652da06f8
Merge pull request #5554 from koowolf/#5550_win
...
closed #4278 : Upgrading kazmath to the latest version.
2014-03-05 14:58:24 +08:00
James Chen
ec70d067d7
Merge pull request #5556 from boyu0/v3.0_final_test
...
Fix particle test->AddAndRemove test crash.
2014-03-05 14:53:05 +08:00
Dhilan007
c3c3e12ee6
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 14:41:59 +08:00
boyu0
06faad7020
Fix partical test->add and remove particle system crash.
2014-03-05 14:32:22 +08:00
koowolf
3365280a0a
build kazmath on win32
2014-03-05 14:30:55 +08:00
James Chen
02572da9dc
Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
2014-03-05 11:28:21 +08:00
samuele3
3edeba5001
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix
2014-03-05 09:52:37 +08:00
samuele3
53851151d9
fix:TimerScriptHandler can’t do anything in the `cancel` function
2014-03-05 09:51:57 +08:00
Ricardo Quesada
c63f210e26
Compiles on Android
2014-03-04 16:59:39 -08:00
Ricardo Quesada
4fe3b16287
Updates to latest version of kazmath
2014-03-04 16:33:00 -08:00
Ricardo Quesada
7ac663e02c
GL Program API fixes
2014-03-04 13:51:43 -08:00
heliclei
cbec0f9a15
CCNode:Add String tag, to support runtime manipulation
2014-03-05 00:15:01 +08:00
James Chen
bb86a9e350
Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug
...
closed #4272 : Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler
2014-03-04 22:08:55 +08:00
minggo
6cb665b637
Merge pull request #5534 from dabingnn/develop_RenderTextureImprovement
...
Develop render texture improvement
2014-03-04 18:30:37 +08:00
Huabing.Xu
3d0cd62e12
add comment to make interface clearer
2014-03-04 17:34:48 +08:00
James Chen
98e1099370
Fixes crash of PerformanceTest/EventDispatcherTest.
2014-03-04 16:43:04 +08:00
Huabing.Xu
99d0ce160a
rename setVirtualViewPort->setVirtualViewport
2014-03-04 15:41:36 +08:00
Huabing.Xu
ec397611f6
remove blank line,adjust indent
2014-03-04 15:30:05 +08:00
Huabing.Xu
756024e9f1
implement interface setKeepMatrix, setVirtualViewPort
2014-03-04 15:07:28 +08:00
James Chen
387174d633
issue #4234 : Acceleration -> const Acceleration&
2014-03-04 13:42:36 +08:00
James Chen
5c70548742
issue #4234 : 'Event* event' needs to be in 'TouchScriptData' struct.
2014-03-04 13:42:06 +08:00
Huabing.Xu
68130fb4d0
fix matrix push/pop bug
2014-03-04 11:06:39 +08:00
Huabing.Xu
a759d9ae60
calculate viewport based on _fullRect _rtRect and _fullRectViewport
2014-03-04 10:57:57 +08:00
Huabing.Xu
7949cb2cd9
add interface for keep Matrix
2014-03-04 10:41:03 +08:00
Ricardo Quesada
8bdfce9bbe
Merge branch 'develop' into visit_draw_improved
2014-03-03 17:31:29 -08:00
Ricardo Quesada
81f5254e15
Removes setNormalizedPosition
...
This funciton is useful, but the code is buggy.
In should check the parents' position instead of Director::Size()
Let's do it correctly, and then re-add this function
2014-03-03 16:08:30 -08:00
Ricardo Quesada
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
bmanGH
d0f8dbd4be
Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
2014-03-03 19:12:59 +08:00
minggo
594342ea3e
Merge pull request #5505 from dumganhar/event-dispatcher-refactor
...
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-03 17:56:57 +08:00
minggo
be0ac5dc1c
Merge pull request #5493 from boyu0/bug4150_physics_position_rotation
...
closed #4150 : fix physics position and rotation bug.
2014-03-03 14:57:33 +08:00
James Chen
1d2d2df1e9
issue #4165 : Adds missing deprecated methods in Scheduler class.
2014-03-03 11:57:36 +08:00
James Chen
1aa9e35fb2
Merge pull request #5500 from dumganhar/scheduler-refactor
...
closed #4165 : Refactors Scheduler class.
2014-03-03 11:20:06 +08:00
James Chen
04663b4a9c
closed #4165 : Updates comments.
2014-03-03 11:12:04 +08:00
James Chen
09c0bae4a1
closed #4165 : Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget.
2014-03-03 11:07:48 +08:00
James Chen
757425c54b
issue #4165 : Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.
2014-03-03 11:00:30 +08:00
boyu0
c99b0a0b6a
closed #4150 : Fix missing "!"
2014-03-03 01:48:56 +08:00
James Chen
dceb047ba6
TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback.
2014-03-02 18:43:17 +08:00
James Chen
f3949e078b
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-02 17:41:18 +08:00
James Chen
30d7130eb0
closed #4160 : Out of range exception in EventDispatcher
2014-03-02 16:16:03 +08:00
Ricardo Quesada
cdc19eea1c
Nodes: setAdditionalTransform() receives a pointer
...
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
2014-03-01 08:26:54 -08:00
Ricardo Quesada
219ef6d897
removes CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP support
...
It was never used. And it is slower.
2014-02-28 22:09:18 -08:00
James Chen
e6d2c4ec73
Refactors Scheduler class.
...
* Timer is an abstract class now.
* Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer.
* Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target.
* `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`.
* The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit)
* Adds relevant test cases.
2014-03-01 14:09:09 +08:00
Ricardo Quesada
b50a787f6d
Adds new ParticleTest for auto-batching
2014-02-28 22:03:36 -08:00
Ricardo Quesada
3588041409
removed empty spaces
2014-02-28 16:39:04 -08:00
Ricardo Quesada
9d501479c1
removes unused ivar from ParticleSystemQuad
2014-02-28 16:19:27 -08:00
Ricardo Quesada
da8e571862
shaders set in the correct position
2014-02-28 16:14:55 -08:00
Ricardo Quesada
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
Ricardo Quesada
13b60c8759
Applies Wu Hao's patch for 2.5D
2014-02-28 13:48:00 -08:00
Ricardo Quesada
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
Ricardo Quesada
ff79c0d9ad
Merge branch 'develop' into visit_draw_improved
2014-02-28 10:59:07 -08:00
James Chen
225b5e0e4f
Merge pull request #5492 from dumganhar/iss4129-remove-all-listener
...
closed #4129 : Event listeners used in engine shouldn't be removed by method removeAllEventListeners().
2014-02-28 16:09:54 +08:00
James Chen
d33017f27a
issue #4129 : Adds default argument(nullptr) for dispatchCustomEvent.
2014-02-28 15:40:45 +08:00
boyu0
a934d29c57
issue #4150 : Correct body position with the node has a parent. Add set/getPosition/Rotation method.
2014-02-28 15:31:25 +08:00
James Chen
7774bb4c6c
closed #4129 : Event listeners in engine shouldn't be removed by method removeAllEventListeners().
2014-02-28 15:09:53 +08:00
James Chen
bbc1c385c2
issue #4129 : EventTouch::getTouches return const reference.
2014-02-28 15:08:18 +08:00
Ricardo Quesada
eb66ddd931
visit and draw improved.
...
`visit()` and `draw()` are improved.
they both receive:
- `Renderer`
- `kmMat4` for transformation
- `bool` whether or not the transform changed from the previous frame
Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).
Those parameters are needed for:
- `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
- we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
- whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.
We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
James Chen
658cf72d31
issue #4129 : Uses 'const reference' when getting touches by EventTouch::getTouches.
2014-02-28 13:43:28 +08:00
James Chen
8a04fbabf1
issue #4129 : EventDispatcher::_listeners -> _listenerMap.
2014-02-28 12:01:47 +08:00
zhangbin
ddf5957a9c
closed #3684 , Set shader program before TextureAtlas is rendered.
2014-02-28 11:43:41 +08:00
James Chen
4277509966
Merge pull request #5463 from andyque/refactor3877
...
closed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:49:38 +08:00
James Chen
a96f44f31d
Adds override for override functions (onEnter, onExit) in cpp-tests.
2014-02-27 21:10:03 +08:00
andyque
32d3bf03bd
fixed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:00:25 +08:00
boyu0
8c536589df
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve
2014-02-27 20:04:04 +08:00
minggo
8d47d5f16a
return immediately when no changing
2014-02-27 15:12:57 +08:00
boyu0
b63641c7a5
issue #4118 : delete physicsSetPosition/Rotation method and add physics position/rotation tag.
2014-02-27 14:36:09 +08:00
boyu0
f400c1ac68
issue #4118 : edit contact test and fix node setPhysicsBody bug
2014-02-27 13:35:37 +08:00
boyu0
75ec508f0a
issue #4118 : improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.
2014-02-27 09:45:35 +08:00
Huabing.Xu
cd7b075900
closed #3874 : fix bug, blendID should be shifted by 50 bits
2014-02-27 09:27:33 +08:00
boyu0
4df1e104f3
issue #4118 : improve performance.
2014-02-26 19:56:52 +08:00
Huabing.Xu
c7315a2e3e
closed #3874 : expand textureID bit to 32bits
2014-02-26 15:01:45 +08:00
zhangbin
24ba47a43a
closed #3991 , Add method to reload cached texture & update the nodes used the texture.
2014-02-26 11:44:54 +08:00
James Chen
5e315273f9
Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody
...
closed #4144 : fix bug: Can not use Node::setPhysicsBody to reset a physics body.
2014-02-26 11:43:19 +08:00
James Chen
2b2979551e
Merge pull request #5460 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : Physical performance improve.
2014-02-26 11:37:13 +08:00
boyu0
912dad7a71
closed #4144 : fix bug: Node::setPhysicsBody doesn't work at the second time.
2014-02-26 10:53:41 +08:00
James Chen
51808b59e9
More const reference love in EventDispatcher.
2014-02-25 14:31:24 +08:00
Ricardo Quesada
18c3a8dd02
little fixes for sprite
2014-02-24 15:18:07 -08:00
James Chen
21fe4f234b
Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix
...
closed #4039 : fix bug: tilemap <object> x, y, width and height value parse incorrect.
2014-02-24 22:23:05 +08:00
James Chen
dfde6938d2
Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW
...
closed #3818 : fix CC_SPRITE_DEBUG_DRAW feature
2014-02-24 21:51:24 +08:00
James Chen
b5b9c7f938
Merge pull request #5451 from Dhilan007/develop_movePDC
...
closed #4123:fixed thread deadlock if new functions are added in callback.
2014-02-24 21:43:37 +08:00
Dhilan007
387bd544bf
closed issue#4123:fixed thread deadlock if new functions are added in callback.
2014-02-24 21:08:05 +08:00
boyu0
d15009c510
issue #4039 : delete name "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 20:14:46 +08:00
James Chen
81e7cec98f
Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index
...
refactor tilemap xml format index count.
2014-02-24 20:09:11 +08:00
Huabing.Xu
f20d487ade
closed #3818 : fix CC_SPRITE_DEBUG_DRAW feature
2014-02-24 20:02:48 +08:00
James Chen
1b91234325
Merge pull request #5283 from seemk/director_cleanup_fix
...
closed #4099 : Fixed crashing when calling CCDirector's end() on win32.
2014-02-24 16:58:34 +08:00
boyu0
1082f3cad4
issue #4039 : change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 16:39:15 +08:00
boyu0
a4cc0edb4a
issue #4118 : refactor physics update
2014-02-24 16:17:42 +08:00
Dhilan007
b54607bfc9
only using std::max for window.
2014-02-24 11:54:58 +08:00
Dhilan007
d6cd2eb05f
fix compiling error cause by using 'fmaxf'.
2014-02-24 11:38:03 +08:00
Ricardo Quesada
f77b92f1d7
performance improvements in culling
2014-02-23 02:02:28 -08:00
Ricardo Quesada
04460750b8
culling working for both 2d and 3d projections
2014-02-23 01:09:52 -08:00
Ricardo Quesada
fe1160cd8c
changes in API to support 3D
2014-02-22 19:16:42 -08:00
Ricardo Quesada
f37c606c4e
removes unsued function
...
keeps the code cleaner
2014-02-22 17:55:03 -08:00
Ricardo Quesada
8ca746af17
Implements AABB culling for sprites
2014-02-22 17:47:56 -08:00
James Chen
e9c1335084
Merge pull request #5434 from Dhilan007/develop_label
...
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
2014-02-21 18:29:47 +08:00
Dhilan007
821c8a73bc
closed #3758:fixed character will not aligned on the the baseline when label using distance field.
2014-02-21 18:09:52 +08:00
James Chen
3885772e5f
Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7
...
closed #2920 : fix bug: voice recognition input crash on ios7
2014-02-21 13:46:31 +08:00
James Chen
ac59006ee5
Merge pull request #5431 from dumganhar/develop
...
closed #4107 : Director::setAnimationInterval could not work on Mac platform
2014-02-21 11:58:36 +08:00
James Chen
c5bf3950bc
closed #4107 : Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm).
2014-02-21 11:55:37 +08:00
James Chen
d92e995f8c
Merge pull request #5361 from Dhilan007/develop_label
...
issue #3821 : LabelBMFont re-implemented as a wrapper of Label.
2014-02-21 11:36:23 +08:00
Dhilan007
d0e640d966
remove CC prefix.
2014-02-21 09:59:43 +08:00
Dhilan007
54f48b23e6
LabelBMFont re-implemented as a wrapper of Label.
2014-02-20 22:33:52 +08:00
James Chen
68eaa746ea
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:58:20 +08:00
James Chen
0b6858bdde
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:01 +08:00
James Chen
95143da782
Merge pull request #4990 from daltomi/debug
...
closed #4102 : Uses 'cbegin/cend', 'const std::string' where it's reasonable.
2014-02-20 20:29:56 +08:00
James Chen
7970e37bf5
closed #4097 : Adds missing include.
2014-02-20 17:23:22 +08:00
James Chen
b1e44a7ed6
issue #4097 : Enables script bindings by default.
2014-02-20 17:02:20 +08:00
James Chen
a218369ecd
issue #4097 : fix linking error of missing functions.
2014-02-20 17:01:13 +08:00
boyu0
6f7dde3a99
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-20 16:51:21 +08:00
James Chen
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
James Chen
62e0deaf35
Merge pull request #5384 from wefiends/s3tc_nomipmaps
...
closed #4096 : s3tc compressed textures with no mipmaps fail to be loaded.
2014-02-20 15:58:13 +08:00
James Chen
0af0ce9032
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
...
Conflicts:
cocos/scripting/auto-generated
2014-02-20 15:13:40 +08:00
James Chen
4cf4e15ba6
issue #4058 : Adds CCStdC.h.
2014-02-20 15:12:35 +08:00
minggo
196ab2caff
Merge pull request #5401 from natural-law/issue3540
...
Solve the bug: Sometimes RenderTexture not drawn after a background/foreground
2014-02-20 14:46:26 +08:00
zhangbin
9b2c5f71af
closed #3540 , Solve the bug: Sometimes RenderTexture not drawn after a background/foreground.
2014-02-20 14:43:07 +08:00
James Chen
e3d14608df
issue #4058 : Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now.
2014-02-20 14:11:47 +08:00
Nick Barrios
d9cbc5625c
CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop).
2014-02-20 00:48:09 -05:00
James Chen
2c5f791e03
issue #4058 : Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect.
2014-02-20 11:57:04 +08:00
Nick Barrios
45d751caa7
CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps.
2014-02-19 22:13:12 -05:00
James Chen
9436173039
issue #4058 : typedef Ref Object; and deprecate it.
2014-02-20 10:58:37 +08:00
James Chen
0ea27d8543
issue #4058 : CCObject.cpp -> CCRef.cpp for all platform projects.
2014-02-20 10:56:25 +08:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
Dhilan007
fd528b389d
fix warning
2014-02-20 10:24:35 +08:00
Dhilan007
ddd02b463c
optimize label:
...
1.remove unnecessary API
2.reduces object-creation and function calls.
2014-02-19 20:26:14 +08:00
Dhilan007
f086f39319
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-02-19 17:00:26 +08:00
boyu0
810196d25b
closed #2920 : add a variable to save shared director.
2014-02-19 14:23:41 +08:00
boyu0
49cb2ce9d5
closed #2920 : fix compile error after merge.
2014-02-19 14:12:57 +08:00
boyu0
0b07d376f6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-19 13:42:02 +08:00
boyu0
8be6932863
refactor tilemap xml format index count.
2014-02-19 10:41:12 +08:00
boyu0
50cdc67191
issue #4039 : set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value.
2014-02-18 17:44:05 +08:00
Dhilan007
5361413383
replace [auto] with [const auto&] in FOR loop.
2014-02-18 16:41:01 +08:00
Dhilan007
2ad81b0edb
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
2014-02-18 14:30:51 +08:00
andyque
143f5975a6
fix cross-platform comiple error
...
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
2014-02-18 14:22:15 +08:00
andyque
6d392766a2
refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions
...
finish refactor all ease action with tween functions
2014-02-18 14:22:14 +08:00
andyque
bcfa32f4e9
remove unused std::function declare
2014-02-18 14:22:14 +08:00
andyque
68b1c9f2c1
change CCTweenFunction class to tweenfunc namespace
2014-02-18 14:22:13 +08:00
andyque
838c71b135
refactor EaseIn with CCTweenFunction
2014-02-18 14:22:13 +08:00
andyque
ab11147eeb
rename namespace of CCTweenFunction to cocos2d and fix some compile errors
2014-02-18 14:22:13 +08:00
andyque
f16b0022a3
move CCActionEaseEx content to CCActionEase
2014-02-18 14:22:13 +08:00
andyque
895b2a0055
move CCActionEaseEx and CCTweenFunction to core engine
2014-02-18 14:22:12 +08:00
James Chen
19205e3db8
Merge pull request #5365 from natural-law/issue3964
...
closed #3964 : Solve the bug of Image::saveImageToPNG().
2014-02-18 11:49:09 +08:00
James Chen
34f8f0a308
Uses `malloc` instead of `new[]`, keep malloc/free matching.
2014-02-18 11:14:02 +08:00
James Chen
b4121f47fc
[Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env.
2014-02-18 11:07:58 +08:00
zhangbin
650331769a
closed #3964 , Use GL methods instead in function RenderTexture::newImage()
2014-02-18 10:47:14 +08:00
James Chen
905443d17c
new[] free mismatching after PR #5326 .
2014-02-18 10:11:04 +08:00
James Chen
f67f324378
Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
...
Conflicts:
cocos/2d/platform/win32/CCImage.cpp
2014-02-17 22:10:45 +08:00
James Chen
01b9d9be56
Merge pull request #5369 from Dhilan007/develop_labttfMultiline
...
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 21:45:24 +08:00
James Chen
19b1945efb
closed #4054 : Removing child from TMXLayer may cause crash.
2014-02-17 21:15:26 +08:00
Dhilan007
4f94064242
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 14:35:49 +08:00
zhangbin
e02f488224
Merge branch 'develop' into issue3964
2014-02-16 11:01:07 +08:00
James Chen
1693ea0ef6
Typo fix in CCDevice.mm.
2014-02-14 09:41:06 +08:00
Dhilan007
0d5c702708
move labelttf's platform-dependent code from CCImage to CCDevice
2014-02-13 21:08:43 +08:00
James Chen
4837b2dd2d
issue #3990 : setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles.
2014-02-13 17:01:38 +08:00
zhangbin
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +08:00
James Chen
67630311f2
Adds 'ParticleSystemQuad::updateTexCoords' method.
2014-02-13 11:03:35 +08:00
James Chen
c0b8460aef
closed #3990 : ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
2014-02-13 11:03:34 +08:00
Ricardo Quesada
61e4ffbc3c
quick fix for positioning the FPS on non HD
2014-02-13 04:10:23 +08:00
Ricardo Quesada
200eb9713c
Merge branch 'develop' into droid_fonts
2014-02-12 20:23:40 +08:00
Ricardo Quesada
0a2d701e9f
Update verts and calls every frame
2014-02-12 08:41:32 +08:00
Ricardo Quesada
07764d03f9
Uses Droid Sans Console font for FPS and more
...
* Uses Droid Sans Console: Size 10
* Don't scale up font even if content scale factor is bigger (not needed for FPS)
* Adds better labels in FPS console
2014-02-12 06:58:34 +08:00
chuanweizhang2013
d5aee5eb04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
2014-02-11 18:08:14 +08:00
Ricardo Quesada
ff802ed753
Merge pull request #5279 from edba/develop
...
Added getPropertiesForGID that assings value instead of returning it.
2014-02-10 12:19:47 -08:00
chuanweizhang2013
e9dd3d828a
issue #3498 : commit jsruntime
2014-02-10 18:15:30 +08:00
Dhilan007
47e16728cc
reduce unnecessary calculation amount.
2014-02-10 12:38:32 +08:00
Dhilan007
6a662a6330
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-02-10 11:47:05 +08:00
Ricardo Quesada
68143d3093
re-add missing assert
2014-02-09 19:39:56 -08:00
Ricardo Quesada
907446d8d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
2014-02-09 19:32:35 -08:00
Ricardo Quesada
24f655f9b1
Better 'vertices drawn'
2014-02-09 19:31:45 -08:00
Dhilan007
e12c1f57ac
Label::reduce unnecessary calculation amount.
2014-02-10 11:21:54 +08:00
James Chen
3b57f897d9
Merge pull request #5310 from dumganhar/event-disp-typo
...
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
2014-02-10 11:19:45 +08:00
James Chen
9a02568eca
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
2014-02-10 11:15:56 +08:00
James Chen
eda4c9a420
Merge pull request #5302 from Pisces000221/improve-label-chinese
...
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
2014-02-10 11:03:03 +08:00
Dhilan007
a8387a12f0
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
2014-02-10 10:09:56 +08:00
Ricardo Quesada
560abe77c8
better Console support
...
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
2014-02-08 12:46:44 -08:00
Ricardo Quesada
13aa3ad2b5
Adds new commands to Console
...
* resolution
* projection
2014-02-08 12:35:11 -08:00
Pisces000221
c9e4944321
Fix one character disappears when breaking line
2014-02-08 15:18:18 +08:00
Pisces000221
da2a58ccc9
Improved formatting when using both CJK and ASCII
2014-02-08 15:05:36 +08:00
Pisces000221
7484286f25
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:59 +08:00
Pisces000221
b5e9a4a00a
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:10 +08:00
Ricardo Quesada
61c8bf23b6
optimized draw
2014-02-07 22:19:03 -08:00
Pisces000221
7aebdd89a5
Added ischinese_unicode function
2014-02-08 14:15:42 +08:00
Pisces000221
ae8057b933
Added ischinese_unicode function
2014-02-08 14:07:18 +08:00
Ricardo Quesada
82700339c0
Adds a way to print the renderer vertices
2014-02-07 19:37:44 -08:00
James Chen
bca9bba8c5
A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE.
2014-02-08 10:41:02 +08:00
Ricardo Quesada
78fdabe926
more cleanup in TMX code
2014-02-07 18:33:30 -08:00
Ricardo Quesada
616feadda1
More fixes and "tiles" is an uint32 (GID)
2014-02-07 18:11:17 -08:00
Ricardo Quesada
f2836e627b
Code is cleaner
2014-02-07 17:33:27 -08:00
Ricardo Quesada
e33baac396
iso almost working
2014-02-06 22:20:28 -08:00
boyu0
20ee1d2666
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
2014-02-07 11:37:01 +08:00
Ricardo Quesada
ad7b54eb0e
iso almost working 100% ok
2014-02-06 18:47:45 -08:00
Ricardo Quesada
cf08d0b3f9
isometric kind of working
2014-02-06 16:19:46 -08:00
Ricardo Quesada
02af5059bf
code cleanup
2014-02-05 22:43:06 -08:00
Ricardo Quesada
314d3955b6
working!!
2014-02-05 22:36:03 -08:00
Ricardo Quesada
d3aed1124a
what is happening here?
2014-02-05 20:09:04 -08:00
Ricardo Quesada
3560227d09
sort of working
2014-02-05 19:51:24 -08:00
Ricardo Quesada
9a53f5a9f5
Testing a new TMX renderer
...
faster
2014-02-04 17:59:21 -08:00
Maks
72ede55ac7
fix string size check and assert condition
...
1. std::string::size() return size_t (is never < 0)
2. "event must be larger than 0" and 'event' has unsigned int type
2014-02-03 22:12:03 +02:00
James Chen
3026e6d5ca
Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
2014-02-02 20:46:15 +08:00
Siim Kallas
881757a792
Fixed crashing when calling CCDirector's end().
2014-02-01 22:10:00 +02:00
edba
4da6b97786
Added getPropertiesForGID that assings value instead of returning it.
2014-01-31 14:57:26 -08:00
Ricardo Quesada
28a6626852
Updates Windows project
2014-01-30 21:30:51 -08:00
Ricardo Quesada
924951d3b5
glview uses rect instead of size
...
this is because it could be needed if you want to create a view
inside a window in an specific position
2014-01-30 20:16:40 -08:00
Ricardo Quesada
c9dc113fa2
Fixes compilation issues on Android and Linux
2014-01-30 17:28:12 -08:00
Ricardo Quesada
5691829b72
Linux with #ifdef
2014-01-30 17:10:18 -08:00
Ricardo Quesada
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
Ricardo Quesada
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
Ricardo Quesada
d19a1012a4
Adds the possibility to create EAGLView with an EAGLView
2014-01-30 15:11:37 -08:00
Ricardo Quesada
f1af117a1c
code follows c++ guidelines
2014-01-30 15:11:11 -08:00
Ricardo Quesada
43a4c1937f
Add `else` to `if`
2014-01-30 15:10:52 -08:00
Ricardo Quesada
4ed2e0d9d2
Merge branch 'develop' into glview_improvements
...
Conflicts:
CHANGELOG
cocos/2d/platform/linux/CCApplication.cpp
samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppMacros.h
samples/Cpp/HelloCpp/proj.ios/AppController.mm
samples/Cpp/HelloCpp/proj.mac/main.cpp
samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
samples/Cpp/SimpleGame/proj.ios/AppController.mm
samples/Cpp/SimpleGame/proj.mac/main.cpp
samples/Cpp/TestCpp/Classes/AppDelegate.h
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
samples/Javascript/CocosDragonJS/proj.mac/main.cpp
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
samples/Javascript/CrystalCraze/proj.ios/AppController.mm
samples/Javascript/CrystalCraze/proj.mac/main.cpp
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
samples/Javascript/MoonWarriors/proj.ios/AppController.mm
samples/Javascript/MoonWarriors/proj.mac/main.cpp
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
samples/Lua/HelloLua/Classes/AppDelegate.cpp
samples/Lua/HelloLua/proj.ios/AppController.mm
samples/Lua/HelloLua/proj.mac/main.cpp
2014-01-28 11:32:25 -08:00
James Chen
6a3e9d7c13
Merge pull request #5222 from martell/dutch3
...
closed #3879 : Added Dutch Language support for 3.x branch.
2014-01-28 00:30:53 -08:00
Ricardo Quesada
20346499ab
Continue with the refactoring
2014-01-27 19:16:09 -08:00
Ricardo Quesada
b96c4f1ad0
Only compile iOS files on iOS
2014-01-27 16:44:10 -08:00
Ricardo Quesada
67b62224b4
restore it to platform=10
2014-01-27 12:39:24 -08:00
Ricardo Quesada
3bb74c08ca
Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements
2014-01-27 10:53:12 -08:00
Ricardo Quesada
efaec7b7ec
Merge branch 'develop' into glview_improvements
...
Conflicts:
samples/Lua/HelloLua/Classes/AppDelegate.cpp
template/multi-platform-lua/Classes/AppDelegate.cpp
2014-01-27 10:52:35 -08:00
boyu0
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
James Chen
fa995c27fb
Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix
...
closed #3871 : event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
2014-01-27 00:35:04 -08:00
James Chen
8141397bbd
closed #3871 : event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
2014-01-27 16:30:20 +08:00
Dhilan007
35cf49c26d
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
2014-01-27 15:37:36 +08:00
James Chen
abc6488b75
Merge pull request #5254 from Dhilan007/develop_label
...
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
2014-01-26 21:59:22 -08:00
Dhilan007
cb9330dfd6
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
2014-01-27 13:53:57 +08:00
James Chen
6c69626a4f
closed #3867 : "Testing empty labels" in LabelTest crashes on Linux platform.
2014-01-27 10:31:24 +08:00
James Chen
2c4faeefe0
Merge pull request #5244 from dumganhar/memory-leak-new-label
...
closed #3862 : [New Label] Memory leak in FontFreeType::createFontAtlas()
2014-01-26 06:06:45 -08:00
James Chen
a1b02b24ae
Merge pull request #5245 from Dhilan007/develop_label
...
fix mistake of label's transparency.
2014-01-26 05:39:56 -08:00
James Chen
75dddf390b
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:33:22 +08:00
James Chen
f2981adf1f
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:32:21 +08:00
Dhilan007
710b614680
fix mistake of label's transparency.
2014-01-26 21:19:40 +08:00
James Chen
2ee58c913c
NewLabel memory leak fix.
2014-01-26 20:53:55 +08:00
James Chen
6a302735d8
Removes unused files.
2014-01-26 17:54:13 +08:00
minggo
b7d5d430a4
Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode
...
closed #3853 : Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
2014-01-25 20:37:31 -08:00
James Chen
5b9f1697d3
closed #3853 : Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
2014-01-26 11:16:25 +08:00
martell
609ee3db2b
Added Dutch for 3.x branch
2014-01-25 20:38:15 +00:00
Ricardo Quesada
8c62fcb7ba
Merge branch 'develop' into glview_improvements
2014-01-24 14:22:25 -08:00
Ricardo Quesada
ed299202b6
Android works again
2014-01-24 13:43:46 -08:00
James Chen
f95a862718
Merge pull request #5220 from dumganhar/develop
...
Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
2014-01-24 06:36:44 -08:00
James Chen
04d91f7e1d
Fix a mistake in Color4B(const Color3B& color).
2014-01-24 22:33:43 +08:00
James Chen
7a8f24a313
Merge pull request #5219 from dabingnn/develop_hotFix
...
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 06:20:53 -08:00
Huabing.Xu
52ca254ecf
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 18:39:26 +08:00
Dhilan007
6655ad79d7
use const ValueMap& for setters.
2014-01-24 16:05:38 +08:00
Dhilan007
43ef9051a3
close #3835:fix TMXMapInfo::startElement insert property to properties fail
2014-01-24 15:37:32 +08:00
Dhilan007
771ed300c4
close #3642:fix bounding box of new label is incorrect.
2014-01-24 14:04:08 +08:00
James Chen
2e75a86431
Merge pull request #5185 from hanjukim/develop
...
closed #3832 : color and opacity settings are invalid when alignText.
2014-01-23 19:56:45 -08:00
Ricardo Quesada
2b92ba75b4
more fixes for new GLView API
2014-01-23 16:04:11 -08:00
Ricardo Quesada
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
Hanju Kim
1a34a6ff84
remove unused header
...
remove CC Prefix
2014-01-23 18:55:51 +09:00
James Chen
41c63e2f4d
Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw
...
closed #3823 : Fullscreen support for desktop platforms (windows, linux, mac).
2014-01-23 01:41:41 -08:00
Hanju Kim
0d05db2326
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-23 18:40:07 +09:00
Hanju Kim
c042c5f3db
updateColor should be called after updating quads on alignText
2014-01-23 17:27:28 +09:00
minggo
636205147f
Merge pull request #5184 from minggo/update-version
...
update version
2014-01-23 00:26:35 -08:00
minggo
c1f503bed0
update version
2014-01-23 16:25:38 +08:00
James Chen
8a6e5c1904
issue #3823 : Updates desktop/CCEGLView.h/.cpp to support fullscreen. Use EGLView::initWithFullScreen() to initialize a window with full screen.
2014-01-23 15:56:12 +08:00
Hanju Kim
4773fd0937
Merge develop
2014-01-23 16:20:42 +09:00
Hanju Kim
39904e304d
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-01-23 15:57:25 +09:00
James Chen
49efe0acc2
Merge pull request #5177 from Dhilan007/develop_label
...
Label:Change the default parameters of TextHAlignment and let setString method do a single function
2014-01-22 21:50:22 -08:00
Dhilan007
bd97394ccc
1.Label:Change the default parameters
...
2.Label:let setString method do a single function
2014-01-23 13:42:27 +08:00
James Chen
aba15dfc2d
Merge pull request #5172 from dumganhar/use-unified-cceglview
...
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
2014-01-22 19:23:44 -08:00
James Chen
ce28972269
Updates cocos/2d/cocos2d.vcxproj.
2014-01-23 10:36:44 +08:00
James Chen
19062d716d
Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes.
2014-01-23 10:27:42 +08:00
James Chen
9b02f97217
Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'.
2014-01-23 09:58:12 +08:00
minggo
a1729fa1b4
Merge pull request #5159 from natural-law/develop
...
Add test case for issue 2572
2014-01-22 17:49:56 -08:00
Ricardo Quesada
c48415ef3c
Merge pull request #5163 from dabingnn/develop_improve_renderer
...
Develop improve renderer
2014-01-22 17:04:19 -08:00
Ricardo Quesada
dceb9cb1b9
compiles on Linux
2014-01-22 14:17:32 -08:00
Ricardo Quesada
6b8781241c
code is cleaner
2014-01-22 13:51:01 -08:00
Ricardo Quesada
7249d3ca76
Unified CCEAGLView on Linux and Mac
2014-01-22 13:05:37 -08:00
Ricardo Quesada
1b6dfcda40
Merge branch 'develop' into cceglview_in_desktop
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-01-22 11:21:16 -08:00
James Chen
45bbbca8c6
Merge pull request #5164 from Dhilan007/develop_label
...
close #3642:fix bounding box of new label is incorrect.
2014-01-22 06:23:39 -08:00
Huabing.Xu
159f44a5dc
issue #3812 : performance improvement, 1. add vector reserve 2. use C++11 range loop
2014-01-22 18:24:23 +08:00
Dhilan007
ec297a2c31
close #3642:fix bounding box of new label is incorrect.
2014-01-22 18:01:37 +08:00
Dhilan007
a2f5146731
close #3642:fix bounding box of the new label is a bit off.
2014-01-22 17:45:56 +08:00
James Chen
351814c0be
Merge pull request #5158 from Dhilan007/develop_label
...
Label:remove unused code and optimization performance.
2014-01-22 01:24:48 -08:00
Huabing.Xu
cc39ca4f16
issue #3812 : rename convertToWorldCoordiantes->convertToWorldCoordinates
2014-01-22 17:09:13 +08:00
minggo
9c6a65baba
Merge pull request #5156 from minggo/deprecate-function
...
deprecated some functions in Object
2014-01-22 00:51:50 -08:00
Huabing.Xu
7ea9a4f025
issue #3812 : remove member variable _lastCommand
2014-01-22 16:03:04 +08:00
Huabing.Xu
5bbd48a9bf
issue #3812 : remove member variable _firstCommand, remove comment codes
2014-01-22 15:52:00 +08:00
zhangbin
3c2ef04f2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 15:39:28 +08:00
zhangbin
3007f34240
issue #2572 , Add test case for issue 2572.
2014-01-22 15:38:59 +08:00
Huabing.Xu
5397618aab
Merge branch 'develop' into develop_refactor_culling
...
* develop: (127 commits)
issue #3677 : Wrong include fix.
issue #3677 : File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
issue #3677 : Updates Windows project to add PerformanceEventDispatcherTest.
issue #3677 : Updates Android.mk and CMakeLists.txt.
issue #3677 : Adds EventDispatcher performance test.
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG [ci skip]
Update CHANGELOG [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3713 : every autorelease will cause a release operation
do not mix github access token with jenkins job trigger token
issue #3781 , Update travis-scripts, llvm-installing parts no need now.
issue #3713 : use reference in loop
issue #3781 , Minor fix & update submodule.
closed #3808 : EditBox on Mac works again.
issue #3713:fix memory leak of autoreleas pool
closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context
global Z order uses floats
ActionsProgress test include fixes
Removed unused code and files.
...
Conflicts:
cocos/2d/renderer/CCRenderer.cpp
2014-01-22 15:37:25 +08:00
Dhilan007
4095ab36b6
update xcode project.
2014-01-22 15:22:46 +08:00
Huabing.Xu
cf6785ffcf
issue #3812 : using std::vector<QuadCommand*> to hold current batched command
2014-01-22 15:18:27 +08:00
Dhilan007
65c2e03721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-22 15:08:05 +08:00
Dhilan007
df21bbf7df
1.remove unused code
...
2.reduce calculation amount.
3.reduces expenses of function calls
2014-01-22 14:57:11 +08:00
minggo
4381685a9d
deprecated some functions in Object
2014-01-22 13:47:29 +08:00
Hanju Kim
64ab0c0e35
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontDefinition.cpp
2014-01-22 14:15:21 +09:00
James Chen
3aac0b32a2
Merge pull request #5142 from Dhilan007/develop_label
...
close #3805:fix wrap error and alignment error.
2014-01-21 19:35:45 -08:00
James Chen
0ab5ec742a
closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context
2014-01-22 10:16:34 +08:00
Ricardo Quesada
1113587f47
mac/CCEGLView moved to desktop/
2014-01-21 17:52:30 -08:00
Ricardo Quesada
94ea94a113
global Z order uses floats
2014-01-21 16:36:19 -08:00
Ricardo Quesada
b51b04f315
ActionsProgress test include fixes
2014-01-21 16:28:52 -08:00
Ricardo Quesada
06be466f29
Removed unused code and files.
...
Making the mac platform easier to mantain
2014-01-21 16:25:29 -08:00
Ricardo Quesada
98d23d30a6
First step in simplifying the mac platform
2014-01-21 15:44:01 -08:00
Ricardo Quesada
e402f35e7f
BatchCommand API fixes
...
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
2014-01-21 11:13:21 -08:00
Ricardo Quesada
7a8707cb08
Merge branch 'develop' into local_z_Order_fixes
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/CCNode.h
2014-01-21 10:10:50 -08:00
Ricardo Quesada
f1444a26a1
Improves documentation with local z order
2014-01-21 09:26:58 -08:00
minggo
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
Dhilan007
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +08:00
James Chen
b647659c9e
Merge pull request #5138 from natural-law/develop
...
closed #2572 , Amend the arithmetic of child's position in ParallaxNode::addChild().
2014-01-21 01:51:57 -08:00
James Chen
ccecaeb94f
Merge pull request #5125 from Dhilan007/develop_label
...
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-21 00:58:21 -08:00
zhangbin
6c0ccea547
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-21 16:33:53 +08:00
zhangbin
89c8e7e2fb
closed #2572 , The arithmetic of child's position in ParallaxNode::addChild() is wrong.
2014-01-21 16:25:35 +08:00
Hanju Kim
09579abac9
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-21 17:24:07 +09:00
minggo
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +08:00
Dhilan007
f22e4d474f
move some method to FontFreeType that only relating to FontFreeType from Font.
2014-01-21 10:36:32 +08:00
James Chen
0f9c3fa59c
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-21 10:23:05 +08:00
minggo
ee06a5908c
issue #3713:invoke static member function to destroy singleone object
2014-01-21 10:14:00 +08:00
James Chen
43b2217fcf
Include fix: CCFileUtils.h —> platform/CCFileUtils.h
2014-01-20 21:30:32 +08:00
James Chen
432534d857
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
2014-01-20 17:31:12 +08:00
minggo
3e5fbb2422
issue #3713 : remove Object::_autoReleaseCount
2014-01-20 17:08:22 +08:00
James Chen
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
Hanju Kim
a8f21761a7
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontAtlas.cpp
cocos/2d/CCFontDefinition.cpp
cocos/base/CCConsole.cpp
2014-01-20 16:03:16 +09:00
James Chen
0468a1234b
A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
2014-01-20 14:22:30 +08:00
Dhilan007
802fc092be
fix compiling error cause by miss include header file.
2014-01-20 11:43:13 +08:00
Dhilan007
7d44da43c4
fix compiling error cause by include a non-existent file.
2014-01-20 11:34:31 +08:00
Dhilan007
b8943da99e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-20 11:24:42 +08:00
James Chen
5018c9ba6c
Removes unused cast in CCTMXTiledMap.cpp.
2014-01-20 11:13:29 +08:00
Dhilan007
a0b86abcf4
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-20 10:32:12 +08:00
Ricardo Quesada
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
Ricardo Quesada
069a4fb170
Renderer: Don't sort z=0 Commands
...
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
2014-01-17 23:10:04 -08:00
Ricardo Quesada
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
James Chen
0a6316a2f3
Merge pull request #5105 from Dhilan007/develop_label
...
close #3678:fix incorrect spacing between characters
2014-01-16 23:18:44 -08:00
Ricardo Quesada
feec6a1e8a
Adds some Asserts in the renderer
...
Linux still has a bug, but I can't reproduce it all the time.
Hoping that these asserts will help me find it
2014-01-16 22:29:25 -08:00
Dhilan007
db4dc28c1a
close #3678:fix incorrect spacing between characters
2014-01-17 14:04:52 +08:00
Ricardo Quesada
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
Ricardo Quesada
a74a524eaa
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes
2014-01-16 21:36:22 -08:00
Ricardo Quesada
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
James Chen
31199183b2
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
2014-01-17 11:10:04 +08:00
James Chen
09f56f3a8b
Merge pull request #5047 from btspoony/develop
...
closed #3750 : Fix long string will be cut off by function “cc_utf8_to_utf16”.
2014-01-16 19:06:39 -08:00
James Chen
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
Dhilan007
f5afa09de1
remove unneeded empty line.
2014-01-17 09:46:59 +08:00
Ricardo Quesada
cb9761125b
Renderer: When not using VAOs, call...
...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -08:00
Ricardo Quesada
ce633b44ab
Adds GL::activeTexture()
...
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
2014-01-16 13:44:18 -08:00
Luis Parravicini
3210e12e1c
fixes #3734
2014-01-16 14:23:52 -03:00
Dhilan007
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
Dhilan007
671b008f3d
fix compiling error cause by sprintf_s.
2014-01-16 17:50:09 +08:00
Dhilan007
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
James Chen
21dc91bf78
Merge pull request #5082 from Dhilan007/develop_label
...
closed #3726:Fix crash when using unknown character.
2014-01-16 00:10:53 -08:00
Dhilan007
18bd978480
1.add label crash test
...
2.fix lose char when label have unknown character.
2014-01-16 14:37:07 +08:00
minggo
91b89fc647
Merge pull request #5083 from natural-law/android_bugs
...
Solve some bugs on android
2014-01-15 22:04:54 -08:00
James Chen
8dd999309b
Merge pull request #5070 from hbbalfred/develop
...
closed #3725 : Crash if file doesn't exist when using FileUtils::getStringFromFile
2014-01-15 20:01:15 -08:00
zhangbin
e7b584908e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
2014-01-16 11:58:49 +08:00
James Chen
ae0993bc06
Merge pull request #5072 from natural-law/develop
...
closed #3688 , LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 19:54:01 -08:00
Dhilan007
afe49b3a2b
1.Fix crash bug when using unknown character
...
2.Fix text align mistake
2014-01-16 11:47:06 +08:00
zhangbin
3c816c3c85
closed #3723 , Make sure the init method of Cocos2dxHelper only invoked once.
2014-01-16 11:26:23 +08:00
Ricardo Quesada
3b20ad5ab7
More renderer optimizations
2014-01-15 19:10:40 -08:00
Ricardo Quesada
f6ad3a9971
Merge pull request #5078 from ricardoquesada/sprite_fixes
...
Sprite: removed _hasChildren
2014-01-15 18:38:04 -08:00
James Chen
2e7516c582
Merge pull request #5041 from Dhilan007/develop_label
...
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
Ricardo Quesada
9b490a9124
Sprite: removed _hasChildren
...
_hasChildren has been replaced with !_children.empty()
2014-01-15 18:37:07 -08:00
hbb
5ef9eef0ae
use data.isNull() instead of !data.getBytes()
2014-01-16 10:09:04 +08:00
Dhilan007
a410c38e54
Update VS project file.
2014-01-16 09:55:13 +08:00
Ricardo Quesada
9388253606
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
...
BatchCommand is being used by SpriteBatchCommand and ParticlesBatchCommand
This improves performance in batches
2014-01-15 16:07:38 -08:00
Ricardo Quesada
65602a4574
Updates Xcode, Android and Linux project
...
with new BatchCommand
2014-01-15 16:06:47 -08:00
Ricardo Quesada
f8dc8f0b38
Renderer performance fixes
...
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
2014-01-15 14:35:26 -08:00
Dhilan007
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
zhangbin
04d8c7514c
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 16:35:08 +08:00
hbb
8fac676a82
add check data valid in getStringFromFile
...
so far no check would be crashed when getData faild.
maybe return an empty string is better.
2014-01-15 12:39:56 +08:00
Ricardo Quesada
f0537f17da
ooops
2014-01-14 18:55:14 -08:00
Ricardo Quesada
2efeb32352
Merge pull request #5063 from ricardoquesada/performance_test_fixes
...
Performance Test fixes
2014-01-14 17:24:49 -08:00
Ricardo Quesada
c267c479db
Performance Test fixes
...
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Nite Luo
a18788ff0a
Fix artifects when VBO is full
2014-01-14 16:45:40 -08:00
James Chen
cd1c408e6b
Merge pull request #5054 from dumganhar/iss3698-retina-mac
...
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-13 23:02:49 -08:00
James Chen
7e1fd18f76
FLT_MIN —> FTL_EPSILON.
2014-01-14 14:38:34 +08:00
Dhilan007
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
James Chen
83a42dc760
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-14 13:59:00 +08:00
Dhilan007
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08:00
Ricardo Quesada
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
Ricardo Quesada
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
BoydTang
565288f587
- fix long string will be cut off by function “cc_utf8_to_utf16” ( “cc_utf8_strlen” returns long )
2014-01-13 22:54:26 +08:00
Hanju Kim
567455dd38
convert tab to space
2014-01-13 21:28:42 +09:00
Hanju Kim
b45abf3f2d
Bug fixes for new label
2014-01-13 21:14:50 +09:00
Hanju Kim
4bbcd91bdf
Fix for compiling error for windows
2014-01-13 20:51:56 +09:00
Dhilan007
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
Dhilan007
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
Ricardo Quesada
f4a99d0627
Removes DirectorDelegate
2014-01-10 20:26:15 -08:00
Ricardo Quesada
9386866d56
cocos2d::log() moved to CCConsole
...
Unified console code since it is 90% similar to all platforms
2014-01-10 19:04:07 -08:00
Ricardo Quesada
c68ad76bfe
don't send "unknown command".
...
... if the command is an empty command
2014-01-10 18:11:35 -08:00
Ricardo Quesada
2316e4d55f
Debug messages are forward to the console
2014-01-10 17:58:54 -08:00
Ricardo Quesada
2a6b9fe08e
Console is a property of Director.
...
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
2014-01-10 17:11:14 -08:00
minggo
a013565420
Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange
...
fix layerColor bug for shader change
2014-01-10 06:26:49 -08:00
James Chen
0088399d94
Merge pull request #5016 from akof1314/develop
...
Support MinGW with CMake for TestCpp
2014-01-09 23:13:19 -08:00
WuHuan
16367b7594
solve conflicted with math.h isnan
2014-01-10 14:20:00 +08:00
Huabing.Xu
a1629a09e8
fix layerColor bug for shader change
2014-01-10 10:03:47 +08:00
Ricardo Quesada
1dc169b19f
Camera is working again
...
Projection is passed in the shader.
Since P is in the shader, QuadCommand uses `Vec3Transform` instead of `Vec3TransformCoord` since it is faster.
2014-01-09 14:26:22 -08:00
WuHuan
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
James Chen
2e4c76a5d7
closed #3644 : Keyboard pressed events are being repeatedly fired before keyboard is released.
2014-01-09 18:34:35 +08:00
James Chen
2133c0e566
Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode
...
Conflicts:
cocos/2d/CCDrawNode.h
2014-01-09 17:03:08 +08:00
James Chen
3bb1fae660
Merge pull request #5010 from boyu0/fix_texture2dtest_crash_bug
...
closed #3638 : Fix Image crashes when load tga file.
2014-01-09 00:40:09 -08:00
boyu0
e34ef0d38f
change initialization _data from 0 to nullptr.
2014-01-09 16:33:31 +08:00
boyu0
e063755596
fix Image crashes in mac when load tag file
2014-01-09 15:26:05 +08:00
walzer
1ad14340bf
issue #3627 , remove Hungarian Notation in LabelAtlas
2014-01-09 14:26:34 +08:00
walzer
8da4879560
issue #3627 , remove lua/js doxygen mark from LabelAtals constructor & destructor.
2014-01-09 14:21:43 +08:00
walzer
d15874fdf7
fixed #3627 , an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected.
2014-01-09 14:16:26 +08:00
walzer
2d8fcb2c00
issue #3627 , remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
2014-01-09 12:40:51 +08:00
Dhilan007
fe7d5cbdfb
update If Construct
2014-01-09 09:46:17 +08:00
Dhilan007
d18da42695
fix addImageAsync bad judgment of generate image for the first ImageFile.
2014-01-08 23:42:54 +08:00
WuHuan
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
WuHuan
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
WuHuan
668c4b83ef
Merge pull request #3 from cocos2d/develop
...
update
2014-01-08 00:44:40 -08:00
James Chen
eb8f621ab0
closed #3597 : Uses !xxx.empty() instead of xxx.size() > 0.
2014-01-08 10:47:27 +08:00
James Chen
685b80796b
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
2014-01-08 10:36:51 +08:00
Daniel T. Borelli
939e94d568
const correctness
2014-01-07 22:09:43 -03:00
Daniel T. Borelli
1d435a3e8e
const correctness: use cbegin/cend, const std::string
2014-01-07 18:02:31 -03:00
minggo
ac8a7b4ce1
Merge pull request #4983 from dabingnn/develop_layerColorBug
...
fix layerColor occlude sprite bug on android
2014-01-07 06:25:59 -08:00
Huabing.Xu
b1d9d5e55e
fix layerColor occlude sprite bug on android
2014-01-07 22:08:00 +08:00
minggo
feb4ac1cdb
Merge pull request #4959 from minggo/actionprogress-fade-tint
...
ActionProgress has fade and tint effect
2014-01-07 00:32:43 -08:00
minggo
1275d03c77
add override
2014-01-07 16:30:12 +08:00
minggo
6bb4f9822a
ActionProgress has fade and tint effect
2014-01-07 16:23:58 +08:00
James Chen
49ca35fc3d
Merge pull request #4956 from dumganhar/move-temp-obj
...
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
2014-01-06 23:58:42 -08:00
James Chen
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
Ricardo Quesada
aa2168f66f
RenderQuad with bigger size
...
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
2014-01-06 23:41:01 -08:00
Zhe Wang
9b6027d284
Merge pull request #4947 from walzer/develop
...
udpate copyrights for the new year 2014 and Chukong.
2014-01-06 19:50:18 -08:00
minggo
49d314363f
Merge pull request #4945 from dabingnn/develop_label_shaderBug
...
fix label fnt bug for wrong shader
2014-01-06 19:44:06 -08:00
Huabing.Xu
6c6da4cf77
fix label fnt bug for wrong shader
2014-01-07 11:39:55 +08:00
walzer
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
minggo
721181632b
Merge pull request #4930 from Dhilan007/develop_crash
...
fix error for load spriteFrames from plist in CCAnimationCache class.
2014-01-06 18:57:47 -08:00
Dhilan007
aec4045797
fix error for load spriteFrames from plist in CCAnimationCache class.
2014-01-06 20:23:45 +08:00
James Chen
75804ac8a2
Warning fix in ccUTF8.cpp/h
2014-01-06 20:04:09 +08:00
James Chen
dd0e157c74
Warning fix in CCTextFieldTTF.cpp.
2014-01-06 20:01:28 +08:00
minggo
9b44e80cf2
Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug
...
init shader on construction instead of draw in class CCSpriteBatchNode
2014-01-06 00:11:59 -08:00
minggo
e4bec7d1ef
Merge pull request #4902 from Dhilan007/develop_crash
...
fix TextInput not show IME on android.
2014-01-05 19:50:19 -08:00
Dhilan007
5b317196c8
fix TextInput not show IME on android.
2014-01-06 11:45:18 +08:00
Huabing.Xu
381be48c56
init shader on construction instead of draw in class CCSpriteBatchNode
2014-01-06 11:26:00 +08:00
James Chen
d74d21a6f0
Merge pull request #4884 from daltomi/debug
...
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
2014-01-05 19:08:37 -08:00
minggo
fcfa6744f4
make TMXLayer::getProperties() return reference
2014-01-05 18:20:29 +08:00
chengstory
4893c561db
Merge branch 'develop' into #3582
2014-01-05 12:43:41 +08:00
James Chen
03200374b0
Merge pull request #4887 from Dhilan007/develop_crash
...
fix crash related to not support the z length modifier for size_t on vs
2014-01-04 20:10:40 -08:00
Dhilan007
49d8b76b9e
fix crash related to not support the z length modifier for size_t on vs
2014-01-05 11:59:32 +08:00
chengstory
7efacc4890
issue #3582 void serialize(void *r) -> bool serialize(void *r)
2014-01-05 01:13:16 +08:00
James Chen
f94221a93b
compilation error fix. ssize_t -> int
2014-01-04 22:21:14 +08:00
James Chen
3c04d586b0
Wrong warning fixes correct in ccUTF8.cpp.
2014-01-04 21:54:05 +08:00
James Chen
42356e8597
Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes.
2014-01-04 21:53:03 +08:00
Daniel T. Borelli
08dad98592
map:erase() is safe for item.second == FontAtlas*
2014-01-04 07:22:50 -03:00
James Chen
6827538802
Adds override keyword for override functions.
2014-01-04 18:12:09 +08:00
WuHuan
e972c97dcf
support mingw
2014-01-04 14:40:22 +08:00
James Chen
43cdf1713b
Merge pull request #4864 from daltomi/test
...
fix bad name variable CCDirector
2014-01-03 21:44:42 -08:00
Daniel T. Borelli
d10992951b
fix bad name variable
2014-01-04 02:22:09 -03:00
Dhilan007
35246b0810
fix compiling error and miss file on vs.
2014-01-04 12:25:12 +08:00
James Chen
f55be38ad8
Merge pull request #4853 from Dhilan007/develop_crash
...
fix label not appear on the screen
2014-01-03 19:00:06 -08:00
Dhilan007
b14999a7a7
fix label not appear on the screen
2014-01-04 10:56:14 +08:00
James Chen
f3eb21e748
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
...
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-03 18:51:16 -08:00
James Chen
0082cf3e4d
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-04 10:28:09 +08:00
Ricardo Quesada
76960ab83a
Merge pull request #4851 from ricardoquesada/node_vertex_z_fix
...
Node vertex Z fix
2014-01-03 17:55:32 -08:00
Ricardo Quesada
5a0284c183
Node vertex Z fix
...
Node correctly sets the Z vertex in getNodeToParentTransform(),
and not in transform().
This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
2014-01-03 17:54:07 -08:00
James Chen
46153d8c34
More warning fixes.
2014-01-04 09:17:37 +08:00
Ricardo Quesada
a7b33e3ec3
Fixes NodeToWorld
...
Multiplication was in the incorrect order
2014-01-03 14:21:33 -08:00
Dawid Drozd
b7314cd655
Fix for missing field in particle file.
2014-01-03 21:27:08 +01:00
Dawid Drozd
43ce4fa546
Fixed mistake in documentation addImage doesn't support gif format
2014-01-03 21:22:05 +01:00
minggo
5ad3414921
Merge pull request #4834 from minggo/bug-fix
...
Put "initxx" functions into protected.
2014-01-03 03:27:55 -08:00
minggo
4fc7ad6e3d
Merge pull request #4791 from dabingnn/develop_clippingNodeMobile
...
fix bug clippingNodetest on mobile
2014-01-03 02:36:52 -08:00
minggo
1d04b42947
Put "initxx" functions into protected.
2014-01-03 18:15:56 +08:00
samuele3hu
2b19da00df
Update the lua test cases about the armature
2014-01-03 14:51:36 +08:00
James Chen
0fe73f3a5d
Merge pull request #4804 from minggo/android-config
...
don't build spine module when build 2d module
2014-01-02 06:53:15 -08:00
minggo
676e25d304
2d module don't denpend on spine
2014-01-02 20:17:11 +08:00
James Chen
602468e3f2
Merge pull request #4802 from dumganhar/develop
...
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 04:08:22 -08:00
James Chen
05b1be3aeb
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
2014-01-02 19:59:10 +08:00
minggo
ded3e753f3
use std::function for call back
2014-01-02 17:23:00 +08:00
Huabing.Xu
57b0426994
fix bug clippingNodetest on mobile
2014-01-02 16:19:23 +08:00
Dhilan007
ebf3faadc3
fix crash related to not support the z length modifier for size_t on vs
2013-12-31 16:32:16 +08:00
Huabing.Xu
b2934d32bc
Merge branch 'develop' into develop_RenderTextureBug
...
* develop: (32 commits)
fix align text error in label
Update the JS binding code & samples for latest cocos2d engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
Updates nativeactivity.cpp.
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
remove other non-functional jenkins scripts
[AUTO] : updating submodule reference to latest autogenerated bindings
move ghprb.py to tools/jenkins-scripts/
issue #2050 : commit resources
add github pull request builder for Jenkins
Adds an empty LuaEngine::parseConfig function.
[JSB] Adds trigger bindings for CocoStudio.
update cocos2d-x version string
update describe for support translucency on android
update describe for support translucency on android
update describe for support translucency on android
recover java activity on android.
remove draw increment
migrate ShaderTestSprite to new renderer
...
2013-12-31 14:58:11 +08:00
Dhilan007
b51efbd654
fix align text error in label
2013-12-31 14:13:26 +08:00
Huabing.Xu
bf1f5dd0e0
fix rendertexture bug
2013-12-31 11:48:51 +08:00
James Chen
8145bf903e
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
2013-12-31 11:02:01 +08:00
James Chen
973adc6b2f
Updates nativeactivity.cpp.
2013-12-31 10:55:59 +08:00
James Chen
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
James Chen
1d8ee016e5
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
...
closed #2050 : fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
Huabing.Xu
a14006bb8f
calculation matrix
2013-12-30 21:24:16 +08:00
James Chen
edb2ad0933
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
...
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
2013-12-30 21:06:57 +08:00
James Chen
1edf748dc3
[JSB] Adds trigger bindings for CocoStudio.
2013-12-30 20:57:46 +08:00
Huabing.Xu
c030553d8c
Fix missed popMatrix
2013-12-30 20:25:25 +08:00
minggo
3680995f0b
Merge pull request #4742 from minggo/develop
...
update cocos2d-x version string
2013-12-30 04:23:41 -08:00
minggo
046d6696bc
update cocos2d-x version string
2013-12-30 20:22:25 +08:00
boyu0
0984eafaef
closed #2050 : move autorelease to CLN
2013-12-30 15:32:04 +08:00
Huabing.Xu
1962dfa52d
migration transition page turn to new renderer
2013-12-30 14:43:18 +08:00
minggo
0e9b43248c
Merge pull request #4728 from dabingnn/develop_removeCommandPool
...
Develop remove command pool
2013-12-29 21:53:12 -08:00
boyu0
1f72fafd08
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
James Chen
d72a9d2c0d
Merge pull request #4727 from dumganhar/develop
...
Fix of wrong include symbol of CCVector.h
2013-12-29 19:55:58 -08:00
James Chen
c5c03a3b35
Fix of wrong include symbol of CCVector.h
2013-12-30 11:55:01 +08:00
boyu0
a76c59f644
closed #2050 : add tile map xml format test and fix tile property bug.
2013-12-30 11:33:41 +08:00
James Chen
200f07dc34
closed #3290 : [JSB] The order of onEnter and onExit is wrong. For develop branch.
2013-12-30 11:10:02 +08:00
James Chen
31e2b3d5c2
Merge pull request #4715 from SBKarr/develop
...
closed #3542 : AngelCode binary file format support for LabelBMFont.
2013-12-29 18:11:19 -08:00
Roman "SBKarr
93f6d9c4f5
Added test case for binary fnt file
...
Also, fixed nul-termination issue in file parsing
2013-12-28 23:00:07 +04:00
James Chen
b17117a1a1
More warning fixes.
2013-12-28 14:34:52 +08:00
Roman "SBKarr
b0e6b5a43f
AngelCode binary file format support for LabelBMFont
2013-12-27 22:32:07 +04:00
minggo
3760cddf49
Merge pull request #4705 from Dhilan007/failed_dispatch_receive
...
fix failed to receive dispatch signal on some android device
2013-12-27 04:33:30 -08:00
James Chen
9baa64f274
Merge pull request #4688 from walzer/develop
...
make CC_USE_PHYSICS can ACTUALLY be switch off
2013-12-27 04:04:48 -08:00
James Chen
bf881f3ac0
Merge pull request #4691 from samuele3hu/DispatcherBak1
...
Reconstruct the operation of handling lua script event
2013-12-27 03:58:08 -08:00
Dhilan007
b319cb58ac
fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m].
2013-12-27 18:05:48 +08:00
minggo
ec3b3ea012
Merge pull request #4696 from dumganhar/warning-fix
...
Some warning fixes on linux.
2013-12-27 01:56:47 -08:00
CaiWenzhi
385894548d
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
2013-12-27 17:19:29 +08:00
James Chen
a47a7075e4
Merge pull request #4699 from boyu0/iss3509_physics_switch_foreground_bug
...
closed #3509 : Sprites with PhysicsBody moves to wrong position when swit...
2013-12-27 00:28:43 -08:00
CaiWenzhi
e45c2a8601
Modify manager of some widgets' children
2013-12-27 16:01:03 +08:00
boyu0
1e8e15506d
closed #3509 : Sprites with PhysicsBody moves to wrong position when switch foreground/background.
2013-12-27 15:53:55 +08:00
walzer
ece68aafc2
add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0
2013-12-27 15:49:08 +08:00
James Chen
febc19ea8d
Some warning fixes on linux.
2013-12-26 23:06:16 -08:00
Dhilan007
861925e752
fix compiling error in vs project on win7.
2013-12-27 14:38:22 +08:00
Huabing.Xu
66e550e5a0
Merge branch 'develop' into develop_removeCommandPool
...
* develop: (33 commits)
fix black screen when back to foreground on android.
Fix set FPS broken.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CCString.cpp
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Renames: IntValueMap —> ValueMapIntKey
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
Modify reader
long --> ssize_t for TableView callback.
Generates execute file in cocos root_dir/bin folder for HelloCpp.
Add listview and pageview reader
[AUTO] : updating submodule reference to latest autogenerated bindings
Modify actionnode
[AUTO] : updating submodule reference to latest autogenerated bindings
optimize loop
fix LabelTestNew
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
Fix box2dView
...
2013-12-27 14:07:04 +08:00
Huabing.Xu
76d07fc76e
remove empty interface releaseToCommandPool
2013-12-27 14:02:17 +08:00
Huabing.Xu
268f2fcc21
adjust comment codes
2013-12-27 13:52:44 +08:00
Huabing.Xu
40af66a7bc
remove commandPool in renderCommand
2013-12-27 13:51:11 +08:00
minggo
ef6295f046
Merge pull request #4693 from Dhilan007/black_screen_android
...
fix black screen when back to foreground on android.
2013-12-26 21:46:18 -08:00
Dhilan007
f250d24766
fix black screen when back to foreground on android.
2013-12-27 11:56:56 +08:00
James Chen
0d9fe874a3
Fix set FPS broken.
2013-12-26 19:49:54 -08:00
samuele3hu
d51440f62a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
2013-12-27 11:17:11 +08:00
samuele3hu
6d9e865f15
Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong
2013-12-27 10:35:44 +08:00
walzer
d7704d574a
issue #3517 , enable CC_USE_PHYSICS by default
2013-12-27 00:00:50 +08:00
walzer
c5e95618d9
fixed #3517 , make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
2013-12-26 23:55:05 +08:00
James Chen
17ff6ef764
Renames: IntValueMap —> ValueMapIntKey
2013-12-26 22:07:20 +08:00
boyu0
a19d212f4f
fix bug.
2013-12-26 22:00:52 +08:00
boyu0
6bc0a7066f
change CustomCommand variable to class member.
2013-12-26 21:19:12 +08:00
samuele3hu
756a72cbca
Reconstruct the operation of handling lua script event
2013-12-26 19:43:49 +08:00
boyu0
dec003477c
delete ‘delete ptr’ and add CC_UNUSED_PARAM
2013-12-26 19:25:53 +08:00
boyu0
d32fbbbfca
change GroupCommand variable to class member.
2013-12-26 18:11:23 +08:00
boyu0
2fb0179293
change QuadCommand variable to class member.
2013-12-26 16:36:03 +08:00
boyu0
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +08:00
Huabing.Xu
963d637198
use raw new instead of generateCommand
2013-12-26 14:45:44 +08:00
Huabing.Xu
b4c61d5a7c
specialize RenderCommandPool<QuadCommand>
2013-12-26 14:44:21 +08:00
James Chen
142b189305
Some warning fixes.
2013-12-25 16:06:39 +08:00
James Chen
55b0ef85d8
Merge pull request #4631 from boyu0/const_char_star_to_std_string
...
Change const char* to const std::string&
2013-12-24 22:34:34 -08:00
boyu0
2c2953abc1
change “string.compare()” to “==“
2013-12-25 14:20:37 +08:00
boyu0
f2e18f32a9
fix android compile error
2013-12-25 13:57:17 +08:00
James Chen
6fce4f9061
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
2013-12-25 11:00:51 +08:00
boyu0
62fc889a54
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/platform/CCFileUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCImageCommon_cpp.h
cocos/2d/platform/CCSAXParser.cpp
cocos/2d/platform/CCSAXParser.h
2013-12-25 10:41:37 +08:00
James Chen
17a6dbebb6
Compilation error fixes.
2013-12-24 19:05:35 +08:00
James Chen
1f5611ae05
Adds missing ‘)’.
2013-12-24 18:23:36 +08:00
James Chen
0ff85852cc
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
2013-12-24 18:08:40 +08:00
Huabing.Xu
b6dc3d0371
fix clippingNode bug
2013-12-24 17:16:28 +08:00
James Chen
81d073aff0
Reverts FileUtil::getFileData to virtual function.
2013-12-24 16:29:55 +08:00
James Chen
d33b2c41c7
Merge branch 'develop' into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
boyu0
1a453a26ab
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/renderer/CCNewSpriteBatchNode.cpp
cocos/2d/renderer/CCNewSpriteBatchNode.h
2013-12-24 16:07:25 +08:00
James Chen
f527b50ce6
Merge pull request #4630 from dumganhar/iss3492-bmfont-fix
...
closed #3492 : LabelBMFont string can't be shown integrally.
2013-12-23 23:56:38 -08:00
James Chen
7ee0771101
closed #3492 : LabelBMFont string can't be shown integrally.
...
Issue URL: http://www.cocos2d-x.org/issues/3492
2013-12-24 15:55:45 +08:00
boyu0
6e6ccbd5f9
change some const char* to const std::string&
2013-12-24 15:49:58 +08:00
Dhilan007
f140ece282
update vs project for remove some file into renderer.
2013-12-24 15:34:40 +08:00
James Chen
0305ff15db
Merge pull request #4625 from dabingnn/develop_NewClippingNode
...
Develop new clipping node
2013-12-23 23:20:38 -08:00
Huabing.Xu
5cc45493ef
remove commented codes
2013-12-24 15:13:37 +08:00
Huabing.Xu
ccf47e6422
remove commented codes
2013-12-24 15:11:01 +08:00
James Chen
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
Huabing.Xu
07bc4d34a8
some rename for global variables and member functions.
2013-12-24 14:53:49 +08:00
Huabing.Xu
c36d920159
remove include reference
2013-12-24 14:15:23 +08:00
Huabing.Xu
eee06ec905
update project file:android and linux
2013-12-24 14:12:15 +08:00
Huabing.Xu
9db599c0c9
remove class NewClippingNode
2013-12-24 14:10:54 +08:00
Huabing.Xu
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
boyu0
8e329501ba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
...
Conflicts:
cocos/2d/renderer/CCNewSprite.cpp
cocos/2d/renderer/CCNewSprite.h
cocos/2d/renderer/CCNewTextureAtlas.cpp
cocos/2d/renderer/CCNewTextureAtlas.h
2013-12-24 11:44:08 +08:00
Huabing.Xu
b821a33cfa
remove comment code
2013-12-24 11:28:42 +08:00
Huabing.Xu
12e2cfedf2
update project file:android and linux
2013-12-24 11:20:21 +08:00
Huabing.Xu
24ac743a3c
remove class NewSpriteBatchNode
2013-12-24 11:03:59 +08:00
boyu0
3344c5243c
change some const char* to const std::string&
2013-12-24 10:51:47 +08:00
Huabing.Xu
b61bf3ad95
LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
...
remove NewSpriteBatchNode testcase to SpriteBatchNode
2013-12-24 10:51:35 +08:00
Huabing.Xu
410cfb9ca4
move NewSpriteBatchNode feature function into SpriteBatchNode
2013-12-24 10:48:57 +08:00
Huabing.Xu
8310c18105
update project file: android and linux
2013-12-24 10:07:53 +08:00
Huabing.Xu
c4f4f91cb4
Merge branch 'develop' into develop_mergeNewSprite
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Binds Node::setAnchorPoint manually.
Don’t hide parent’s addChild method in TMXLayer class.
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates JS-tests to the latest version.
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
Updates js tests to the latest version.
Removes unneeded binding glue codes, Sprite::setPosition.
Bindings-generator skips Node::setContentSize. Binds it manually.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3353:Add the DisplayLinkDirector lua binding
issue #2771 : fix warning log and fix typo.
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-24 10:03:21 +08:00
Huabing.Xu
8d58e43ad2
remove Class NewSprite
2013-12-24 09:40:00 +08:00
James Chen
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
James Chen
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
James Chen
5f17984826
Don’t hide parent’s addChild method in TMXLayer class.
2013-12-23 21:53:23 +08:00
Huabing.Xu
e66eb6464d
use Sprite instead of NewSprite
2013-12-23 21:07:25 +08:00
Huabing.Xu
c3247c800f
merge feature function from NewSprite into Sprite
2013-12-23 21:06:37 +08:00
James Chen
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
Huabing.Xu
b3eb297249
Merge branch 'develop' into develop_mergeNewTextureAtlas
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
Updates bindings-generator, skips to bind override functions.
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 20:12:06 +08:00
Huabing.Xu
1dd2c1c20c
remove NewTextureAtlas
2013-12-23 20:11:50 +08:00
James Chen
bbbfa4b106
Merge pull request #4603 from dabingnn/develop_mergeNewRenderTexture
...
Develop merge new render texture
2013-12-23 04:09:33 -08:00
Huabing.Xu
98d573f4cb
rename protected _beginWithClear to beginWithClear
2013-12-23 19:59:09 +08:00
James Chen
eb9cb237d5
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
...
closed #3480 : Removes unneeded codes of override function.
2013-12-23 03:43:27 -08:00
Huabing.Xu
0dab85a3bf
update CMakeLists.txt
2013-12-23 18:37:18 +08:00
Huabing.Xu
75597bc47f
Merge branch 'develop' into develop_mergeNewRenderTexture
...
* develop:
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583 ).
issue #3403:Delete Camera manual lua binding
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
James Chen
8c3315de76
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
2013-12-23 18:23:39 +08:00
Huabing.Xu
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
Huabing.Xu
bcaec978d3
remove NewRenderTexture Class
2013-12-23 18:04:04 +08:00
Huabing.Xu
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
Huabing.Xu
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
Huabing.Xu
a7a50dffcc
move begin(), end(),draw() to RenderTexture
2013-12-23 17:13:06 +08:00
James Chen
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
Huabing.Xu
fad585fbef
move rendering callback to RenderTexture
2013-12-23 15:59:47 +08:00
boyu0
0cbbfdba8c
closed #2050 : Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXLayer.cpp
2013-12-23 15:40:33 +08:00
Huabing.Xu
b7c0d7a9e8
1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear
2013-12-23 14:59:44 +08:00
James Chen
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
James Chen
aeafe06d7f
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
James Chen
11423b5851
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
2013-12-23 11:53:39 +08:00
boyu0
1072711a4c
issue #2050 : use static_cast
2013-12-23 10:46:35 +08:00
boyu0
baf8cb06c5
issue #2050 : delete max/minGID, fix firstGID bug
2013-12-23 10:37:46 +08:00
samuele3hu
7daace0b2a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 09:43:05 +08:00
samuele3hu
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
Dhilan007
786b7d9912
update vs project for remove CCCamera.
2013-12-22 17:19:59 +08:00
Ricardo Quesada
4f435a8613
Adds getScene() to Node
...
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
Ricardo Quesada
49903ea779
Director emits events after visit, after draw and after update. And when the projection changes
...
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
Ricardo Quesada
eea2e70d1e
Adds events in director
2013-12-21 00:56:28 -08:00
Ricardo Quesada
72d77bb035
removes dirty from ActionCamera
2013-12-20 19:45:30 -08:00
Ricardo Quesada
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -08:00
Ricardo Quesada
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
Ricardo Quesada
b8b7714431
Camera is working OK in 2d projection
2013-12-20 19:19:24 -08:00
Ricardo Quesada
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
Ricardo Quesada
0703d974e2
NodeGrid fixes
...
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
2013-12-20 11:52:52 -08:00
James Chen
2a7b2c107a
Updates CCUserDefaultAndroid.cpp.
2013-12-20 21:51:53 +08:00
minggo
9bea08ded9
Merge pull request #4580 from dabingnn/develop_MotionStreak
...
Migrate MotionStreak to new renderer
2013-12-20 05:36:52 -08:00
Huabing.Xu
739cf0ce85
Migrate MotionStreak to new renderer
2013-12-20 21:21:50 +08:00
James Chen
9e05f300f3
[Data Refactor] compilation error fix.
2013-12-20 21:16:46 +08:00
James Chen
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen
3d76281617
Removes an unused assert.
2013-12-20 19:49:25 +08:00
James Chen
5852c66e5a
closed #3463 : ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
2013-12-20 19:47:11 +08:00
Huabing.Xu
a8d2ae9eda
Merge branch 'develop' into develop_transitionScene
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
[AUTO] : updating submodule reference to latest autogenerated bindings
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 19:15:50 +08:00
byeonggee.seo
f3e4d9277e
spine android build phase moved
2013-12-20 19:16:16 +09:00
James Chen
e54c993918
Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android
...
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 00:13:05 -08:00
Huabing.Xu
ef5b072182
fix transition scene CrossFade
2013-12-20 14:38:02 +08:00
James Chen
2c590cea3e
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-20 14:06:24 +08:00
Huabing.Xu
87f62bc8a0
Merge branch 'develop' into develop_transitionScene
...
* develop:
#include <string> in CCComponentContainer.h to fix linux build failure.
#include <algorithm> for std::find in CCVector.h.
const love in CCFileUtils.cpp.
More std::for_each —> for(const auto& …)
2013-12-20 12:45:22 +08:00
minggo
ea751f8f1f
Merge pull request #4568 from dabingnn/develop_transitionScene
...
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
Huabing.Xu
9385fb3481
fix transition scene progress timer
2013-12-20 10:53:35 +08:00
James Chen
e56a4a7c00
Merge pull request #4567 from dumganhar/for_each-gone
...
All std::for_each has gone. uses for(const auto& ...) instead.
2013-12-19 18:50:50 -08:00
James Chen
a53f00c579
#include <string> in CCComponentContainer.h to fix linux build failure.
2013-12-20 10:41:29 +08:00
minggo
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
James Chen
58772d7dec
const love in CCFileUtils.cpp.
2013-12-20 10:11:41 +08:00
James Chen
34382b4a8a
More std::for_each —> for(const auto& …)
2013-12-20 09:54:50 +08:00
boyu0
19e1609c27
issue #2050 : unsigned int to int
2013-12-20 09:50:53 +08:00
Ricardo Quesada
f5d0d1ce43
batched children work as expected
...
Fixed order in the multi matrix.
2013-12-19 16:33:47 -08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
Damien
52c66a678c
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
...
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
- CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);
Fix Tested on Android. Affects Android only.
2013-12-19 12:32:51 -08:00
Huabing.Xu
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
Huabing.Xu
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
Huabing.Xu
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
Huabing.Xu
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
James Chen
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
Huabing.Xu
44366c653c
fix compile error
2013-12-19 17:20:36 +08:00
Huabing.Xu
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
Huabing.Xu
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
Huabing.Xu
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
Ricardo Quesada
1d3cc7a24c
Skew works again!
2013-12-18 21:11:06 -08:00
James Chen
d31c1457b1
Merge pull request #4546 from Dhilan007/update_vsProject
...
update vs project for removes unneeded files
2013-12-18 19:30:21 -08:00
Ricardo Quesada
d138925aa0
Merge branch 'develop' into node_fixes
2013-12-18 18:33:56 -08:00
Ricardo Quesada
b9a64725ab
iterator in Sprite fixes
...
And replaces some std::for_each() with for() to prevent another object in the stack.
2013-12-18 18:33:04 -08:00
Dhilan007
ffa6ad3cb2
update vs project for removes unneeded files
2013-12-19 10:24:50 +08:00
minggo
9fc28e6c7d
Merge pull request #4534 from boyu0/edit_hungarian_notation
...
Edit hungarian notation
2013-12-18 18:10:17 -08:00
Ricardo Quesada
89701f5006
getNodeToParentTransform fixes
...
Code is cleaner.
`Armature` calls parent to reduce code.
[]: Skew is still not working properly
2013-12-18 18:00:55 -08:00
boyu0
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
Ricardo Quesada
8390e7eadb
Node cleanup
...
Uses "normal" interation without the lambda to prevent another object in the stack.
removed unused code.
2013-12-18 16:56:59 -08:00
Ricardo Quesada
7616edd9f3
Improves SpriteTest
...
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).
Needed for the new renderer.
Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
Ricardo Quesada
b36d77b1c2
Android and Linux fixes
2013-12-18 12:07:51 -08:00
Ricardo Quesada
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
boyu0
d0b039ceda
fix compile errors.
2013-12-18 22:44:03 +08:00
boyu0
71be55a9aa
revert AccelerometerSimulation.m
2013-12-18 19:02:49 +08:00
boyu0
f16384a105
fix more code with hungarian notation
2013-12-18 18:51:36 +08:00
boyu0
082c3d274a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:05:30 +08:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
Huabing.Xu
46d1d5bb91
add GridNode New renderer imp
2013-12-18 17:19:50 +08:00
James Chen
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
James Chen
581ba49399
Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-18 15:41:57 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
Dhilan007
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
Ricardo Quesada
24f89ac45c
Revert... android platform is 10
2013-12-17 19:07:28 -08:00
Ricardo Quesada
156f69c528
Renderer is subclass of Object again... needed for Android.
...
ouch
2013-12-17 19:06:22 -08:00
Ricardo Quesada
5c9b8db0cb
Updates project files file Linux and Android
2013-12-17 18:47:46 -08:00
Ricardo Quesada
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
Ricardo Quesada
f369a8eec3
Adds correct License to Renderer files
2013-12-17 18:12:15 -08:00
Ricardo Quesada
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -08:00
Ricardo Quesada
d6be81b7a8
The Renderer is not a singleton
...
In order to access, you have to get it from the Director
`Director::getInstance()->getRenderer()`
2013-12-17 17:50:17 -08:00
Ricardo Quesada
441cb6c282
fixes warnings in QuadCommand
2013-12-17 10:35:15 -08:00
Ricardo Quesada
ff106ed070
fixes warning on Label Fragment shader
2013-12-17 10:01:38 -08:00
Huabing.Xu
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen
3829f841e7
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 18:09:07 +08:00
James Chen
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
minggo
85ba3ee1a9
Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError
...
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
2013-12-17 00:32:50 -08:00
LinWenhai
649e6b8065
use size_t replace unsigned int for record redeque::size returned value.
2013-12-17 16:04:48 +08:00
James Chen
12cc6c6153
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
...
Conflicts:
cocos/2d/CMakeLists.txt
2013-12-17 15:50:24 +08:00
James Chen
7fc7757470
issue #2171 : Adds header files of renderer in cocos2d.h.
2013-12-17 15:40:50 +08:00
James Chen
08edcca9be
issue #2171 : small fix in ccTypes.h
2013-12-17 15:39:35 +08:00
James Chen
8f5970ef90
issue #2171 : Don’t ‘using namespace std;’ in header file.
2013-12-17 15:32:24 +08:00
minggo
16ed9155c0
Merge pull request #4460 from Dhilan007/label_distanceField
...
new label:add support for distanceField
2013-12-16 23:18:41 -08:00
James Chen
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
James Chen
4e01769cd5
issue #2171 : [New Renderer] Fixing compilation errors for Android.
2013-12-17 14:18:41 +08:00
Ricardo Quesada
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
Huabing.Xu
6abb6639b5
remove android properties change by eclipse
2013-12-16 19:22:40 +08:00
Dhilan007
f7a448814c
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
2013-12-16 17:12:53 +08:00
Dhilan007
0cf17f5658
label : fix some error on android when the GLSL versions is 1.0
2013-12-16 14:36:11 +08:00
Huabing.Xu
6aa2908c13
rename:
...
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
boyu0
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
Lee, Jae-Hong
2807e785c0
fix CCImage bug on android platform.
...
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
2013-12-15 21:07:55 +09:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
James Chen
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
James Chen
ed93c114e5
Reverts CCSpriteBatchNode.h
2013-12-13 16:47:42 +08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
James Chen
7a8f2ae235
size_t —> ssize_t in CCTMXLayer.cpp
2013-12-13 16:41:03 +08:00
Dhilan007
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
Huabing.Xu
a8a2ceb887
add linux make list
2013-12-13 12:25:17 +08:00
Huabing.Xu
305e80030c
update Visual studio project file
2013-12-13 10:59:23 +08:00
Huabing.Xu
00edb5f7fe
update android.mk in 2d folder
2013-12-13 10:57:23 +08:00
boyu0
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
Ricardo Quesada
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
Ricardo Quesada
f4c68e4eef
More renames of description() to getDescription()
2013-12-12 14:38:12 -08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
Huabing.Xu
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
Huabing.Xu
256fe13d3f
other grid scene transitions can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
f1cac00dd7
TransitionPageTurn can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
ea9d744d79
add setGridTarget method, grid node now can affect its target and its child
2013-12-12 15:15:43 +08:00
Huabing.Xu
09a9b1f557
remove setGrid getGrid in class Node
2013-12-12 15:15:43 +08:00
Huabing.Xu
aad617e200
add class GridNode
2013-12-12 15:10:04 +08:00
minggo
040c42ebfd
use ssize_t for index
2013-12-12 14:48:26 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
minggo
ab23b47043
use ssize_t for capacity and index in containers
2013-12-12 14:48:26 +08:00
James Chen
b5bab598b3
issue #2790 : Disables deprecated warning for android to make Travis-CI happy.
2013-12-12 10:35:13 +08:00
James Chen
b2e8bdce1e
issue #2790 : Uses StringUtils::format for Node::description().
2013-12-12 09:47:35 +08:00
James Chen
976bef8b68
issue #2790 : StringUtils::toStringWithFormat —> StringUtils::format.
2013-12-12 09:37:56 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
9e637a3a3b
issue #2790 : GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
2013-12-11 22:35:37 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
49cc9719a6
issue #2790 : log —> CCLOG.
2013-12-11 18:08:06 +08:00
James Chen
40bc797b1f
issue #2790 : Configuration::getValue has default value now.
2013-12-11 18:08:06 +08:00
James Chen
022df4c014
issue #2790 : Removes test codes.
2013-12-11 18:08:05 +08:00
James Chen
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
boyu0
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +08:00
boyu0
7cbce905bf
issue #3162 : delete duplicate functions.
2013-12-11 16:12:14 +08:00
boyu0
463ae20ce6
issue #3162 : Add layer cascade color and cascade opacity test, fix bugs
2013-12-11 15:57:20 +08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
35eeebe64a
add comments for include "CCStdC.h" only for windows
2013-12-10 23:13:21 +08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
boyu0
d0da73c365
Add _stencil is nil test, add warning log.
2013-12-09 14:00:10 +08:00
boyu0
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
James Chen
908f5ed515
issue #2790 : Fix for TMXObjectGroup::getObject.
2013-12-07 16:38:50 +08:00
James Chen
6b0589679b
issue #2790 : Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler
2013-12-07 14:25:24 +08:00
James Chen
d7997cf0cc
issue #2790 : Updates MenuItemToggole
2013-12-07 14:24:31 +08:00
James Chen
b0cb7c230a
#issue #2790 : Uses Vector<Scene*> for scenesStack in CCDirector.
2013-12-07 14:22:51 +08:00
James Chen
0091ca2b6f
issue #2790 : Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp.
2013-12-07 14:22:03 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
Ricardo Quesada
8df96b1a6e
Layercolor uses the new API
2013-12-06 17:59:34 -08:00
Ricardo Quesada
ba2f65c6b2
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 17:42:48 -08:00
Ricardo Quesada
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
Nite Luo
94255a9d52
Fix culling
2013-12-06 14:59:06 -08:00
Ricardo Quesada
439adafbcd
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 11:57:19 -08:00
Ricardo Quesada
745541979b
Particles working again.
...
Paticle Batch working too: increased VBO_SIE to 10500
2013-12-06 11:51:17 -08:00
Nite Luo
3e0bee706e
Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command
2013-12-06 11:41:24 -08:00
Ricardo Quesada
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada
73b1e3bb9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCSprite.cpp
2013-12-06 09:37:08 -08:00
boyu0
0e94d4f3b8
closed #3162 : fix indent.
2013-12-06 18:23:31 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
James Chen
0d30f2bbbb
Merge pull request #4445 from dumganhar/iss2790-template-container
...
issue #2790 : Fix of JSB project broken after using Vector<T>
2013-12-06 01:24:21 -08:00
minggo
368647c166
Merge pull request #4444 from minggo/fix-warning
...
fix some warnings
2013-12-06 01:07:03 -08:00
James Chen
9f6d2df63b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container
2013-12-06 16:46:51 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
0126aaa205
Merge pull request #4442 from minggo/use-schedule
...
use Schedule::performFunctionInCocosThread
2013-12-05 22:30:54 -08:00
Ricardo Quesada
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
Ricardo Quesada
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
Nite Luo
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
Nite Luo
e3fc789070
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-05 12:05:44 -08:00
darkdukey
5f902d95b3
Merge pull request #5 from dabingnn/newRendererParticleSystem
...
New renderer particle system
2013-12-05 12:05:18 -08:00
Ricardo Quesada
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
b520941c5c
Reverts config of VS project.
2013-12-05 16:37:50 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
6a034a91f1
Merge branch 'develop' into console
...
Conflicts:
cocos/scripting/auto-generated
2013-12-04 21:58:11 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -08:00
James Chen
b0af2667f8
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
minggo
ba62c88682
Merge pull request #4420 from dumganhar/iss2790-template-container
...
[ci skip]issue #2790 : (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
2013-12-04 20:06:24 -08:00
martell
e0523c73f5
fixed CCImage for MSVC someone added std:tolower which broke it
2013-12-05 03:53:25 +00:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
Nite Luo
9b0e0d2116
Fix a bug with auto batching logic
2013-12-04 19:05:17 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
Ricardo Quesada
4aae44f1e9
fixes cocos2d.h include
2013-12-04 18:54:15 -08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Huabing.Xu
e6823875d5
change VBO_SIZE to a big number to avoid crash temporarily
2013-12-05 10:20:54 +08:00
Huabing.Xu
7a58cb5a29
use quad command instead of custom command for ParticleSystemQuad::draw()
2013-12-05 10:20:22 +08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
Nite Luo
e316ac779b
Sprite culling now using vertices directly to avoid calculation on transform
2013-12-04 17:41:18 -08:00
Nite Luo
a98714f6a5
support device without VAO
2013-12-04 17:02:02 -08:00
Nite Luo
792cb5a716
Merge branch 'develop' into newRenderer
2013-12-04 15:23:12 -08:00
Nite Luo
143df8af7d
Fix RenderTexture after merging commandpool
2013-12-04 15:13:13 -08:00
darkdukey
4b7d0c290a
Merge pull request #4 from dabingnn/newRendererCommandPool
...
New renderer command pool
2013-12-04 15:08:17 -08:00
Nite Luo
f423166471
Fix bugs with RenderTexture with NewRender
2013-12-04 15:06:28 -08:00
Ricardo Quesada
f69d5d1328
Merge branch 'develop' into console
2013-12-04 12:28:05 -08:00
Nite Luo
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
4212e33aee
issue #2790 : Removes unused comments in CCAnimation.h
2013-12-04 17:27:53 +08:00
James Chen
60874ece64
issue #2790 : Updates Makefile, Moves some codes to CCValue.cpp.
2013-12-04 16:18:22 +08:00
James Chen
ceaa1f26bb
issue #2790 : Windows run ok with ValueDict for FileUtils.
2013-12-04 16:02:54 +08:00
James Chen
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
James Chen
5c60f66c63
issue #2790 : Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
2013-12-04 16:02:53 +08:00
James Chen
f01f56113c
issue #2790 : Don’t make an assert if converting Value failed.
2013-12-04 16:02:53 +08:00
James Chen
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
James Chen
411136dd57
issue #2790 : Updates CCValue, supports using ‘const char*’ to construct a Value.
2013-12-04 16:02:52 +08:00
James Chen
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
James Chen
8a435aa274
issue #2790 : ArrayValue —> ValueArray, DictValue —> ValueDict.
2013-12-04 16:02:52 +08:00
James Chen
3136ffc3dd
issue #2790 : Adds CCValue.h/.cpp.
2013-12-04 16:02:51 +08:00
James Chen
d2bddee11e
issue #2790 : Adds CCMap.h.
2013-12-04 16:01:56 +08:00
James Chen
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
James Chen
0d581a15d8
issue #2790 : MenuItemToggle::setSubItems() uses Vector<MenuItem*> now.
2013-12-04 16:01:55 +08:00
James Chen
8aef092005
issue #2790 : TestCpp with new Vector<>.
2013-12-04 16:01:54 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
boyu0
98779b0a9f
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 14:36:32 +08:00
minggo
92b180080c
Merge pull request #4409 from mlepage/develop
...
[ci skip]Fix typos
2013-12-03 19:13:23 -08:00
Ricardo Quesada
a34352cef7
Console is working!
2013-12-03 18:46:54 -08:00
Huabing.Xu
cd562676f5
use block allocation for commands
2013-12-04 10:39:34 +08:00
boyu0
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
Huabing.Xu
757f1abc7f
1. protected render command construction/destruction function.
...
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
2013-12-03 14:08:47 +08:00
Huabing.Xu
44f12ce8e4
add RenderCommandPool head file
2013-12-03 11:52:51 +08:00
Huabing.Xu
d4b9e0538b
refactor: group command use a non parameter constructor and a reentrant init function
2013-12-03 11:24:03 +08:00
Huabing.Xu
d33f05b3f0
refactor: custom command use a non parameter constructor and a reentrant init function
2013-12-03 11:17:21 +08:00
Huabing.Xu
ace75eebce
refactor: quad command use a non parameter constructor and a reentrant init function
2013-12-03 11:11:46 +08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
8801f508eb
Partcle system use the new renderer
2013-12-02 12:13:05 -08:00
Nite Luo
fbadb3329a
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada
dbcae0af1e
Merge branch 'develop' into console
2013-12-02 09:57:53 -08:00
James Chen
9618eb00be
Merge pull request #4411 from martell/cmake
...
closed #3328 : cmake support for windows
2013-12-02 01:22:57 -08:00
martell
06ff1bc594
Fixed HelloCpp Linking on Linux
2013-12-02 07:10:37 +00:00
minggo
d2f235f8b8
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
...
[ci skip]issue #2345 : add tga support to Image
2013-12-01 18:18:42 -08:00
minggo
24f7819e99
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
...
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-12-01 18:08:58 -08:00
martell
f369606d77
fix cocos2d-x for vs2013
2013-11-30 08:05:39 +00:00
martell
79401a7596
quickly added win32 cmake
2013-11-30 06:09:12 +00:00
Marc Lepage
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
Jason Xu
266e4e1654
rename to with Jni suffex
2013-11-29 19:34:36 +08:00
Jason Xu
27c3a459ed
rename android native function names.
2013-11-29 17:17:15 +08:00
boyu0
83f855e2ec
issue #2345 : delete unnecessary include
2013-11-29 15:31:58 +08:00
boyu0
04c3d95005
issue #2345 : namespace cocos2d { -> NS_CC_BEGIN
2013-11-29 15:25:21 +08:00
boyu0
dffc12e648
issue #2345 : new/delete -> malloc/free
2013-11-29 15:13:16 +08:00
boyu0
86074c23d8
issue #2345 : class Image add tga image format support.
2013-11-29 14:31:42 +08:00
minggo
3268da3a4d
Merge pull request #4401 from minggo/thread-helper
...
[ci skip]add helper funcion to invoke a function in gl thread
2013-11-27 22:26:11 -08:00
Ricardo Quesada
21afd63d82
Merge branch 'develop' into console
2013-11-27 14:29:27 -08:00
Nite Luo
83972ecf57
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-11-27 10:16:34 -08:00
Nite Luo
75381ebc51
Merge branch 'develop' into newRenderer
2013-11-27 10:16:17 -08:00
boyu0
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
minggo
eded94ef76
don't create a pool, since it doesn't invoke any iOS dependent codes
2013-11-27 17:43:54 +08:00
boyu0
2b43e72e7c
issue #2771 : fix vs compile errors, change project setting
2013-11-27 17:33:33 +08:00
minggo
bcb131262c
add helper funcion to invoke a function in gl thread
2013-11-27 16:49:07 +08:00
Huabing.Xu
ea46e1c658
change test case
2013-11-27 14:30:38 +08:00
Huabing.Xu
3da196ea43
add Frustum culling to new Sprite
2013-11-27 10:35:12 +08:00
Huabing.Xu
80da1dac3f
add Frustum, AABB, ViewTransform
2013-11-27 10:34:30 +08:00
James Chen
6c097fa692
Merge pull request #4389 from minggo/remove-unneeded-codes
...
override addChild in Sprite to fix error in binding generator
2013-11-26 18:14:20 -08:00
minggo
0ac9022201
fix a typo
2013-11-27 10:02:32 +08:00
minggo
85002285c2
override addChild in Sprite to fix error in binding generator
2013-11-27 09:50:47 +08:00
Nite Luo
3123c70153
Sprite are now using NewRenderer
2013-11-26 17:13:04 -08:00
Nite Luo
bf53cc116b
use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode
2013-11-26 17:01:32 -08:00
Ricardo Quesada
2f1dffe46b
Adds performFunctionInCocos2dThread
...
... in Scheduler
2013-11-26 16:58:14 -08:00
Ricardo Quesada
b7f7b0dae4
Reports wether the build is DEBUG or RELEASE
...
Reports wether the build is DEBUG or RELEASE in Configuration
2013-11-26 14:36:31 -08:00
Nite Luo
92b57c79ba
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
2013-11-26 11:56:03 -08:00
Nite Luo
61ca4f0137
Fix a bug with NewSprite Update Quad
2013-11-26 11:48:37 -08:00
boyu0
8346fe4b4d
issue #2771 : edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX
2013-11-26 18:22:52 +08:00
minggo
fcf43823b4
remove unneeded codes
2013-11-26 17:53:34 +08:00
boyu0
0100c05a93
issue #2771 : fix compile errors
2013-11-26 17:29:09 +08:00
James Chen
63702188be
issue #3258 : Compilation error fix for linux port.
2013-11-26 15:56:43 +08:00
James Chen
b55e8f17c7
issue #3258 : MenuItemFont has empty argument create function now.
2013-11-26 15:44:21 +08:00
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
Nite Luo
f3830985bb
Sprite now using New renderer
2013-11-25 16:33:05 -08:00
Ricardo Quesada
b6f6e72c94
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCActionInstant.h
2013-11-25 13:59:24 -08:00
Nite Luo
19b8ba89e2
Merge branch 'develop' into newRenderer
2013-11-25 10:21:02 -08:00
Nite Luo
b67ec6618f
Finish converting LayerColor start working on particle system
2013-11-22 17:14:24 -08:00
Ricardo Quesada
cc5a03f21a
updates cocos2d version
2013-11-22 16:58:05 -08:00
Ricardo Quesada
447a34655a
RenderTexture contructor ctor is public again
2013-11-22 16:14:05 -08:00
Nite Luo
60ada5dee3
Fonts are now using NewSprite to render
2013-11-22 16:09:11 -08:00
Ricardo Quesada
9b52af010d
Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN
...
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
2013-11-22 16:09:05 -08:00
Ricardo Quesada
3f1983214f
Effects have protected contructors
...
and disallowed copy + assign
2013-11-22 15:07:58 -08:00
Nite Luo
b02af0cbfe
Clean up renderer code
2013-11-22 10:24:52 -08:00
Ricardo Quesada
4d7e56b44a
fix indentation
2013-11-22 09:42:21 -08:00
Jason Xu
7c5784005c
Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-11-23 00:07:15 +08:00
samuele3
eb3f5eb629
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-22 11:52:32 +08:00
samuele3
192deb7952
issue #3228 : Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
2013-11-22 11:51:07 +08:00
Ricardo Quesada
515786a7ee
adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons
...
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
2013-11-21 17:06:06 -08:00
Nite Luo
43941bcbe0
Only init render after GLview has been initialized
2013-11-21 16:36:19 -08:00
Ricardo Quesada
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
Nite Luo
96d2910a99
Merge branch 'develop' into newRenderer
2013-11-21 10:19:32 -08:00
Nite Luo
db52698b26
Fix the crash on ios 7
2013-11-20 20:39:32 -08:00
Ricardo Quesada
90f51e0dab
Merge branch 'develop' into constructors_are_protected
2013-11-20 11:26:55 -08:00
Ricardo Quesada
6a8c4784a4
Adds some #pragma mark love
2013-11-20 11:26:33 -08:00
Ricardo Quesada
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
Nite Luo
f438e83104
Merge branch 'develop' into newRenderer
2013-11-20 11:14:28 -08:00
Nite Luo
0e51504ee6
Use stack to manage current RenderGroup
2013-11-20 11:05:01 -08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
James Chen
6b579ebe5e
Don't deprecate callback functions in Layer. Reason:
...
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
2013-11-20 11:19:51 +08:00
James Chen
93333ad252
Merge pull request #4340 from Dhilan007/jssubmodule
...
recover controller on layer.
2013-11-19 18:49:07 -08:00
Dhilan007
bd3789e0b5
add miss api
2013-11-20 10:40:43 +08:00
James Chen
424431690a
Fixing warning generated by VS2012.
2013-11-20 10:39:30 +08:00
Dhilan007
0646e59bf3
resolve conflict
2013-11-20 10:26:00 +08:00
Ricardo Quesada
9a51d6c0ba
Merge branch 'develop' into constructors_are_protected
2013-11-19 17:59:43 -08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo
8ce16e1e12
Finish DrawNode
2013-11-19 13:57:39 -08:00
Ricardo Quesada
27b09a2b3b
Merge branch 'develop' into constructors_are_protected
2013-11-19 13:54:34 -08:00
Ricardo Quesada
582afe3b61
Fixes warnings in CCLabel
...
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Ricardo Quesada
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
Nite Luo
a3725c2394
Merge branch 'develop' into newRenderer
2013-11-19 11:08:26 -08:00
Nite Luo
7ad64ece36
Add Transform to DrawNode
2013-11-19 11:06:26 -08:00
Dhilan007
dc42645afe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 16:49:28 +08:00
Dhilan007
3929e6070d
fix error form overrides a 'final' function
2013-11-19 16:27:09 +08:00
Dhilan007
c307d83b35
add miss Deprecated api
2013-11-19 16:06:27 +08:00
Dhilan007
1a65af9d1a
fix warn
2013-11-19 15:54:54 +08:00
Dhilan007
f0ab3f9ca1
fix some error in layer controller code
2013-11-19 15:41:22 +08:00
Dhilan007
0586c4d275
recover controller on layer.
2013-11-19 13:56:30 +08:00
minggo
bd00e6fabb
Merge pull request #4326 from dabingnn/develop_hotFix
...
[ci skip]Develop hot fix
2013-11-18 19:33:07 -08:00
Huabing.Xu
fff851a8aa
HotFix: change tab to space
2013-11-19 11:17:02 +08:00
Dhilan007
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
Nite Luo
abb011f0ef
Test clipping node with alpha
2013-11-18 15:52:47 -08:00
Nite Luo
c288e5ef9c
Fix Clipping Node
2013-11-18 14:58:41 -08:00
Ricardo Quesada
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
Nite Luo
e5ebcb2845
Merge branch 'develop' into newRenderer
2013-11-18 10:22:16 -08:00
minggo
fc56d9234e
Merge pull request #4309 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug callback retain release error
2013-11-18 05:14:41 -08:00
Huabing.Xu
699dd9518b
HotFix: fix bug callback retain release error
2013-11-18 21:12:47 +08:00
minggo
c7971bcaad
Merge pull request #4300 from minggo/textinput-crash
...
[ci skip]fix crash of textinput test case
2013-11-18 00:23:51 -08:00
minggo
30b7ac8dd1
fix crash of textinput test case
2013-11-18 15:14:48 +08:00
minggo
bbb579faad
Merge pull request #4298 from boyu0/fix_keypadtest_crash
...
[ci skip]fix keypad test crash bug
2013-11-17 23:01:10 -08:00
boyu0
eea09d60f7
fix keypad test crash bug
2013-11-18 14:33:24 +08:00
minggo
5e4b3c6919
Merge pull request #4291 from dabingnn/develop_hotFix
...
[ci skip]HotFix: remove Mac platform Image::saveToFile assert
2013-11-17 20:57:47 -08:00
boyu0
90f07f680f
Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical
2013-11-18 11:22:20 +08:00
Huabing.Xu
09f27f1d16
HotFix: remove Mac platform Image::saveToFile assert
2013-11-18 10:14:57 +08:00
minggo
982a23af3d
fix some hungarial
2013-11-16 21:08:00 +08:00
Nite Luo
f5a8c1d02c
Fix NewClipNodeTest
2013-11-15 17:32:29 -08:00
Ricardo Quesada
a3fabd6b6d
TiledMap uses std::string
2013-11-15 16:37:57 -08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -08:00
Ricardo Quesada
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
Nite Luo
c5f9434331
Merge branch 'develop' into newRenderer
2013-11-15 11:33:38 -08:00
Nite Luo
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -08:00
Ricardo Quesada
417657b5a9
Merge branch 'develop' into constructors_are_protected
2013-11-15 10:11:49 -08:00
boyu0
988630c12f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-15 16:38:58 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Nite Luo
7ad93d8a94
Create new clippingNode
2013-11-14 16:39:03 -08:00
Ricardo Quesada
17a6575bd3
more protected constructors
...
Adds protected constructors for:
* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
2013-11-14 16:33:43 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Ricardo Quesada
b87684c022
fixes Sprite::setTexture()
...
Sprite::setTexture(std::string&) works as expected.
It sets the texture rect of the sprite
2013-11-14 15:37:43 -08:00
Nite Luo
8d63faa0de
New Renderer working with RenderStack
2013-11-14 12:17:54 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
Nite Luo
a70cad8c97
Merge branch 'develop' into newRenderer
2013-11-14 10:36:43 -08:00
Nite Luo
4f1858fa8a
Crate NewClipping Node
2013-11-14 10:35:28 -08:00
minggo
2f7f05d1d7
fix asynchronize loading bug
2013-11-14 18:39:23 +08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
minggo
e0076cbdf3
Merge pull request #4246 from minggo/zorder-fix
...
[ci skip]Zorder fix
2013-11-13 23:26:05 -08:00
Huabing.Xu
03c8c8f4fc
Fix bug: use free() in imageCommon_cpp.h
2013-11-14 14:48:16 +08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
minggo
a057274115
set z order after reorder
2013-11-14 14:08:50 +08:00
Huabing.Xu
46ef7a7fbc
Fix bug: deprecate old interface
2013-11-14 13:35:17 +08:00
minggo
996be7502a
Merge pull request #4129 from michaelcontento/color-convenience
...
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo
95effc0207
Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut
...
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-13 19:16:34 -08:00
Jason Xu
f4425f5db2
C++11: NULL -> nullptr
2013-11-14 11:08:50 +08:00
Jason Xu
dee3bffcdc
Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-14 10:40:06 +08:00
minggo
ed83a0b374
Merge pull request #4205 from bmanGH/fix_touch_retain
...
[ci skip]fix direct delete touch object without use release crash bug;
2013-11-13 18:30:21 -08:00
minggo
e6653e133b
Merge pull request #4193 from ricardoquesada/doxygen_markdown
...
[ci skip]Adds markdown comments in the doxstrings
2013-11-13 18:15:59 -08:00
minggo
97063dfe7d
Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram
...
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
2013-11-13 18:10:10 -08:00
minggo
a34011c682
Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn
...
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
2013-11-13 18:08:25 -08:00
Huabing.Xu
b4b4e99522
Fix bug: rename const with under line seperator
2013-11-14 10:00:59 +08:00
minggo
84689e0121
Merge pull request #4206 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warnings
2013-11-13 17:57:25 -08:00
minggo
4abf5b50dd
Merge pull request #4214 from samuele3hu/developCCS
...
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
2013-11-13 17:45:34 -08:00
Huabing.Xu
ccbbff3c22
Fix bug: Z fighting on TransitionScenePageTurn
2013-11-14 09:44:35 +08:00
Nite Luo
f17af1f319
Add group command
2013-11-13 17:31:12 -08:00
Ricardo Quesada
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
Nite Luo
d5f651deee
Merge branch 'develop' into newRenderer
2013-11-13 10:27:30 -08:00
Nite Luo
05bc444ccb
Add some optimization tips
2013-11-13 10:26:26 -08:00
minggo
304b09527b
Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime
...
[ci skip]Configuration of VAO in runtime
2013-11-12 22:55:29 -08:00
bmanGH
2687ee8915
put '{' in a new line to follow cocos2d-x coding style
2013-11-13 14:52:16 +08:00
boyu0
ca4c289fd8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-13 11:24:19 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
samuele3
26c3266711
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-13 10:15:24 +08:00
Ricardo Quesada
4848e3d3bb
correct size for Listener ID
2013-11-12 17:14:51 -08:00
Nite Luo
37d3601fd0
Merge branch 'develop' into newRenderer
2013-11-12 11:56:17 -08:00
Nite Luo
0c0c11be5c
Finish NewSpriteBatchTest
2013-11-12 11:53:53 -08:00
Nite Luo
8c972d96a8
Create new test for NewRenderer
2013-11-12 11:19:18 -08:00
Nite Luo
ab8b61aaec
Create NewSpriteBatchNode to use NewRender
2013-11-12 11:18:49 -08:00
bmanGH
683ce1692d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime
...
Conflicts:
cocos2dx/CCConfiguration.cpp
cocos2dx/draw_nodes/CCDrawNode.cpp
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
cocos2dx/platform/android/CCEGLView.cpp
cocos2dx/platform/ios/EAGLView.mm
cocos2dx/textures/CCTextureAtlas.cpp
cocos2dx/textures/CCTextureAtlas.h
2013-11-12 20:18:04 +08:00
bmanGH
9893fbc514
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
2013-11-12 19:24:09 +08:00
bmanGH
f540131320
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
2013-11-12 18:59:37 +08:00
samuele3
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
Ricardo Quesada
6b29391212
Adds markdown comments in the doxstrings
...
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.
This will make our comments easier to read.
This patch only adds markdown to CCNode.h as a test.
If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
2013-11-11 20:21:01 -08:00
James Chen
42ca4f6122
Merge pull request #4187 from dumganhar/develop
...
#include <algorithm> for std::max, std::min on VS2013.
2013-11-11 18:52:16 -08:00
James Chen
db07c781ab
#include <algorithm> for std::max, std::min on VS2013.
2013-11-12 10:35:50 +08:00
James Chen
cfd82a26bb
Merge pull request #4156 from bopohaa/patch-1
...
closed #3159 : Webp Test Crashes.
2013-11-11 18:31:03 -08:00
Ricardo Quesada
be64dd97cf
replaces `delete[]` with `free()` in C-based API
...
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.
- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`
But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...
So, this patch does:
- Migrates the API from `new []` / `delete[]` to `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
2013-11-11 18:09:47 -08:00
James Chen
cc3a6ebda9
Merge pull request #4150 from ledyba/fix_ccdevice
...
Close X Display
2013-11-11 17:40:32 -08:00
Ricardo Quesada
d6446e9b14
calls `delete[]` instead of `delete`
...
calls `delete[]` instead of `delete`
2013-11-11 16:07:46 -08:00
Nite Luo
a28f3f6f03
Merge branch 'develop' into newRenderer
2013-11-11 12:04:28 -08:00
Nite Luo
f6fb48ba56
Fix crashing bug
2013-11-11 11:54:08 -08:00
James Chen
51cfd3fb4b
Merge pull request #4151 from pyrasis/develop
...
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
d3cf36ba37
Merge pull request #4171 from dumganhar/jsb-64bit-fix
...
[ci skip]Jsb 64bit fix
2013-11-11 02:17:42 -08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
samuele3
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
samuele3
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
minggo
2a31ff04c2
Merge pull request #4166 from dabingnn/iss3025_TextureCache
...
[ci skip]issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 00:46:46 -08:00
James Chen
0151ac60ba
fix 64bit warning. unsigned int (int) —> long.
2013-11-11 16:45:44 +08:00
Nite Luo
f68a2a47e7
Improved batching
2013-11-11 00:14:29 -08:00
Huabing.Xu
dfcae4ed0d
issue #3025 : change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore
2013-11-11 16:04:34 +08:00
Huabing.Xu
3fc16256ab
issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 15:40:12 +08:00
minggo
cd22f5543b
Merge pull request #3997 from ondesly/screen_size_change
...
[ci skip]android & ios screen size change support
2013-11-10 23:10:13 -08:00
minggo
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
James Chen
55cf30b7c8
HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp.
2013-11-11 14:36:43 +08:00
Huabing.Xu
55b9462b17
issue #3025 : directly use _textureCache in Director
2013-11-11 14:21:41 +08:00
minggo
e193311e55
Merge pull request #4161 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warning
2013-11-10 22:10:10 -08:00
boyu0
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00
Huabing.Xu
02da3a29cc
issue #3025 : deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead
2013-11-11 11:38:02 +08:00
Marc Lepage
27b82f8f67
Fix typos and other trivial cleanup
2013-11-10 22:00:50 -05:00
bopohaa
ef92efcd79
Update CCImageCommon_cpp.h
...
webp don't work for me
2013-11-11 02:28:27 +03:00
James Chen
deeaa4d1bc
Merge pull request #4148 from dumganhar/touch-onebyone-available
...
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-10 00:39:30 -08:00
samuele3
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +08:00
samuele3
286393d28e
issue #2868:Add more manual lua binding functions
2013-11-09 22:58:40 +08:00
Lee, Jae-Hong
5e36021d54
[Win32] fix argument type.
...
- argument of interface is a long type.
2013-11-09 23:44:15 +09:00
psi
c4e70387f7
Close display
2013-11-09 23:02:45 +09:00
James Chen
f3a5245bfa
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-09 18:11:57 +08:00
Nite Luo
5a1d92cbf2
Merge branch 'develop' into newRenderer
...
Conflicts:
samples/Cpp/TestCpp/Classes/controller.cpp
2013-11-08 14:01:08 -08:00
Nite Luo
050f3f705e
minor code format fix
2013-11-08 13:57:21 -08:00
Nite Luo
fa9d8fe077
Add CustomCommand
2013-11-08 12:06:39 -08:00
Ricardo Quesada
5faae4a51e
removes exe bit from text files
2013-11-08 11:30:50 -08:00
Huabing.Xu
b726c6fd2c
issue #3025 : move VolatileTexture static function to VolatileTextureMgr
2013-11-08 16:47:33 +08:00
boyu0
4efacdbcf3
issue #2771 : rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs
2013-11-08 16:17:56 +08:00
Huabing.Xu
6f1e98df34
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache
2013-11-08 13:50:22 +08:00
Huabing.Xu
935d472979
issue #3025 : remove TextureCache::_sharedTextureCache
2013-11-08 11:36:27 +08:00
minggo
56d7da8933
Merge pull request #4130 from ricardoquesada/love_in_textfield
...
[ci skip]More std::string& usage
2013-11-07 19:14:35 -08:00
minggo
d2bb1c72cc
Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite
...
[ci skip]add Sprite::setScale(float, float)
2013-11-07 18:54:04 -08:00
Nite Luo
be71eb8626
Merge branch 'develop' into newRenderer
...
Conflicts:
.gitignore
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/2d/CCDirector.cpp
2013-11-07 17:24:57 -08:00
Nite Luo
72828acaec
Add some todo
2013-11-07 16:53:20 -08:00
Nite Luo
935d2bdebb
Implement sprite batching
2013-11-07 16:50:53 -08:00
Nite Luo
d7cb4ed219
First attempt for batching
2013-11-07 15:48:37 -08:00
Ricardo Quesada
ffd4342548
Adds more strings
...
and more `override`
and fixes some indetentation issues
2013-11-07 12:42:16 -08:00
Ricardo Quesada
e4662b371a
TextField uses std::string& in the public API
...
and uses std::string instead of std::string* internally
2013-11-07 11:58:48 -08:00
Nite Luo
3421eb8e5d
Cleanup the code a bit before implement sprite batching
2013-11-07 10:09:53 -08:00
Michael Contento
0160bec3ad
Colors are now compare- and explicit convertible
2013-11-07 18:13:33 +01:00
Huabing.Xu
99bcca0532
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
2013-11-07 19:11:09 +08:00
Huabing.Xu
c8fe6077aa
issue #3025 : Deprecate TextureCache::getInstance() destroyInstance()
2013-11-07 19:10:14 +08:00
Huabing.Xu
99546cef46
issue #3025 : add getTextureCache() in CCdirector()
2013-11-07 18:52:36 +08:00
minggo
237f7a7839
Merge pull request #4125 from minggo/fix-compiling-error
...
[ci skip]fix compiling erros on Android
2013-11-07 02:04:27 -08:00
minggo
b9b14571ac
fix compiling erros on Android
2013-11-07 17:16:31 +08:00
samuele3
8c025a2cee
Reslove the linux compiled error
2013-11-07 15:12:19 +08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
Nite Luo
21cd03bc13
Remove transform from QuadCommand, NewSprite using world coordinates
2013-11-06 16:39:20 -08:00
Nite Luo
63324db70d
Subclass QuadCommand
2013-11-06 14:57:42 -08:00
Nite Luo
3108d499e5
use placeholder logic to generate material id
2013-11-06 14:24:56 -08:00
Michael Contento
b7173cd60d
add Sprite::setScale(float, float)
2013-11-06 14:42:31 +01:00
James Chen
4e4798fdcc
Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix
2013-11-06 15:15:47 +08:00
James Chen
33a243155f
Merge pull request #4107 from dumganhar/cmake
...
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-05 23:09:23 -08:00
James Chen
f3c40a3e7a
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-06 14:54:35 +08:00
minggo
a416a6b258
Merge pull request #4102 from ricardoquesada/uses_string
...
Uses `const std::string&`
2013-11-05 22:14:27 -08:00
Ricardo Quesada
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
Ricardo Quesada
84a6aa29cd
Adds more 64-bit fixes
...
Replaces more `int` with `long` where it makes sense.
Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
2013-11-05 17:36:44 -08:00
Nite Luo
51fb1edc0c
Fix sorting bug
2013-11-05 17:00:34 -08:00
Chris Hannon
471dd07f3b
[android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks
2013-11-05 15:54:31 -05:00
James Chen
963d7f3bd0
Changes the touch id declaration from int to long.
2013-11-05 15:49:58 +08:00
Ricardo Quesada
ba7ed6e578
Fixes some compiler warnings
...
The warnings are related to:
* 64-to-32-bit conversion
* shadow variables
2013-11-04 16:31:36 -08:00
Ricardo Quesada
24ecbc426c
removes Hungarian notation
...
from CCACtionManager and fixes some 64-bit issues.
2013-11-04 16:30:50 -08:00
Ricardo Quesada
8fb5fad20d
Merge branch 'develop' into arm64
2013-11-04 15:02:35 -08:00
Ricardo Quesada
0350ac7021
arm64 support
2013-11-04 11:53:40 -08:00
Nite Luo
e4ffd250cb
Simple implementation of RenderCommand and RenderQueue
2013-11-04 09:14:22 -08:00
James Chen
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
James Chen
daa91ad413
[CMake] Update library dependency.
2013-11-04 21:03:07 +08:00
James Chen
e560de6e4e
HelloCpp works.
2013-11-04 21:03:07 +08:00
James Chen
8676523433
Adding CMakeLists.txt
2013-11-04 21:03:07 +08:00
minggo
25b0ffe853
Merge pull request #4022 from boyu0/iss2771_physical
...
issue #2771 : physical
2013-11-03 18:40:14 -08:00
James Chen
a340f88477
Merge pull request #4073 from ledyba/fix_ccuserdefault
...
closed #3107 : When parsing XML using TinyXML, the data size has to be specified. Otherwise, XMLDocument::Parse(data) will treat data as a null-terminal string. It may cause potential issues.
2013-11-03 00:34:48 -07:00
psi
5443fc0d07
pXmlBuffer is not null terminated
2013-11-03 11:17:04 +09:00
James Chen
e1f821c25d
Merge pull request #4068 from michaelcontento/trigger-onKeyPressed-while-down
...
Trigger onKeyReleased only after the key has been released[ci skip]
2013-11-02 07:12:40 -07:00
James Chen
fd21e3ea38
closed #3106 : fixed: EventListeners can't be removed sometimes.
2013-11-02 22:08:08 +08:00
James Chen
a4b28353a7
Merge commit 'refs/pull/4069/head' of git://github.com/cocos2d/cocos2d-x into eventdispatcher-fix
2013-11-02 21:47:24 +08:00
psi
06f166f613
why not search _toAddedListeners??
2013-11-02 16:03:54 +09:00
Michael Contento
ffad18a1ed
Trigger onKeyReleased only after the key has been released
2013-11-02 06:15:08 +01:00
boyu0
04c8e9f34e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-02 00:12:14 +08:00
James Chen
50c4261092
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 20:53:51 +08:00
minggo
d4210c77bb
Merge pull request #4058 from samuele3hu/developAssetsManager
...
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-11-01 02:50:47 -07:00
boyu0
6d37aa8cd5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-01 17:39:09 +08:00
James Chen
c754e1b64f
Merge pull request #4035 from darkdukey/mousewheel_mac
...
issue #3099 : Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
2013-11-01 02:33:28 -07:00
samuele3
80f3a7d57a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
boyu0
2f67ceb495
issue #2771 : fix some code style
2013-11-01 16:26:03 +08:00
James Chen
ed10b92a60
Fix of including wrong include files.
2013-11-01 15:19:10 +08:00
boyu0
b2951b70ff
issue #2771 : enhance Listener use EventListener mechanism
2013-11-01 14:50:06 +08:00
minggo
f684dc0ff7
Merge pull request #4025 from Dhilan007/di2893
...
issues #2893:perfect new label
2013-10-31 18:46:30 -07:00
minggo
0a9755bcc4
Merge pull request #4037 from samuele3hu/developLabelTTF
...
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
2013-10-31 18:45:42 -07:00
Ricardo Quesada
17af5b6850
Adds flags in GLProgram to prevent sending uneeded uniforms
2013-10-31 17:56:15 -07:00
Dhilan007
150f1aeaab
issue #2893:improve new label
2013-10-31 20:17:30 +08:00
boyu0
2efef34144
issue #2771 : fix vs compile errors
2013-10-31 18:18:02 +08:00
Dhilan007
b8faaeba59
issus #2893:improve new label
2013-10-31 17:52:22 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
samuelhu
15cf519757
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
2013-10-31 16:59:55 +08:00
Nite Luo
771844fc58
Fix android build after adding MouseEvent and MouseTest
2013-10-31 00:40:38 -07:00
Nite Luo
a27975763f
Add MouseEvent to win32 build
2013-10-31 00:04:39 -07:00
Nite Luo
fe04448c8d
Merge folder changes from develop
2013-10-30 23:19:36 -07:00
Dhilan007
12db6a32ab
issues #2893 :
...
1.Texture atlas are create on demand, based on the characters used in the label.
2.Create Quads (and not sprites) for each letter.
2013-10-31 10:49:37 +08:00
boyu0
e8d06496d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-30 17:27:09 +08:00
James Chen
5c8424423e
issue #3069 : Update ios/CCDevice.mm.
2013-10-29 16:29:29 +08:00
James Chen
e2ce714463
issue #3069 : Update device.mm for iOS.
2013-10-29 16:20:42 +08:00
James Chen
ca598f29eb
Merge pull request #4008 from dumganhar/touchevent-refactor
...
issue #3069 : Refactor and Improve EventDispatcher
2013-10-29 00:46:56 -07:00
James Chen
91932ea906
issue #3069 : Fixing compilation errors.
2013-10-29 15:36:43 +08:00
James Chen
fbd04a476a
issue #3069 : Updating comments in CCEventListenerCustom.h.
2013-10-29 15:02:26 +08:00
James Chen
01579e12b0
issue #3069 : Remove unused ID.
2013-10-29 15:01:39 +08:00
James Chen
5698dcd0e1
issue #3069 : Protecting some methods in EventListener, make EventDispatcher as its friend class.
2013-10-29 14:58:47 +08:00
James Chen
296978a9be
issue #3069 : Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'.
2013-10-29 14:57:16 +08:00
Andrew Glass
06bd7fafd5
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
...
When calling GetMethodID a NoSuchMethodError will be raised if the method cannot be found.
See http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp16660
This exception should be cleared if JNI execution is to be continued.
Currently JniHelper informs that the method is not found, but there is no way to continue execution without manually clearing the exception. This prevents checking for the existence of a method and recovering from it being missing.
This fix will clear the exception if JniHelper fails to find the method.
2013-10-28 18:40:58 +00:00
boyu0
66d1bbd89f
issue #2771 : edit physics effect with all bodies and fix some bugs
2013-10-28 16:17:19 +08:00
James Chen
8b7d1934c8
issue #3069 : Using enum class for define Event type and EventListener type.
2013-10-28 16:00:01 +08:00
boyu0
d0d8694091
issue #2771 : fix some retain/release bugs
2013-10-28 11:08:41 +08:00
James Chen
8d11f484a9
issue #3069 : Removing unused comments.
2013-10-28 10:52:23 +08:00
James Chen
0622434321
issue #3069 : Using `std::string` to initialize `EventCustom`. It will be easier for editor parser to emit callback event.
2013-10-28 10:49:21 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
6c6757a04e
issue #3069 : Moving s_eventPriorityIndex to member variable of EventDispatcher.
2013-10-25 17:03:50 +08:00
James Chen
063b012a9c
int --> Event::Type
2013-10-25 16:43:04 +08:00
James Chen
cb7e0b391b
issue #3069 : Removing unused variables in CCEventListenerTouch.h.
2013-10-25 16:37:40 +08:00
James Chen
9bf44a6c83
issue #3069 : Renaming 'removeListeners' to 'removeEventListeners'.
2013-10-25 16:34:26 +08:00
James Chen
0d2d522f12
issue #3069 : int --> EventListener::Type.
2013-10-25 16:15:37 +08:00
James Chen
312e1bd27c
[Dispatcher] Updating comments.
2013-10-25 15:40:21 +08:00
James Chen
efa5afb1c3
[Dispatcher] Removing unused codes in Layer.
2013-10-25 15:19:25 +08:00
James Chen
30a3199a91
[Dispatcher] Removing unused codes.
2013-10-25 15:19:04 +08:00
James Chen
27b71ba73c
Use integer as event type and listener type.
2013-10-25 10:53:47 +08:00
James Chen
c4f9acbee7
disable DUMP_LISTENER_ITEM_PRIORITY_INFO. use std::unordered_map instead of std::map.
2013-10-25 10:53:47 +08:00
James Chen
9632cd7949
memoryleak fix.
2013-10-25 10:53:47 +08:00
James Chen
dc6e201eb6
bug fix for eventdispatcher.
2013-10-25 10:53:46 +08:00
James Chen
5ecb664a58
crash and memory leak fix.
2013-10-25 10:53:46 +08:00
James Chen
aeef62d893
bug fix for EventDispatcher.
2013-10-25 10:53:46 +08:00
James Chen
e59c49a5e3
fix crash.
2013-10-25 10:53:46 +08:00
James Chen
6f9bee5b1a
bug fix in EventDispatcher.
2013-10-25 10:53:46 +08:00
James Chen
9ed263056c
Use eventDispatcher to dispatch event. Remove controller codes in Layer.
2013-10-25 10:53:46 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
f7e2c63230
Refactor event dispatcher. Remove non-node relative member variables.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
James Chen
779e539658
Remove event controller codes from Layer class. HelloCpp works.
2013-10-25 10:53:45 +08:00
samuelhu
a5e479d2bb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-24 11:14:20 +08:00
minggo
914269b4bd
Merge pull request #4001 from minggo/iss2905-adjust_folder
...
issue #2905:ndk-r8e build ok now
2013-10-23 02:47:05 -07:00
minggo
d07d054a01
issue #2905:ndk-r8e build ok now
2013-10-23 17:44:20 +08:00
Dhilan007
dfd69d262a
adjust std:function support 10 parameter
2013-10-23 16:48:51 +08:00
ondesly
969b464b9b
android & ios screen size change support
2013-10-23 12:29:59 +04:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
minggo
d968ef6949
Merge pull request #3990 from Dhilan007/di2905
...
issues #2905:add miss file
2013-10-22 00:58:34 -07:00
Dhilan007
31a2217178
issues #2905:add miss file
2013-10-22 15:56:08 +08:00
minggo
d07fbb8903
Merge pull request #3974 from boyu0/iss2771_physical
...
issue 2771: physical
2013-10-21 22:44:22 -07:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
boyu0
6e2c4801f8
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 16:05:29 +08:00
Dhilan007
6ce34288e0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 15:53:26 +08:00
minggo
5f65cdc3c0
fix xcode compiling error and simplify android.mk
2013-10-18 15:39:09 +08:00
boyu0
d12ee5f120
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 15:34:13 +08:00
Dhilan007
6f39f903e3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 16:23:19 +08:00
James Chen
fd0e84bfa2
Merge pull request #3963 from kpkhxlgy0/use
...
closed #2994 : Can't click the area that outside of keyboard to close keyboard when using EditBox
2013-10-17 00:36:33 -07:00
minggo
e50f9fc43b
issue #2905 : jsbinding samples and lua binding samples build ok on android
2013-10-17 15:04:30 +08:00
XiaoLongHan
a2de02cc19
Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.
2013-10-17 14:21:55 +08:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
410280a8d3
Merge pull request #3945 from minggo/iss2905-adjust_folder
...
issue #2905 : testcpp bild ok on Android
2013-10-15 03:02:12 -07:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
James Chen
438fe70287
issue #2905 : [iOS, Mac] HelloCpp works now.
2013-10-14 15:53:14 +08:00
minggo
92e0dbe0c1
issue #2905:add ccUtils.cpp
2013-10-14 14:56:57 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
ThePickleMan
870f7de357
Readded trimmed semicolon
2013-10-13 23:12:41 -05:00
PickleMan
01ebb2ac29
Added triangle, quad bezier, cubic bezier drawing to DrawNode
2013-10-13 23:41:55 -04:00
minggo
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00