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 |
minggo
|
55911e1e78
|
Merge pull request #6356 from Dhilan007/develop_v3
fixed drawDebugData of LabelBMFont/LabelAtlas.
|
2014-04-23 15:24:30 +08:00 |
minggo
|
1c15d7fd08
|
Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader
Fixed bug of gui reader
|
2014-04-23 15:16:31 +08:00 |
Dhilan007
|
a4ac5ab054
|
fixed drawDebugData of LabelBMFont/LabelAtlas.
|
2014-04-23 15:05:02 +08:00 |
CaiWenzhi
|
4750e8b417
|
Fixed bug of gui reader
|
2014-04-23 15:02:35 +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 |
minggo
|
506d628619
|
Merge pull request #6352 from natural-law/develop
Solve compiling errors when some macros changed in ccConfig.h.
|
2014-04-22 17:00:28 +08:00 |
minggo
|
ccc935137b
|
Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
|
2014-04-22 16:53:32 +08:00 |
zhangbin
|
2305ba59e6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos/2d/CCActionInterval.cpp
|
2014-04-22 16:49:27 +08:00 |
zhangbin
|
093bd20a74
|
Solve compiling errors when some macros changed in ccConfig.h.
|
2014-04-22 16:42:13 +08:00 |
James Chen
|
b8e77d8968
|
Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION
|
2014-04-21 22:38:15 -07:00 |
James Chen
|
99654289ed
|
Invokes 'Node::onExit' only when the node is running.
|
2014-04-21 22:31:34 +08:00 |
James Chen
|
8038d3daa5
|
Fixed tilemaptest crashes when click 'next' button quickly
|
2014-04-21 22:24:44 +08:00 |
Huabing.Xu
|
7a38050e09
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-21 17:47:34 +08:00 |
Huabing.Xu
|
83ee1b4bdc
|
android OK
|
2014-04-21 17:38:10 +08:00 |
Huabing.Xu
|
68e058b12d
|
IOS/Mac OK: remove kazMath
Make code compatible with old tests
|
2014-04-21 17:37:52 +08:00 |
minggo
|
3ac08b7349
|
Merge pull request #6300 from elvman/develop
Flipping RenderTexture's sprite instead of scaling it by -1
|
2014-04-21 15:23:10 +08:00 |
CocosRobot
|
77130708c2
|
[AUTO]: updating luabinding automatically
|
2014-04-21 06:45:09 +00:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
minggo
|
02c2fc8abf
|
Merge pull request #6333 from chuanweizhang2013/luaruntime
translate
|
2014-04-21 14:06:32 +08:00 |
minggo
|
8a75bccdc1
|
Merge pull request #6332 from minggo/develop
update version
|
2014-04-21 13:44:40 +08:00 |
minggo
|
b53b9ceb3e
|
update version
|
2014-04-21 13:43:42 +08:00 |
chuanweizhang2013
|
1fe52b1557
|
translate
|
2014-04-21 11:07:14 +08:00 |
minggo
|
1c44dbe385
|
Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
|
2014-04-21 11:02:11 +08:00 |
boyu0
|
a1024353f1
|
issue #4904: fix iOS Image::safeToFile crashes when save jpg file.
|
2014-04-21 10:25:34 +08:00 |
Huabing.Xu
|
e74f8719cf
|
fix warning in compiling
|
2014-04-21 09:52:59 +08:00 |
Huabing.Xu
|
3b83d52f95
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
|
2014-04-19 00:30:34 +08:00 |
minggo
|
8e83cd7900
|
Merge pull request #6261 from iSevenDays/patch-9
Fix memory leak
|
2014-04-18 14:19:17 +08:00 |
minggo
|
0e7280b1ca
|
Merge pull request #6304 from dumganhar/iss4568-crash
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
|
2014-04-18 14:00:40 +08:00 |
minggo
|
b7e5306275
|
Merge pull request #6313 from chuanweizhang2013/luaruntime
update android runtime
|
2014-04-18 13:59:32 +08:00 |
samuele3hu
|
7e81f32016
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
|
2014-04-18 11:55:30 +08:00 |
samuele3hu
|
914516a4e0
|
fix the compile error about luabindings and add the `RichText` test cases.
|
2014-04-18 11:54:57 +08:00 |
chuanweizhang2013
|
2a9c99ff66
|
Merge pull request #25 from cocos2d/develop
update cocos2d-x
|
2014-04-18 11:45:53 +08:00 |
CocosRobot
|
a78a1090c3
|
[AUTO]: updating luabinding automatically
|
2014-04-18 02:51:14 +00:00 |
minggo
|
7399ef2527
|
Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize
Develop nutty widgetsupportscontentsize
|
2014-04-18 10:47:10 +08:00 |
minggo
|
a8a8ef85e6
|
add comment for EventListenerTouchOneByOne::checkAvailable()
|
2014-04-17 14:46:52 +08:00 |
CaiWenzhi
|
a8bfa094c0
|
Remove useless codes
|
2014-04-17 14:27:21 +08:00 |
CaiWenzhi
|
ed4fcd5d1a
|
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
|
2014-04-17 14:23:08 +08:00 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +08:00 |
samuele3hu
|
11515f6ab3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
|
2014-04-17 11:06:20 +08:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
James Chen
|
30e1d41dbf
|
Makes 'compareRenderCommand' as a static function instead of a global function
|
2014-04-17 10:16:37 +08:00 |
andyque
|
a9ed075d50
|
closed #4883. fixed slider hittest problem
|
2014-04-17 10:15:58 +08:00 |
James Chen
|
63f54cb5f7
|
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
|
2014-04-17 10:15:11 +08:00 |
Elviss Strazdins
|
5ddef013ba
|
Flipping RenderTexture's sprite instead of scaling it by -1
|
2014-04-17 02:22:34 +03:00 |
Huabing.Xu
|
d14d3007d0
|
remove kazmath include file
|
2014-04-16 14:08:58 +08:00 |
Huabing.Xu
|
346d42f723
|
remove warning message---finished
|
2014-04-16 11:20:45 +08:00 |
Huabing.Xu
|
6fd7197d96
|
remove warning message---continue
|
2014-04-16 11:18:23 +08:00 |