Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
minggo
|
d0ca9a4da5
|
remove unneeded include header files
|
2014-08-27 13:39:50 +08:00 |
xuzhiqiang
|
85dd898319
|
bug fix
|
2014-08-02 08:04:29 +08:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
zifter
|
d875f27c67
|
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
|
2014-05-17 10:40:36 +03:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
zifter
|
249dffa346
|
getter always must be a const method.
|
2014-05-13 23:28:04 +03:00 |
Ricardo Quesada
|
40fe815ab9
|
Squashed commit of the following:
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
|
2014-04-30 19:09:13 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
Huabing.Xu
|
adcacbf5eb
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelAtlas.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/editor-support/cocostudio/CCSGUIReader.cpp
|
2014-04-24 16:58:46 +08:00 |
Dhilan007
|
a4ac5ab054
|
fixed drawDebugData of LabelBMFont/LabelAtlas.
|
2014-04-23 15:05:02 +08:00 |
Huabing.Xu
|
587f65098f
|
Fix compile error after merging
|
2014-04-23 14:59:45 +08:00 |
Huabing.Xu
|
f65973d9f0
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
|
2014-04-23 14:46:14 +08:00 |
Dhilan007
|
75772af82b
|
fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled.
|
2014-04-22 23:18:23 +08:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
Dhilan007
|
8ab057550f
|
fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox.
|
2014-03-28 15:58:28 +08:00 |
Dhilan007
|
dd73be16e0
|
fixed indention.
|
2014-03-28 14:22:51 +08:00 |
Dhilan007
|
898e2136b1
|
LabelTTF and LabelBMFont tagged as deprecated
|
2014-03-28 14:18:01 +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 |
Dhilan007
|
54f48b23e6
|
LabelBMFont re-implemented as a wrapper of Label.
|
2014-02-20 22:33:52 +08:00 |
Luis Parravicini
|
3210e12e1c
|
fixes #3734
|
2014-01-16 14:23:52 -03:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +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 |
Roman "SBKarr
|
b0e6b5a43f
|
AngelCode binary file format support for LabelBMFont
|
2013-12-27 22:32:07 +04:00 |
James Chen
|
febc19ea8d
|
Some warning fixes on linux.
|
2013-12-26 23:06:16 -08:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +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 |
James Chen
|
8c3315de76
|
closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break'
|
2013-12-23 18:23:39 +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 |
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 |
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 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +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 |
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 |
boyu0
|
d4c8fb0be6
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-13 10:47:52 +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 |
boyu0
|
d7106d49be
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-12 17:04:21 +08:00 |
James Chen
|
976bef8b68
|
issue #2790: StringUtils::toStringWithFormat —> StringUtils::format.
|
2013-12-12 09:37:56 +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 |
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 |
minggo
|
fa7c97171b
|
fix some warnings
|
2013-12-06 16:32:06 +08:00 |
minggo
|
b67d567a79
|
replace long with int or ssize_t
|
2013-12-05 17:22:22 +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 |
James Chen
|
1d5984b29a
|
issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach
|
2013-12-04 16:01:02 +08:00 |
James Chen
|
90062b656d
|
issue #2790: Node::_children is Vector<Node*> now.
|
2013-12-04 16:00:17 +08:00 |
Ricardo Quesada
|
a583ad461f
|
CCControlButton has protected constructor
|
2013-11-14 17:19:16 -08:00 |