CocosRobot
cf59264dfe
[AUTO]: updating luabinding automatically
2014-03-31 08:52:27 +00:00
James Chen
9e64140f8a
Merge pull request #6067 from Dhilan007/develop_label
...
1) fixed logical error in Label::updateFont.
2) fixed the font file searching strategy, used FileUtils::isFileExist to check whether the font file exist rather than find . letter.
2014-03-31 16:11:59 +08:00
Dhilan007
d39a419eeb
fixed logical error in Label::create.
2014-03-31 16:06:20 +08:00
Dhilan007
89eba4424f
fixed logical error.
2014-03-31 15:45:06 +08:00
minggo
98ed579b34
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301
...
Fixed bugs for Editor
2014-03-31 15:37:45 +08:00
Dhilan007
774debd142
fixed logical error in Label::updateFont.
2014-03-31 15:29:24 +08:00
samuele3hu
849d462c11
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
2014-03-31 12:05:45 +08:00
samuele3hu
c38388cc62
ccvector_to_luaval would lead to memory leak because call the `retain`
2014-03-31 12:04:47 +08:00
Dhilan007
cffdb129c9
change type of Label::_shadowNode
2014-03-31 11:47:28 +08:00
pipu
4c1cbabb5e
fixed bugs
2014-03-31 11:34:26 +08:00
Dhilan007
08beaa3532
TextFieldTTF:fixed display incorrect color.
2014-03-31 11:16:12 +08:00
minggo
f80bdfff76
Merge pull request #6055 from MSOpenTech/wp8-3.0
...
Cocos2d-x 3.0 Windows Phone 8 support
2014-03-29 23:21:34 +08:00
Dale Stammen
958c7fdf9d
added winrt and wp8 project files and property sheets
2014-03-28 16:02:23 -07:00
Dale Stammen
b2d3dbf0fe
added wp8 support files and projects
2014-03-28 15:39:20 -07:00
Dale Stammen
6970955378
added wp8 support files and projects
2014-03-28 15:32:52 -07:00
Dale Stammen
31150ce189
added wp8 support files and projects
2014-03-28 12:55:40 -07:00
Dale Stammen
97bdaad41b
added wp8 and winrt support files and projects
2014-03-28 12:53:35 -07:00
Dale Stammen
afe561cccc
added wp8 and winrt support files and projects
2014-03-28 12:52:16 -07:00
Dale Stammen
db8efd32f7
fixed reserved word DELETE in wp8 compiler
2014-03-28 11:26:41 -07:00
Dale Stammen
77efd401a7
intialize _hasMipmaps to false in constructor
2014-03-28 11:25:57 -07:00
Dale Stammen
6ad8ec00ed
added missing variadicCreate for wp8
2014-03-28 11:25:39 -07:00
Maks Naumov
9644d68259
fix cmake win32 project generation
2014-03-28 19:06:13 +02:00
pipu
733b364b51
Fixed bugs for Editor
2014-03-28 18:54:06 +08:00
minggo
c7fb226f11
Merge pull request #5929 from shujunqiao/cocos-console-test
...
Cocos console test
2014-03-28 18:34:21 +08:00
James Chen
1c5cff089e
Merge pull request #6050 from CocosRobot/update_lua_bindings_1396001378
...
[AUTO]: updating luabinding automatically
2014-03-28 18:11:59 +08:00
CocosRobot
494321a674
[AUTO]: updating luabinding automatically
2014-03-28 10:11:08 +00:00
James Chen
c43b0f6cb0
Merge pull request #6043 from andyque/fix4590
...
closed #4590 , fixed rewind problems
2014-03-28 18:04:43 +08:00
James Chen
581ef454eb
Merge pull request #6047 from samuele3hu/develop_test
...
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 18:04:12 +08:00
James Chen
15e584a83c
Merge pull request #6048 from pandamicro/ConstructorAccess2
...
Issue #3897 : Add missed constructors
2014-03-28 18:03:35 +08:00
pandamicro
74a4aa793d
Issue #3897 : Move OrbitCamera constructor into cpp
2014-03-28 18:00:25 +08:00
shujunqiao
9ffb26fdc9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-28 17:50:29 +08:00
pandamicro
26f5107381
Reverse CONSTRUCTOR_ACCESS to protected
2014-03-28 17:45:35 +08:00
pandamicro
5fc8050d9e
Issue #3897 : Add missed constructors
2014-03-28 17:45:06 +08:00
James Chen
9836f11543
Merge pull request #6046 from Dhilan007/develop_label
...
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
2014-03-28 17:23:24 +08:00
samuele3hu
7ca207f993
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 17:18:41 +08:00
Dhilan007
cb50741f5d
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
2014-03-28 16:52:48 +08:00
andyque
5a9af407dc
closed #4590 , remove -> property access
2014-03-28 16:41:33 +08:00
CocosRobot
07d1a54a92
[AUTO]: updating luabinding automatically
2014-03-28 08:20:29 +00:00
andyque
97883acfb1
closed #4590 , fixed rewind problems
2014-03-28 15:59:04 +08:00
Dhilan007
8ab057550f
fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox.
2014-03-28 15:58:28 +08:00
James Chen
ecad5ea3ce
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011 .
2014-03-28 14:55:15 +08:00
James Chen
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +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
CocosRobot
bb1b6f96fb
[AUTO]: updating luabinding automatically
2014-03-28 06:17:06 +00:00
James Chen
e87f6991cf
User object has to be released before others, since userObject may have a weak reference of this node.
...
It may invoke `node->stopAllAction();` while `_actionManager` is null if the next line is after `CC_SAFE_RELEASE_NULL(_actionManager)`.
2014-03-28 14:09:51 +08:00
James Chen
c266647447
ParticleSystem should also override `onExit` to unschedule update since in `onEnter`, it will be scheduled again. Otherwise, it'll trigger an assert.
2014-03-28 14:05:38 +08:00
pandamicro
65f4c23004
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-28 13:56:09 +08:00
shujunqiao
411bb95025
add [director end] command's explain in CCConsole.cpp.
2014-03-28 13:50:06 +08:00
shujunqiao
ff4b83813c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-28 13:41:18 +08:00