8278a510aa
Label:fixed shadow offset didn't consider 'contentScaleFactor'
2014-03-25 10:41:53 +08:00
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
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
45d4397d20
Issue #3897 : Make Constructors public in Cocos2d-JS
2014-03-24 22:05:19 +08:00
759ec61639
closed #4513 : Particle doesn't animate when readd it.
2014-03-24 18:08:55 +08:00
ae2027ea53
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
2014-03-24 17:59:44 +08:00
e075b82dfe
tab -> 4 spaces, whitespace cleanup.
2014-03-24 17:58:35 +08:00
b6a175457c
Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923
2014-03-24 17:55:43 +08:00
bdfcc6c8cc
Issue #3897 : Add missed constructors
2014-03-24 17:44:01 +08:00
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
db7057e6f2
closed #4529 : Stroke size and shadow offset don't consider ContentScaleFactor
2014-03-24 16:58:31 +08:00
892662c5ef
Merge pull request #5932 from pandamicro/ComponentScriptSupport
...
Component script support
2014-03-24 14:41:16 +08:00
6a8dfc4664
Fixed #4512 : JSB script support added to Component
2014-03-24 14:24:27 +08:00
538c01e76e
label:support clip blank of upper and lower margin.
2014-03-24 14:16:27 +08:00
b41879916c
issue #4429 , fixed Value to string precesion error
2014-03-24 12:03:25 +08:00
1254bf8f1e
Merge pull request #19 from cocos2d/develop
...
update cocos2d-x
2014-03-24 12:00:30 +08:00
4a974e24df
revert vcxproj files
2014-03-24 10:50:48 +08:00
f5795c25b6
remove warnings under win32
2014-03-24 10:12:40 +08:00
ea9fb140fa
no mp3 support for wp8
2014-03-22 06:13:02 -07:00
3834d4e80b
fix for ABSOLUTE reserved word in wp8 compiler
2014-03-22 06:12:32 -07:00
762433e8aa
enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8
2014-03-22 06:12:04 -07:00
a14728f184
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:11:27 -07:00
347f91fcb6
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:11:10 -07:00
6a4d459c77
Disabled console for wp8/winrt until networking code is added
2014-03-22 06:10:54 -07:00
aa0dae4d1f
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:10:07 -07:00
6ee7f5d325
added CC_PLATFORM_WINRT and WP8
2014-03-22 06:09:48 -07:00
bfaa5882fe
fix for RELATIVE reserved word in wp8 compiler
2014-03-22 06:09:16 -07:00
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07:00
b50a158b62
need to terminate variable args list with NULL. nullptr will not work with wp8 compiler
2014-03-22 06:04:36 -07:00
2577fc39d8
#pragma mark for ios and mac only
2014-03-22 05:58:37 -07:00
fb574697aa
added support for precompiled shaders in wp8
2014-03-22 05:58:07 -07:00
5e402ee433
fix for generic already defined in wp8
2014-03-22 05:56:49 -07:00
294341d0ab
fixed texture memory leak and added comments to indicate problem
2014-03-22 05:56:08 -07:00
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
f6b57df505
added WP8 and WINRT platforms
2014-03-22 05:53:09 -07:00
77ab59ebab
#pragma mark for ios and mac only
2014-03-22 05:52:45 -07:00
409ad77b6c
disabled webp for wp8 and winrt
2014-03-22 05:51:39 -07:00
e3e4e88bce
added WP8 and WINRT platforms
2014-03-22 05:50:55 -07:00
ba37c07053
[add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code
...
-update static connect method to match JS API, kept original method but marked deprecated
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2014-03-21 11:45:14 -04:00
7e526f1976
Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw
...
closed #4498 : Refactor PhysicsDebugDraw.
2014-03-21 16:50:42 +08:00
832ab120aa
Merge pull request #5862 from samuele3hu/develop_script_mgr
...
closed #4452 : Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
2014-03-21 16:48:53 +08:00
3bd000b236
[AUTO]: updating luabinding automatically
2014-03-21 08:38:19 +00:00
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
5edb9b9f86
closed #4499 : Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist.
2014-03-21 16:25:22 +08:00
41f9760f15
closed #4498 : Refactor PhysicsDebugDraw.
2014-03-21 15:49:18 +08:00
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
bc13956981
closed #3509 : PhysicsBody moves randomly when switch foreground/background.
2014-03-21 15:16:55 +08:00
4721306fef
[AUTO]: updating luabinding automatically
2014-03-21 07:01:27 +00:00
8f27611539
Merge pull request #5908 from CocosRobot/update_lua_bindings_1395383144
...
[AUTO]: updating luabinding automatically
2014-03-21 14:53:40 +08:00
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
566c014060
[AUTO]: updating luabinding automatically
2014-03-21 06:26:33 +00:00
1a08cd9b32
fix typo.
2014-03-21 13:52:12 +08:00
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
e2ed17f69c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
2014-03-21 11:28:39 +08:00
71f3cb7862
close #4452:Make `addCustomHandler` more distinct
2014-03-21 11:24:24 +08:00
d5e8bde89e
Merge pull request #5889 from samuele3hu/develop_socket
...
close #4400 : Use the latest version of LuaSocket and modify the related project config
2014-03-21 10:52:38 +08:00
6b74794c74
fix typo and mistake in Label::setTextColor.
2014-03-21 09:47:29 +08:00
3cde66dce8
Merge pull request #5854 from boyu0/iss4424_setgravityenable_fix
...
closed #4424 : fix PhysicsBody::setGravityEnable() doesn't work correctly sometimes
2014-03-21 09:34:33 +08:00
9dfa099bef
Label:Refactoring related functions of color.
2014-03-20 20:56:10 +08:00
c3ef689724
Merge pull request #5890 from dumganhar/iss4462-ccb
...
closed #4462 : Wrong logic in CCBAnimationManager::moveAnimationsFromNode...
2014-03-20 18:24:54 +08:00
b3cfc693ca
Merge pull request #5887 from andyque/fix_tests_warnings
...
Fix warnings in cpp-tests.
2014-03-20 18:24:10 +08:00
21a21c2d3d
close #4400 : Update the anrroid.mk for lua-bindings
2014-03-20 18:09:52 +08:00
11bbeb4a30
close #4452:Using better spelling format
2014-03-20 17:56:33 +08:00
dcd919d9f7
closed #4462 : Wrong logic in CCBAnimationManager::moveAnimationsFromNode.
2014-03-20 17:43:44 +08:00
977ef0092b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
2014-03-20 17:43:28 +08:00
4b25c9f62e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
2014-03-20 17:07:33 +08:00
d3487d2d3c
close #4400 : Use the newest version of LuaSocket for lua
2014-03-20 17:04:54 +08:00
cf86fd619f
fix lua bindings warnings
2014-03-20 16:48:12 +08:00
f26ae8a019
remove unused params warnings
2014-03-20 16:34:42 +08:00
7ab639ec0f
fix lots compile warnings
2014-03-20 16:24:55 +08:00
0f22720da5
[AUTO]: updating luabinding automatically
2014-03-20 07:25:03 +00:00
8c1bf48357
fixed label font size: from int to float
2014-03-20 15:03:48 +08:00
e6645400a3
fix a paramers miss match
2014-03-20 14:54:09 +08:00
ae3310bffb
Merge branch 'develop' into fix_warnings
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2014-03-20 14:50:02 +08:00
2dcc600fa1
remove unused accelerometer
2014-03-20 14:29:05 +08:00
86d013b162
Merge pull request #5844 from heliclei/refactor-console-upload
...
refactor upload:encode file with base64, detach upload from main loop
2014-03-20 14:26:59 +08:00
abf7598b1c
remove deprecated classes in CCNodeLoader
2014-03-20 14:17:48 +08:00
8a409db1b6
change setFontSize from int to float
2014-03-20 14:14:02 +08:00
957eb9363e
fix win32 compile error
2014-03-20 13:42:09 +08:00
ca6851f114
fix warnings of font and RichText
2014-03-20 11:58:36 +08:00
6c16f16b1d
fix CCDirectorCaller warnings
2014-03-20 11:32:43 +08:00
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
9ba9687fc1
closed #4424 : change name _enable->_enabled, _rotationEnable->_rotationEnabled, _gravityEnable->_gravityEnabled
2014-03-20 10:21:59 +08:00
4b7f729154
[AUTO]: updating luabinding automatically
2014-03-20 02:21:28 +00:00
d7b3737605
fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings
2014-03-20 10:14:25 +08:00
0afcf59539
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
2014-03-20 09:56:06 +08:00
0026fc2b2a
close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
2014-03-20 09:54:38 +08:00
13df593ae7
file attributes fixed
2014-03-19 18:58:19 +04:00
0a57a5be11
[AUTO]: updating luabinding automatically
2014-03-19 10:32:42 +00:00
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
0d4afe3c54
reset files
2014-03-19 18:12:09 +08:00
aef2ccac11
Merge commit 'refs/pull/5871/head' of https://github.com/cocos2d/cocos2d-x into luamerage
2014-03-19 18:09:06 +08:00
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
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
a1ca3195ce
Rename `addConsoleHandler` to `addCustomHandler`
2014-03-19 17:28:23 +08:00
740aa30713
closed #4447 : [Desktop] Can't receive touchEnded event when mouse up outside of window
2014-03-19 17:09:10 +08:00
c90ef00668
add bool support for other platform
2014-03-19 16:47:57 +08:00
bab53ef2bd
add test for ios and mac
2014-03-19 16:47:57 +08:00
cadbfbe9b1
add Bool Integer Float Double support to CCDictionary
2014-03-19 16:47:57 +08:00
00249328a6
add boolean support for mac and ios
2014-03-19 16:47:57 +08:00
dc9baa7c72
closed #4382 : added missed scaleZ feature for scaleZ
2014-03-19 16:23:14 +08:00
f0fdcb22d3
[AUTO]: updating luabinding automatically
2014-03-19 06:14:23 +00:00
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
a432f488bd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
2014-03-19 10:51:42 +08:00
a91994f242
Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest.
2014-03-19 10:50:11 +08:00
bb17da8f88
add override for Label::updateDisplayedColor
2014-03-19 10:36:44 +08:00
f76460aee8
closed issue#4434:fixed display incorrect color of label if create by font name.
2014-03-19 10:10:47 +08:00
781ff463a2
[AUTO]: updating luabinding automatically
2014-03-19 01:56:50 +00:00
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
c4aaaf9231
closed #4424 : fix PhysicsBody::setGravity() doesn't work correctly sometimes.
2014-03-18 16:17:43 +08:00
a346d71a91
fixed reserlution order
2014-03-18 15:56:01 +08:00
fc5a34e500
[AUTO]: updating luabinding automatically
2014-03-18 07:55:30 +00:00
a286ed8374
fixed typo.
2014-03-18 13:48:41 +08:00
76abe8d1c9
make FileUtilsWin32::getWritablePath() return value unified whether release or debug
2014-03-18 10:51:07 +08:00
da26dc0138
Merge pull request #18 from cocos2d/develop
...
update cocos2d-x
2014-03-18 10:13:18 +08:00
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
fe1bc368ec
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:46:17 +08:00
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +08:00
46a4c17097
change access specifier of SpriteBatchNode::addSpriteWithoutQuad.
2014-03-17 19:31:58 +08:00
cc671835f8
closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line.
2014-03-17 18:33:15 +08:00
295bf7f7f2
rename variable
2014-03-17 11:06:50 +08:00
1cf064a7d7
Merge branch 'cmdconsole' into luamerage
2014-03-16 10:06:46 +08:00
9167d39959
space
2014-03-15 18:18:56 +08:00
0a9ec91d6c
init Console variable
2014-03-15 18:13:29 +08:00
1e551f8ca4
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
...
Conflicts:
templates/lua-template-runtime/src/main.lua
2014-03-15 10:37:26 +08:00
ea9a9bceb2
update lua debugger
2014-03-15 10:34:21 +08:00
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
e20676f939
fixed content size of MenuItem is incorrect when font size or font name change.
2014-03-15 01:24:23 +08:00
1c96c595ac
Merge pull request #5817 from dumganhar/develop
...
Fix potential overflow in Texture::getCachedTextureInfo and where uses MultiByteToWideChar and WideCharToMultiByte
2014-03-15 01:23:00 +08:00
dfb3b6719c
Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator
...
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
2014-03-15 01:22:28 +08:00
f23db68151
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
2014-03-15 01:19:06 +08:00
a47923e06d
Fix potential overflow in Texture::getCachedTextureInfo.
2014-03-15 01:09:22 +08:00
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
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
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
9bc48a7ac1
PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm.
2014-03-14 18:40:04 +08:00
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
edde48e132
Merge pull request #5798 from Dhilan007/develop_label
...
closed #4377 : LabelAtlas::setColor takes no effect.
2014-03-14 18:07:36 +08:00
c4d91f512d
LabelAtlas:fixed display incorrect color.
...
MenuItem:using Label to replace LabelTTF.
2014-03-14 17:36:05 +08:00
ad5f870f7c
fix close crash in linux and mac
2014-03-14 17:21:27 +08:00
a090729b6e
[AUTO]: updating luabinding automatically
2014-03-14 08:44:57 +00:00
90f5d6511e
fix win32 crash while click close button.
2014-03-14 16:13:32 +08:00
189733abac
[AUTO]: updating luabinding automatically
2014-03-14 07:56:39 +00:00
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
177bf4df9d
Some warning fixes.
2014-03-14 15:38:43 +08:00
a94b82e738
Updates VS project to fix compilation errors when building in Release mode.
2014-03-14 15:30:12 +08:00
5f6fbc6a33
label:fixed getter for font size and font name.
2014-03-14 15:18:45 +08:00
971b1dd557
Label:fixed text display incorrect when come to foreground on android.
2014-03-14 14:59:26 +08:00
36bfd6d2c2
label:fixed incorrect effect of outline.
2014-03-14 09:51:39 +08:00
263c83fd88
Merge pull request #5775 from CocosRobot/update_lua_bindings_1394716568
...
[AUTO]: updating luabinding automatically
2014-03-13 21:19:13 +08:00
c9259bb800
[AUTO]: updating luabinding automatically
2014-03-13 13:17:32 +00:00
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
fe6f485a6b
label:rename some API for clearly.
2014-03-13 21:00:36 +08:00
b0b1645190
fix some physics bugs.
2014-03-13 20:56:51 +08:00
62d0fa8564
label:rename some API for clearly.
2014-03-13 20:52:33 +08:00
c4e20dd63a
fix ease action error
2014-03-13 19:53:06 +08:00
bc68c6b629
Refactor setter of label's font name and font size.
2014-03-13 18:46:35 +08:00
b1becd3fae
[AUTO]: updating luabinding automatically
2014-03-13 06:51:53 +00:00
6d8bc4e616
[AUTO]: updating luabinding automatically
2014-03-13 03:45:57 +00:00
ad316654c2
Merge pull request #5743 from heliclei/remove-node-name
...
remove node name related features from v3.0
2014-03-13 11:09:49 +08:00
c26b103b23
remove node name related features from v3.0
2014-03-13 10:45:02 +08:00
a4d558adee
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-13 10:25:32 +08:00
b8ce59962a
Fixed bug of ScrollView
2014-03-13 10:11:41 +08:00
ac0aecb394
Merge pull request #5737 from dumganhar/runtime-fix
...
Lua Runtime fix
2014-03-12 21:48:35 +08:00
77a8476c80
GLView::end needs to release self.
2014-03-12 21:45:57 +08:00
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
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
67e3a25582
Merge pull request #5669 from nutty898/develop_nutty_modify_framework_for315CrashFixed
...
Develop nutty modify framework for315 crash fixed
2014-03-12 19:45:46 +08:00
e93feaa068
[AUTO]: updating luabinding automatically
2014-03-12 11:41:17 +00:00
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
2a3cb0847e
refactor api name
2014-03-12 18:10:45 +08:00
4d99736e4a
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-12 17:06:48 +08:00
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
c11ef679da
fixed incorrect initial value of label's TextVAlignment.
2014-03-12 16:11:12 +08:00
9c980dfcfe
Merge pull request #5706 from dumganhar/rename-tests
...
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
2014-03-12 15:48:29 +08:00
eae6880599
Adds 'ui' include path in liblua.vcxproj
2014-03-12 15:44:56 +08:00
31b304af26
[AUTO]: updating luabinding automatically
2014-03-12 07:43:13 +00:00
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
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
f5daf1af24
label:change default font size
2014-03-12 15:30:14 +08:00
ca27bc4d6f
Merge pull request #5703 from Dhilan007/develop_label
...
label:fixed crash and incorrect getter.
2014-03-12 15:23:06 +08:00
2786b40dc3
using string::empty() for judge whether string is empty.
2014-03-12 15:03:22 +08:00
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
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
02971082ba
Merge pull request #5700 from dumganhar/develop
...
Some fixes: [lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
Some warning fixes in TriggerMng.cpp and TriggerObj.cpp
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since after re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now. We need to fix this as soon as possible.
2014-03-12 14:21:10 +08:00
d57d2f3059
Merge remote-tracking branch 'upstream/develop' into walk-node-tree
2014-03-12 14:19:55 +08:00
a907580d0a
use lambda callback
2014-03-12 14:15:45 +08:00
176a9b5fe6
Some warning fixes in TriggerMng.cpp and TriggerObj.cpp
2014-03-12 14:07:34 +08:00
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
41c689c545
[AUTO]: updating luabinding automatically
2014-03-12 03:31:17 +00:00
44dd1855e5
Merge pull request #5692 from CocosRobot/update_lua_bindings_1394594250
...
[AUTO]: updating luabinding automatically
2014-03-12 11:18:58 +08:00
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
e3c821b32b
[AUTO]: updating luabinding automatically
2014-03-12 03:18:20 +00:00
6baea45db6
Merge pull request #5679 from Dhilan007/develop_label
...
issue #4337 : Two fixes for new label:
1. Color and opacity can't take effect.
2. The font size passed to new Label didn't consider 'contentScaleFactor'.
2014-03-12 11:17:49 +08:00
6f165bb592
fixed incorrect initial value of label type.
2014-03-12 11:06:51 +08:00
aefafdbe77
Add conditions to evaluate for setter of font size and font name.
2014-03-12 10:53:51 +08:00
2c2a5ee38e
rename gui to ui
2014-03-12 10:46:49 +08:00
bc7e39283f
issue #3821:LabelTTF re-implemented as a wrapper of Label.
2014-03-12 10:19:33 +08:00
8e125734fe
Merge branch 'develop' into fix_gui_to_ui
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/cpp-tests/Resources/cocosgui/100/100.ExportJson
samples/cpp-tests/Resources/cocosgui/100/1000.plist
samples/cpp-tests/Resources/cocosgui/100/1000.png
samples/cpp-tests/Resources/cocosgui/CloseNormal.png
samples/cpp-tests/Resources/cocosgui/CloseSelected.png
samples/cpp-tests/Resources/cocosgui/CocoGUISample.json
samples/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
samples/cpp-tests/Resources/cocosgui/Hello.png
samples/cpp-tests/Resources/cocosgui/Marker Felt.ttf
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
samples/cpp-tests/Resources/cocosgui/UITest/UITest.json
samples/cpp-tests/Resources/cocosgui/UITest/b1.png
samples/cpp-tests/Resources/cocosgui/UITest/b2.png
samples/cpp-tests/Resources/cocosgui/UITest/background.png
samples/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UITest/f1.png
samples/cpp-tests/Resources/cocosgui/UITest/f2.png
samples/cpp-tests/Resources/cocosgui/UITest/r1.png
samples/cpp-tests/Resources/cocosgui/UITest/r2.png
samples/cpp-tests/Resources/cocosgui/UITest/ribbon.png
samples/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
samples/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
samples/cpp-tests/Resources/cocosgui/arrow.png
samples/cpp-tests/Resources/cocosgui/b11.png
samples/cpp-tests/Resources/cocosgui/backtotopnormal.png
samples/cpp-tests/Resources/cocosgui/backtotoppressed.png
samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
samples/cpp-tests/Resources/cocosgui/button.png
samples/cpp-tests/Resources/cocosgui/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/ccicon.png
samples/cpp-tests/Resources/cocosgui/check_box_active.png
samples/cpp-tests/Resources/cocosgui/check_box_active_disable.png
samples/cpp-tests/Resources/cocosgui/check_box_active_press.png
samples/cpp-tests/Resources/cocosgui/check_box_normal.png
samples/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
samples/cpp-tests/Resources/cocosgui/check_box_normal_press.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
samples/cpp-tests/Resources/cocosgui/examples/equip/111.png
samples/cpp-tests/Resources/cocosgui/examples/equip/12.png
samples/cpp-tests/Resources/cocosgui/examples/equip/13.png
samples/cpp-tests/Resources/cocosgui/examples/equip/14.png
samples/cpp-tests/Resources/cocosgui/examples/equip/15.png
samples/cpp-tests/Resources/cocosgui/examples/equip/2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosgui/examples/examples.json
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosgui/green_edit.png
samples/cpp-tests/Resources/cocosgui/grossini-aliases.png
samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
samples/cpp-tests/Resources/cocosgui/labelatlas.png
samples/cpp-tests/Resources/cocosgui/loadingbar.png
samples/cpp-tests/Resources/cocosgui/scrollviewbg.png
samples/cpp-tests/Resources/cocosgui/slidbar.png
samples/cpp-tests/Resources/cocosgui/sliderProgress.png
samples/cpp-tests/Resources/cocosgui/sliderProgress2.png
samples/cpp-tests/Resources/cocosgui/sliderThumb.png
samples/cpp-tests/Resources/cocosgui/sliderTrack.png
samples/cpp-tests/Resources/cocosgui/sliderTrack2.png
samples/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
samples/cpp-tests/Resources/cocosgui/sliderballnormal.png
samples/cpp-tests/Resources/cocosgui/sliderballpressed.png
samples/cpp-tests/Resources/cocosgui/switch-mask.png
samples/cpp-tests/Resources/cocosui/100/100.ExportJson
samples/cpp-tests/Resources/cocosui/100/1000.plist
samples/cpp-tests/Resources/cocosui/100/1000.png
samples/cpp-tests/Resources/cocosui/CloseNormal.png
samples/cpp-tests/Resources/cocosui/CloseSelected.png
samples/cpp-tests/Resources/cocosui/CocoGUISample.json
samples/cpp-tests/Resources/cocosui/CocoGUI_PageView_Sample.json
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.plist
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.png
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson
samples/cpp-tests/Resources/cocosui/Hello.png
samples/cpp-tests/Resources/cocosui/Marker Felt.ttf
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/silder_progressBar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar_button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
samples/cpp-tests/Resources/cocosui/UITest/UITest.json
samples/cpp-tests/Resources/cocosui/UITest/b1.png
samples/cpp-tests/Resources/cocosui/UITest/b2.png
samples/cpp-tests/Resources/cocosui/UITest/background.png
samples/cpp-tests/Resources/cocosui/UITest/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UITest/f1.png
samples/cpp-tests/Resources/cocosui/UITest/f2.png
samples/cpp-tests/Resources/cocosui/UITest/r1.png
samples/cpp-tests/Resources/cocosui/UITest/r2.png
samples/cpp-tests/Resources/cocosui/UITest/ribbon.png
samples/cpp-tests/Resources/cocosui/animationbuttonnormal.png
samples/cpp-tests/Resources/cocosui/animationbuttonpressed.png
samples/cpp-tests/Resources/cocosui/arrow.png
samples/cpp-tests/Resources/cocosui/b11.png
samples/cpp-tests/Resources/cocosui/backtotopnormal.png
samples/cpp-tests/Resources/cocosui/backtotoppressed.png
samples/cpp-tests/Resources/cocosui/bitmapFontTest2.fnt
samples/cpp-tests/Resources/cocosui/bitmapFontTest2.png
samples/cpp-tests/Resources/cocosui/button.png
samples/cpp-tests/Resources/cocosui/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/ccicon.png
samples/cpp-tests/Resources/cocosui/check_box_active.png
samples/cpp-tests/Resources/cocosui/check_box_active_disable.png
samples/cpp-tests/Resources/cocosui/check_box_active_press.png
samples/cpp-tests/Resources/cocosui/check_box_normal.png
samples/cpp-tests/Resources/cocosui/check_box_normal_disable.png
samples/cpp-tests/Resources/cocosui/check_box_normal_press.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_n.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_p.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_un.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1B.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1a.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1c.png
samples/cpp-tests/Resources/cocosui/examples/equip/111.png
samples/cpp-tests/Resources/cocosui/examples/equip/12.png
samples/cpp-tests/Resources/cocosui/examples/equip/13.png
samples/cpp-tests/Resources/cocosui/examples/equip/14.png
samples/cpp-tests/Resources/cocosui/examples/equip/15.png
samples/cpp-tests/Resources/cocosui/examples/equip/2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_end_01.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_end_02.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/1.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/10.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/11.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/3.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/4.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/5.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/6.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/7.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/8.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/9.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/crab.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/research.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/sell.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/train.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosui/examples/examples.json
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosui/green_edit.png
samples/cpp-tests/Resources/cocosui/grossini-aliases.png
samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/UIAction_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/button.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buy_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/111.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/12.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/13.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/14.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/15.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_01.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/1.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/10.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/11.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/3.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/4.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/6.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/8.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/9.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/crab.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/research.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/sell.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/train.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/image_castle.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_03.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_04.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/map_alert_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/buttonBackground.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/ribbon.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/128_128.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.fnt
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_d.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_n.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/e-mail.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/register_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/ui_shop_005-hd.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
samples/cpp-tests/Resources/cocosui/labelatlas.png
samples/cpp-tests/Resources/cocosui/loadingbar.png
samples/cpp-tests/Resources/cocosui/scrollviewbg.png
samples/cpp-tests/Resources/cocosui/slidbar.png
samples/cpp-tests/Resources/cocosui/sliderProgress.png
samples/cpp-tests/Resources/cocosui/sliderProgress2.png
samples/cpp-tests/Resources/cocosui/sliderThumb.png
samples/cpp-tests/Resources/cocosui/sliderTrack.png
samples/cpp-tests/Resources/cocosui/sliderTrack2.png
samples/cpp-tests/Resources/cocosui/slider_bar_active_9patch.png
samples/cpp-tests/Resources/cocosui/sliderballnormal.png
samples/cpp-tests/Resources/cocosui/sliderballpressed.png
samples/cpp-tests/Resources/cocosui/switch-mask.png
templates/lua-template-runtime/res/fonts/Marker Felt.ttf
tests/cpp-tests/Resources/cocosgui/100/100.ExportJson
tests/cpp-tests/Resources/cocosgui/100/1000.plist
tests/cpp-tests/Resources/cocosgui/100/1000.png
tests/cpp-tests/Resources/cocosgui/CloseNormal.png
tests/cpp-tests/Resources/cocosgui/CloseSelected.png
tests/cpp-tests/Resources/cocosgui/CocoGUISample.json
tests/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
tests/cpp-tests/Resources/cocosgui/Hello.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
tests/cpp-tests/Resources/cocosgui/UITest/UITest.json
tests/cpp-tests/Resources/cocosgui/UITest/b1.png
tests/cpp-tests/Resources/cocosgui/UITest/b2.png
tests/cpp-tests/Resources/cocosgui/UITest/background.png
tests/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UITest/f1.png
tests/cpp-tests/Resources/cocosgui/UITest/f2.png
tests/cpp-tests/Resources/cocosgui/UITest/r1.png
tests/cpp-tests/Resources/cocosgui/UITest/r2.png
tests/cpp-tests/Resources/cocosgui/UITest/ribbon.png
tests/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
tests/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
tests/cpp-tests/Resources/cocosgui/arrow.png
tests/cpp-tests/Resources/cocosgui/b11.png
tests/cpp-tests/Resources/cocosgui/backtotopnormal.png
tests/cpp-tests/Resources/cocosgui/backtotoppressed.png
tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
tests/cpp-tests/Resources/cocosgui/button.png
tests/cpp-tests/Resources/cocosgui/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/ccicon.png
tests/cpp-tests/Resources/cocosgui/check_box_active.png
tests/cpp-tests/Resources/cocosgui/check_box_active_disable.png
tests/cpp-tests/Resources/cocosgui/check_box_active_press.png
tests/cpp-tests/Resources/cocosgui/check_box_normal.png
tests/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
tests/cpp-tests/Resources/cocosgui/check_box_normal_press.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
tests/cpp-tests/Resources/cocosgui/examples/equip/111.png
tests/cpp-tests/Resources/cocosgui/examples/equip/12.png
tests/cpp-tests/Resources/cocosgui/examples/equip/13.png
tests/cpp-tests/Resources/cocosgui/examples/equip/14.png
tests/cpp-tests/Resources/cocosgui/examples/equip/15.png
tests/cpp-tests/Resources/cocosgui/examples/equip/2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
tests/cpp-tests/Resources/cocosgui/examples/examples.json
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
tests/cpp-tests/Resources/cocosgui/green_edit.png
tests/cpp-tests/Resources/cocosgui/grossini-aliases.png
tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
tests/cpp-tests/Resources/cocosgui/labelatlas.png
tests/cpp-tests/Resources/cocosgui/loadingbar.png
tests/cpp-tests/Resources/cocosgui/scrollviewbg.png
tests/cpp-tests/Resources/cocosgui/slidbar.png
tests/cpp-tests/Resources/cocosgui/sliderProgress.png
tests/cpp-tests/Resources/cocosgui/sliderProgress2.png
tests/cpp-tests/Resources/cocosgui/sliderThumb.png
tests/cpp-tests/Resources/cocosgui/sliderTrack.png
tests/cpp-tests/Resources/cocosgui/sliderTrack2.png
tests/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
tests/cpp-tests/Resources/cocosgui/sliderballnormal.png
tests/cpp-tests/Resources/cocosgui/sliderballpressed.png
tests/cpp-tests/Resources/cocosgui/switch-mask.png
tools/cocos2d-console
2014-03-12 10:09:09 +08:00
d96cc9ecb9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-12 10:08:57 +08:00
f2c483876a
Fixed bug of guireader
2014-03-12 10:07:55 +08:00
59aa17ea05
Change && to || in conditions judge.
2014-03-11 22:02:55 +08:00
4ed33fa4c8
fix lua bindings
2014-03-11 21:36:00 +08:00
f6a9824df1
fix win32 compile error
2014-03-11 20:59:35 +08:00
448b101578
fix linux compile error
2014-03-11 20:46:11 +08:00
b2e27947a3
Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement
...
Develop render texture improvement
2014-03-11 18:50:51 +08:00
48772fb952
modify android makefile
2014-03-11 18:48:28 +08:00
df7aa27b8b
fix mac lua
2014-03-11 18:48:28 +08:00
026ef95b07
add lua ui binding
2014-03-11 18:48:27 +08:00
dcc98ef79f
rename cocos2dx_gui to cocos2dx_ui
2014-03-11 18:48:27 +08:00
cbcc1bbbcf
let ios project compile correct
2014-03-11 18:48:26 +08:00
d309286c84
rename gui folder to ui
2014-03-11 18:48:25 +08:00
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
9a30984783
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
2014-03-11 17:36:43 +08:00
5c33155bc9
fix:Remove some warning about lua.
2014-03-11 17:35:09 +08:00
b6ebd84534
[AUTO]: updating luabinding automatically
2014-03-11 08:38:10 +00:00
b72d009eac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-11 16:16:07 +08:00
80417f0f35
correct naming convetion
2014-03-11 15:27:28 +08:00
c2ef7b8796
fix incorrect implementation of Label::getContentSize
2014-03-11 15:03:16 +08:00
792e182e12
typo fix and coding style improvements.
2014-03-11 14:32:07 +08:00
8db680b9ee
add EnumChildNodesByName, walk node tree with callback
2014-03-11 13:58:43 +08:00
09c6d196a2
Merge pull request #1 from 2youyouo2/develop
...
merge kaile
2014-03-11 12:37:55 +08:00
6efa17cddf
Add event type to ListView
2014-03-11 11:53:44 +08:00
725440fe3f
[AUTO]: updating luabinding automatically
2014-03-11 02:52:22 +00:00
9083de94b4
repair bug: changedisplay(armature,i>=0) does not reblind parentbone
2014-03-11 10:21:43 +08:00
23f42da548
closed #4324 : fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
2014-03-11 05:09:08 +08:00
5e7f2dee8f
Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed
...
Develop nutty modify framework for315 crash fixed
2014-03-10 21:49:22 +08:00
2aa5c7aadd
Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug
...
closed #4315 : fixed clippingNode alphaTest Bug
2014-03-10 21:45:47 +08:00
11d3acd478
fixed inappropriate usage of inline.
2014-03-10 20:35:36 +08:00
8bac35ae2a
closed #4337:label support create by font name,compatible with old labelTTF.
2014-03-10 19:42:43 +08:00
8aa11f005b
[AUTO]: updating luabinding automatically
2014-03-10 11:27:21 +00:00
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
83c4d5b479
fix comments
2014-03-10 18:21:53 +08:00
f0ae3fd4dc
Merge branch 'develop' into develop_RenderTextureImprovement
2014-03-10 18:11:55 +08:00
2147a711ba
Merge pull request #5650 from dumganhar/re-add-lua
...
Re-add lua bindings support
2014-03-10 17:47:52 +08:00
e15d0a9d20
RenderTexture saveToFile will return true
2014-03-10 17:42:27 +08:00
479579fadc
Update CMakeLists.txt, lua-tests works ok on linux now.
2014-03-10 02:39:54 -07:00
e39dcd9974
[Linux] Updates CMakeLists.txt to re-add lua scripting support.
2014-03-10 17:10:08 +08:00
fd44277e7c
lua-tests works again for Win32.
2014-03-10 17:05:35 +08:00
f2197cea6f
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-10 16:19:27 +08:00
6deadf34b8
lua-tests works again for Android.
2014-03-10 16:04:46 +08:00
69bbda688b
lua-tests works ok for iOS / Mac, luabindings has its own project.
2014-03-10 15:32:48 +08:00
f8f2373c2a
closed #4315 : fixed clippingNode alphaTest Bug
2014-03-10 15:12:44 +08:00
26b3013f77
Format codes
2014-03-10 15:08:42 +08:00
d5031f950a
closed #4324 : fix PhysicsContact::generateContactData() memory leak.
2014-03-10 14:51:26 +08:00
650a88a8b1
Re-add lua bindings codes.
2014-03-10 14:04:58 +08:00
083872f65c
Fixed bug of setting anchor point
2014-03-10 12:02:49 +08:00
f78d05c85f
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-10 11:49:15 +08:00
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
8d3f33bb30
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-10 09:58:26 +08:00
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
7aec578b35
closed #3290 : The order of onEnter works correctly on JSB and LuaBindings.
2014-03-08 22:07:55 +08:00
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
80d97bb107
Modify action
2014-03-07 21:49:24 +08:00
c291cb32a0
Merge pull request #5624 from Dhilan007/develop_label
...
label:fixed vertical alignment is incorrect.
2014-03-07 21:07:09 +08:00
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
2427314a65
Issue #4294 : MotionStreak: Improve position setters
2014-03-07 19:06:51 +08:00
4905acfa0b
label:fixed vertical alignment is incorrect.
2014-03-07 18:31:33 +08:00
e94cd2357d
Issue #4294 : Add override declaration
2014-03-07 18:11:37 +08:00
ad9c104cfd
migrate saveToFile compatible with new renderer
2014-03-07 17:41:51 +08:00
0c4bca9bb2
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-07 16:42:38 +08:00
a005fa1dce
Issue #4294 : Add unimplemented position getter/setter in MotionStreak
2014-03-07 16:32:00 +08:00
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
ac944cd42b
fixed incorrect display when the size of label not enough to support display all text.
2014-03-07 15:58:49 +08:00
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
600c661acb
remove script support
2014-03-07 15:12:46 +08:00
c233b636cd
closed #4301:Label support vertical alignment and assign dimensions.
2014-03-07 14:58:44 +08:00
5ee35be0ad
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-07 14:41:32 +08:00
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
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
1cfd14f27d
Tab -> 4 spaces, remove unused spaces for CCGLView.h
2014-03-07 14:03:57 +08:00
ae2f7a4a7d
updateDesignResolution -> updateDesignResolutionSize.
2014-03-07 14:01:30 +08:00
d699f62193
Tab -> 4 spaces, remove unused spaces.
2014-03-07 13:59:56 +08:00
49223fe50c
Compilation error fixes for linux port (clang compiler).
2014-03-07 13:52:54 +08:00
8b359dd90e
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
2014-03-07 13:51:12 +08:00
58db7b5c75
Some widgets would be default enabled touch
2014-03-07 12:34:19 +08:00
1606671224
Fixed bug of Text
2014-03-07 12:05:33 +08:00
f0119ef62f
fixed horizontal kerning is incorrect.
2014-03-07 12:03:45 +08:00
51a6eb6d64
Fixed bug of Action Manger Ex
2014-03-07 12:01:51 +08:00
b4466fab12
Fixed bug of action manager
2014-03-07 11:58:54 +08:00
0602410958
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-07 11:51:28 +08:00
063bde51c3
fixed #4300:fixed Label:draw location and BBOX is incorrect.
2014-03-07 11:42:13 +08:00
69d445efca
Merge pull request #5525 from andyque/bug3868
...
fixed #3868 . Add guard check to send method of HttpClient
2014-03-07 11:31:32 +08:00
f9ea39bf81
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-07 10:54:38 +08:00
7cdfba088d
Modify reader
2014-03-07 10:35:58 +08:00
5999811028
Merge pull request #5547 from nutty898/develop_nutty_modify_framework_for315
...
Fixd bugs for editor
2014-03-07 10:30:55 +08:00
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
9fc6177570
fix bug for outdated transform status
2014-03-07 10:03:34 +08:00
57b6478de7
Improved documentation
2014-03-06 16:14:06 -08:00
77d19e9bc2
better doctrings
...
improved documentation for Node
2014-03-06 14:04:19 -08:00
1d867d770b
Modify Windows project
2014-03-06 22:27:57 +08:00
94339312ba
Modify text filed size control
2014-03-06 21:58:45 +08:00
fea75444a7
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-06 21:43:33 +08:00
8b7a5c3141
Add RichText sample
2014-03-06 20:52:29 +08:00
56a46892fe
closed #3991 , Remove the method CCTextureCache::updateTexture().
2014-03-06 17:38:18 +08:00
822ef8d588
Merge branch 'develop' into issue3991
2014-03-06 17:28:20 +08:00
03f5be47da
Modify for editor
2014-03-06 17:21:09 +08:00
b926e4efad
closed #4150 : fix physics position/rotation tag bug.
2014-03-06 17:04:54 +08:00
b02ed6fb1e
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-06 16:17:35 +08:00
bd5c11b5ee
Modify mk file and solve warnings
2014-03-06 16:15:03 +08:00
2a5ecc2376
Fixed bugs of Flipping
2014-03-06 13:40:46 +08:00
3554dcd749
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-06 11:22:33 +08:00
fec04dd6ae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-06 11:03:49 +08:00
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
273d0d22f1
little performance improvement in quad command
2014-03-05 18:50:09 -08:00
183622c718
'EventDispatcherTest/Issue 4129' crashes on Windows.
2014-03-06 10:45:29 +08:00
73a3011b11
fix comments
2014-03-06 10:31:29 +08:00
08d0cde490
Merge remote-tracking branch 'upstream/develop' into node-string-tag
2014-03-06 10:02:50 +08:00
6da0afdd03
Solve the crash in CocoStudioComponentsTest.
2014-03-06 09:23:27 +08:00
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
0cb759cab8
Better names for tests
2014-03-05 11:50:12 -08:00
5e84c15812
Add RichText
2014-03-05 23:03:49 +08:00
cb5f9ad6dc
Modify windows project
2014-03-05 22:34:24 +08:00
ad85d2c800
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-05 21:20:26 +08:00
4f9dfdbef8
Fixed build error except Windows
2014-03-05 21:18:51 +08:00
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
7a4ba91f29
Modify project file
2014-03-05 17:08:59 +08:00
55080d713b
refactor string tag to name
2014-03-05 17:03:25 +08:00
ab47cafb31
Merge branch 'develop' into develop_nutty_modify_framework_for315
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/gui/UIButton.cpp
cocos/gui/UIButton.h
cocos/gui/UIWidget.h
2014-03-05 16:52:31 +08:00
dfdf19daff
remove unused shader and also did adjust FontAtlas::getTexture
2014-03-05 16:51:16 +08:00
23501b40aa
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
2014-03-05 15:54:40 +08:00
06cd98076a
Merge pull request #5560 from dumganhar/develop
...
Some warning fixes in cpp-tests.
2014-03-05 15:26:56 +08:00
20146c3ecb
Merge pull request #5558 from Dhilan007/develop_label
...
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 15:24:36 +08:00
8e28400725
Some warning fixes in cpp-tests.
2014-03-05 15:04:47 +08:00
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
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
c3c3e12ee6
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 14:41:59 +08:00
06faad7020
Fix partical test->add and remove particle system crash.
2014-03-05 14:32:22 +08:00
3365280a0a
build kazmath on win32
2014-03-05 14:30:55 +08:00
d1a0218a3b
Merge pull request #5542 from pandamicro/myfix
...
Feature #4236 : Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
2014-03-05 12:45:41 +08:00
02572da9dc
Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
2014-03-05 11:28:21 +08:00
0d69617a6c
Adds CC_DLL to kazmath for windows compatibility
2014-03-04 18:07:03 -08:00
3edeba5001
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix
2014-03-05 09:52:37 +08:00
53851151d9
fix:TimerScriptHandler can’t do anything in the `cancel` function
2014-03-05 09:51:57 +08:00
f269ec1f8f
Compiles on Linux
2014-03-04 17:24:04 -08:00
c63f210e26
Compiles on Android
2014-03-04 16:59:39 -08:00
4fe3b16287
Updates to latest version of kazmath
2014-03-04 16:33:00 -08:00
7ac663e02c
GL Program API fixes
2014-03-04 13:51:43 -08:00
353f6fb42c
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-05 01:09:51 +08:00
cbec0f9a15
CCNode:Add String tag, to support runtime manipulation
2014-03-05 00:15:01 +08:00
728d5f34de
CCConsole: add script support
2014-03-05 00:07:30 +08:00
5108d276b6
Modify trigger
2014-03-04 23:55:36 +08:00
364317b532
Feature #4236 : Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
2014-03-04 23:42:58 +08:00
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
6cb665b637
Merge pull request #5534 from dabingnn/develop_RenderTextureImprovement
...
Develop render texture improvement
2014-03-04 18:30:37 +08:00
3d0cd62e12
add comment to make interface clearer
2014-03-04 17:34:48 +08:00
8b9d572961
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-04 16:59:06 +08:00
4a2dc4a607
Add custom widget and reader
2014-03-04 16:51:35 +08:00
98e1099370
Fixes crash of PerformanceTest/EventDispatcherTest.
2014-03-04 16:43:04 +08:00
99d0ce160a
rename setVirtualViewPort->setVirtualViewport
2014-03-04 15:41:36 +08:00
ec397611f6
remove blank line，adjust indent
2014-03-04 15:30:05 +08:00
756024e9f1
implement interface setKeepMatrix, setVirtualViewPort
2014-03-04 15:07:28 +08:00
5d1113aeea
issue #4234 : Fixes linking error in UI.
2014-03-04 13:49:54 +08:00
387174d633
issue #4234 : Acceleration -> const Acceleration&
2014-03-04 13:42:36 +08:00
5c70548742
issue #4234 : 'Event* event' needs to be in 'TouchScriptData' struct.
2014-03-04 13:42:06 +08:00
68130fb4d0
fix matrix push/pop bug
2014-03-04 11:06:39 +08:00
a759d9ae60
calculate viewport based on _fullRect _rtRect and _fullRectViewport
2014-03-04 10:57:57 +08:00
7949cb2cd9
add interface for keep Matrix
2014-03-04 10:41:03 +08:00
629c6b9a89
fixed #3868 . Add guard check to send method of HttpClient
2014-03-04 10:07:49 +08:00
8bdfce9bbe
Merge branch 'develop' into visit_draw_improved
2014-03-03 17:31:29 -08:00
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
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
c09b139fee
Fixed bug of loadingbar
2014-03-03 23:46:47 +08:00
c615811124
Modify methods of Changing color and opacity.
2014-03-03 23:24:57 +08:00
d0f8dbd4be
Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
2014-03-03 19:12:59 +08:00
d207670011
Merge pull request #5501 from nutty898/develop_nutty_modify_framework_for315
...
Develop nutty modify framework for315
2014-03-03 18:09:32 +08:00
594342ea3e
Merge pull request #5505 from dumganhar/event-dispatcher-refactor
...
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-03 17:56:57 +08:00
bd3efebb26
Merge pull request #5513 from 2youyouo2/develop
...
fixed CocoStudioTest/ArmatureTest crashes.
2014-03-03 16:15:51 +08:00
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
8f1ba73a52
fixed add ParticleSystem display crashed
2014-03-03 14:56:56 +08:00
fdcbfa2eca
closed #4150 : add const to getPosition/RotationOffset method.
2014-03-03 14:35:44 +08:00
23a51c7c84
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-03 13:45:53 +08:00
1d2d2df1e9
issue #4165 : Adds missing deprecated methods in Scheduler class.
2014-03-03 11:57:36 +08:00
1aa9e35fb2
Merge pull request #5500 from dumganhar/scheduler-refactor
...
closed #4165 : Refactors Scheduler class.
2014-03-03 11:20:06 +08:00
04663b4a9c
closed #4165 : Updates comments.
2014-03-03 11:12:04 +08:00
09c0bae4a1
closed #4165 : Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget.
2014-03-03 11:07:48 +08:00
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
c99b0a0b6a
closed #4150 : Fix missing "!"
2014-03-03 01:48:56 +08:00
a6e4a5e5aa
Adjust layout
2014-03-02 22:41:47 +08:00
683d3c9f14
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-02 19:28:44 +08:00
dceb047ba6
TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback.
2014-03-02 18:43:17 +08:00
f3949e078b
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-02 17:41:18 +08:00
30d7130eb0
closed #4160 : Out of range exception in EventDispatcher
2014-03-02 16:16:03 +08:00
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
4f90676e92
Add method for editor
2014-03-01 22:34:25 +08:00
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
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
b50a787f6d
Adds new ParticleTest for auto-batching
2014-02-28 22:03:36 -08:00
3588041409
removed empty spaces
2014-02-28 16:39:04 -08:00
9d501479c1
removes unused ivar from ParticleSystemQuad
2014-02-28 16:19:27 -08:00
da8e571862
shaders set in the correct position
2014-02-28 16:14:55 -08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
13b60c8759
Applies Wu Hao's patch for 2.5D
2014-02-28 13:48:00 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
ff79c0d9ad
Merge branch 'develop' into visit_draw_improved
2014-02-28 10:59:07 -08:00
46c93f07ad
fixed #4103 . fix crash when websocket close
2014-02-28 17:32:54 +08:00
b5ca9f21d1
Merge pull request #5482 from andyque/fix3868
...
fixed #3868 : Possible crash on repeat running between HttpClientTest, WebSocketTest, SocketIOTest
2014-02-28 16:57:33 +08:00
ec4a4466b4
Merge pull request #5461 from Wilhansen/spine_skelFix
...
closed #4156 : spine::Skeleton would not be updated after re-adding to scene.
2014-02-28 16:34:35 +08:00
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
5244cb93ed
closed #4150 : Delete PhysicsBodyInfo::set/getPosition/Rotation method.
2014-02-28 15:50:38 +08:00
015180bf62
issue #4150 : Add physics position/rotation test
2014-02-28 15:47:49 +08:00
d33017f27a
issue #4129 : Adds default argument(nullptr) for dispatchCustomEvent.
2014-02-28 15:40:45 +08:00
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
7774bb4c6c
closed #4129 : Event listeners in engine shouldn't be removed by method removeAllEventListeners().
2014-02-28 15:09:53 +08:00
bbc1c385c2
issue #4129 : EventTouch::getTouches return const reference.
2014-02-28 15:08:18 +08:00
7fcc9f02d7
Merge pull request #5490 from natural-law/issue3684
...
closed #3684 : Set shader program before TextureAtlas is rendered.
2014-02-28 13:55:07 +08:00
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
658cf72d31
issue #4129 : Uses 'const reference' when getting touches by EventTouch::getTouches.
2014-02-28 13:43:28 +08:00
8a04fbabf1
issue #4129 : EventDispatcher::_listeners -> _listenerMap.
2014-02-28 12:01:47 +08:00
ddf5957a9c
closed #3684 , Set shader program before TextureAtlas is rendered.
2014-02-28 11:43:41 +08:00
8ebf00fec1
SpineDrawing fixes
2014-02-27 19:40:21 -08:00
b363751b1a
Merge pull request #5477 from heliclei/console-upload-file
...
CCConsole:support file upload via telnet console
2014-02-27 21:53:57 +08:00
4277509966
Merge pull request #5463 from andyque/refactor3877
...
closed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:49:38 +08:00
5531cae2ec
Merge remote-tracking branch 'upstream/develop' into console-upload-file
2014-02-27 21:35:53 +08:00
a96f44f31d
Adds override for override functions (onEnter, onExit) in cpp-tests.
2014-02-27 21:10:03 +08:00
32d3bf03bd
fixed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:00:25 +08:00
5ff60485a4
issue #4118 : set body update after physics step.
2014-02-27 20:23:23 +08:00
8c536589df
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve
2014-02-27 20:04:04 +08:00
8d47d5f16a
return immediately when no changing
2014-02-27 15:12:57 +08:00
b63641c7a5
issue #4118 : delete physicsSetPosition/Rotation method and add physics position/rotation tag.
2014-02-27 14:36:09 +08:00
f400c1ac68
issue #4118 : edit contact test and fix node setPhysicsBody bug
2014-02-27 13:35:37 +08:00
d4b9544365
fixed #3868 . when the singleton destoryed, the cocos thread may later than that which will cause the s_responseQueue to be nil.
2014-02-27 11:25:44 +08:00
dc6eca19c0
Merge pull request #5476 from dumganhar/iss4116-split
...
closed #4116 : Remove script-bindings codes, move it to 'cocos2d/cocos2d-js' and 'cocos2d/cocos2d-lua' repo.
2014-02-27 10:27:48 +08:00
75ec508f0a
issue #4118 : improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.
2014-02-27 09:45:35 +08:00
cd7b075900
closed #3874 : fix bug, blendID should be shifted by 50 bits
2014-02-27 09:27:33 +08:00
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
c2acfea633
issue #4116 : Delete non-scripting files.
2014-02-26 21:17:17 +08:00
4df1e104f3
issue #4118 : improve performance.
2014-02-26 19:56:52 +08:00
c7315a2e3e
closed #3874 : expand textureID bit to 32bits
2014-02-26 15:01:45 +08:00
ffb815d5e6
Merge pull request #5466 from andyque/bug3868
...
closed #3868 . when singleton deleted, it should not dispatch callbacks. This PR resolves: Possible crash on repeat running between HttpClientTest, WebSocketTest, SocketIOTest.
2014-02-26 11:56:33 +08:00
01e37a0000
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 03:53:49 +00:00
24ba47a43a
closed #3991 , Add method to reload cached texture & update the nodes used the texture.
2014-02-26 11:44:54 +08:00
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
e6104f9649
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 03:41:20 +00:00
2b2979551e
Merge pull request #5460 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : Physical performance improve.
2014-02-26 11:37:13 +08:00
e7de92a54f
fixed #3868 . when singleton delted, it should dispatch callbacks.
2014-02-26 10:59:56 +08:00
912dad7a71
closed #4144 : fix bug: Node::setPhysicsBody doesn't work at the second time.
2014-02-26 10:53:41 +08:00
a0192591fd
Merge pull request #5462 from heliclei/console-simulate-touch
...
closed #4146 : Simulate touch events(tap,swipe) via CCConsole
2014-02-25 18:30:40 +08:00
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
338aa73840
issue #4118 : change PhysicsBody::updateDamping() to protected.
2014-02-25 16:08:16 +08:00
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
55c679a893
issue #4118 : rename set/getElasticity to set/getRestitution
2014-02-25 15:58:19 +08:00
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
a1b7beb400
Fix spine::Skeleton not updating on re-entry.
...
Could be done in a tighter manner by scheduling updates in
spine::SkeletonAnimation instead and listening for animation events.
However, this may need a more robust interface on scheduleUpdate and
unscheduleUpdate to work correctly.
2014-02-25 15:36:57 +08:00
a6b89f1fcc
Merge pull request #5459 from dumganhar/develop
...
More const reference loves in EventDispatcher.
2014-02-25 15:30:22 +08:00
d139c752fb
issue #4118 : add _isDamping to PhysicsBody and fix bugs
2014-02-25 15:27:25 +08:00
51808b59e9
More const reference love in EventDispatcher.
2014-02-25 14:31:24 +08:00
08fa208cae
Merge remote-tracking branch 'upstream/develop' into console-simulate-touch
2014-02-25 14:04:23 +08:00
93aa506e33
Merge pull request #5435 from heliclei/fix-console-windows-crash
...
closed #4098 : Fix console crash on windows.
2014-02-25 12:56:11 +08:00
e09a72f26d
add touch swipe
2014-02-25 11:47:53 +08:00
ef18a6edd1
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-25 03:14:40 +00:00
514cd031b3
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-25 11:09:58 +08:00
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
7a28f93fbf
issue #4118 : fix bit mask bug
2014-02-25 10:24:20 +08:00
f88e4be4ce
rollback gui filename change
2014-02-25 10:18:45 +08:00
8359ddd4d4
fix lua bindings error
2014-02-25 10:18:45 +08:00
f92301a872
fix jsb munaul bindings error
2014-02-25 10:18:45 +08:00
bf81591b48
fixed #3829 . change namespace gui to ui
2014-02-25 10:18:44 +08:00
64ec1611a5
compilation error fix for win32.
2014-02-25 09:45:10 +08:00
18c3a8dd02
little fixes for sprite
2014-02-24 15:18:07 -08:00
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
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
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
387bd544bf
closed issue#4123:fixed thread deadlock if new functions are added in callback.
2014-02-24 21:08:05 +08:00
d15009c510
issue #4039 : delete name "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 20:14:46 +08:00
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
f20d487ade
closed #3818 : fix CC_SPRITE_DEBUG_DRAW feature
2014-02-24 20:02:48 +08:00
82935b3309
replace write() with send()
2014-02-24 18:02:13 +08:00
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
115d3e4a3b
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-24 17:03:28 +08:00
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
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
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
46abf08a1d
issue #4118 : add PhysicsBody::setResting()
2014-02-24 16:29:14 +08:00
a4cc0edb4a
issue #4118 : refactor physics update
2014-02-24 16:17:42 +08:00
2898909130
Merge pull request #5444 from samuele3hu/developDynamic
...
issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
2014-02-24 15:29:23 +08:00
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
b6a474b832
Merge pull request #5446 from Dhilan007/develop_movePDC
...
fix compiling error cause by using 'fmaxf'.
2014-02-24 14:48:29 +08:00
4a2633933e
remove early cleanup
2014-02-24 14:28:19 +08:00
02230add0c
use closeSocket() on windows
2014-02-24 14:24:14 +08:00
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
b54607bfc9
only using std::max for window.
2014-02-24 11:54:58 +08:00
d6cd2eb05f
fix compiling error cause by using 'fmaxf'.
2014-02-24 11:38:03 +08:00
82ee8a4abd
Add some omitted modifications about “cc.ref”
2014-02-24 10:28:55 +08:00
8fa8eaf64d
issue #3956:Remove some unrelated modification
2014-02-24 10:08:00 +08:00
ac88d70d58
issue #3956:Update the related compile file
2014-02-24 10:01:00 +08:00
a765178a5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-24 09:38:08 +08:00
8cbe22b12b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix
2014-02-23 20:57:45 +08:00
5f28e6bd72
Replace “cc.object” with “cc.ref” for lua binding
2014-02-23 20:56:49 +08:00
902b93185e
Merge pull request #5441 from ricardoquesada/api_fixed_for_3d
...
little performance improvements in culling
2014-02-23 02:03:14 -08:00
f77b92f1d7
performance improvements in culling
2014-02-23 02:02:28 -08:00
e306c53d21
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-23 09:21:10 +00:00
04460750b8
culling working for both 2d and 3d projections
2014-02-23 01:09:52 -08:00
fe1160cd8c
changes in API to support 3D
2014-02-22 19:16:42 -08:00
f37c606c4e
removes unsued function
...
keeps the code cleaner
2014-02-22 17:55:03 -08:00
8ca746af17
Implements AABB culling for sprites
2014-02-22 17:47:56 -08:00
92571ebe04
merge upstream/develop
2014-02-22 22:58:24 +08:00
5376b6333e
fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function
2014-02-22 22:37:12 +08:00
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
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
293ea66401
issue #3956:Remove the usage of “tolua.cast”
2014-02-21 16:22:35 +08:00
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
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
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
2eadbefaeb
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-21 03:48:50 +00:00
1ce8f0ed82
Merge pull request #5428 from dumganhar/iss4106-vector-eraseObject
...
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
2014-02-21 11:37:12 +08:00
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
b300cfa1d2
issue #4106 : Updates comments for 'Vector::eraseObject'
2014-02-21 11:30:55 +08:00
c6b2b86fe5
closed #4106 : Object which isn't in Vector would also be released when invoking Vector::eraseObject.
...
Also refactored 'Vector::eraseObject':
1) Removed 'toRelease' parameter, Vector class should manage reference count.
2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence .
3) Added relevant UnitTest for 'Vector::eraseObject'.
2014-02-21 11:24:37 +08:00
2eb1c1bb73
issue #4106 : Ref class's constructor should be protected.
2014-02-21 11:21:08 +08:00
e436aa4022
issue #3956:Replace Object with Ref
2014-02-21 10:22:03 +08:00
555ef20202
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
...
Conflicts:
cocos/scripting/lua/bindings/LuaBasicConversions.h
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
2014-02-21 10:10:20 +08:00
d0e640d966
remove CC prefix.
2014-02-21 09:59:43 +08:00
3532665520
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
2014-02-21 09:45:33 +08:00
54f48b23e6
LabelBMFont re-implemented as a wrapper of Label.
2014-02-20 22:33:52 +08:00
0e154a2bec
Merge pull request #5425 from dumganhar/develop
...
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:59:33 +08:00
68eaa746ea
closed #2535 : TouchScriptHandlerEntry will release twice lua reference
2014-02-20 21:58:20 +08:00
7277046ba8
Merge pull request #5423 from dumganhar/develop
...
closed #4104 : Crash if invoking Array::initWithObjects()
2014-02-20 21:45:51 +08:00
23082c0d6c
closed #4104 : Crash if invoking Array::initWithObjects()
2014-02-20 21:44:40 +08:00
30d100296a
Merge pull request #5422 from dumganhar/develop
...
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:46 +08:00
0b6858bdde
Added virtual and override keywords to Scene::init() method
2014-02-20 21:37:01 +08:00
6f2f35ab7a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 13:11:20 +00:00
0658355772
Merge pull request #4415 from HoGarfield/WsThreadHelper
...
closed #4103 : Potential crash when websocket connection closes
2014-02-20 20:44:55 +08:00
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
e9fa65b6f4
closed #4101 : No callback is invoked when websocket connection fails
2014-02-20 19:29:53 +08:00
dc6839d692
Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232
2014-02-20 19:27:17 +08:00
787dade5b0
Merge pull request #5408 from dumganhar/iss4097-disable-script
...
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 17:57:46 +08:00
9e061b751a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 09:52:15 +00:00
7970e37bf5
closed #4097 : Adds missing include.
2014-02-20 17:23:22 +08:00
e2596bce8b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
...
Conflicts:
tools/tojs/cocos2dx.ini
tools/tolua/cocos2dx.ini
2014-02-20 17:20:51 +08:00
b1e44a7ed6
issue #4097 : Enables script bindings by default.
2014-02-20 17:02:20 +08:00
a218369ecd
issue #4097 : fix linking error of missing functions.
2014-02-20 17:01:13 +08:00
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
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
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
dd74add195
Merge pull request #5386 from heliclei/console-command
...
add more console commands: resume, pause, stopanimation and startanimation
2014-02-20 15:46:59 +08:00
01bd61839b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 07:38:05 +00:00
e2cb0e3ba5
Reverts auto-generated submodule.
2014-02-20 15:14:55 +08:00
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
4cf4e15ba6
issue #4058 : Adds CCStdC.h.
2014-02-20 15:12:35 +08:00
7b85ffcb82
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-20 15:11:56 +08:00
514112921f
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
2014-02-20 15:10:34 +08:00
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
9b2c5f71af
closed #3540 , Solve the bug: Sometimes RenderTexture not drawn after a background/foreground.
2014-02-20 14:43:07 +08:00
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
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
f7c8eb8de2
Merge pull request #5394 from samuele3hu/developEventTrigger
...
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
2014-02-20 12:44:53 +08:00
2c5f791e03
issue #4058 : Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect.
2014-02-20 11:57:04 +08:00
66906c3f66
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 03:38:12 +00:00
d5bef1ca35
merge pause, resume, stopanimation, startanimation into director command
2014-02-20 11:15:29 +08:00
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
9436173039
issue #4058 : typedef Ref Object; and deprecate it.
2014-02-20 10:58:37 +08:00
0ea27d8543
issue #4058 : CCObject.cpp -> CCRef.cpp for all platform projects.
2014-02-20 10:56:25 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
fd528b389d
fix warning
2014-02-20 10:24:35 +08:00
ddd02b463c
optimize label:
...
1.remove unnecessary API
2.reduces object-creation and function calls.
2014-02-19 20:26:14 +08:00
f086f39319
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-02-19 17:00:26 +08:00
e1387f40eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:57:18 +08:00
1f45dd4349
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 08:27:37 +00:00
d7b0efd6d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:27:08 +08:00
ce1656fa8d
fix: The lua binding of getPropertiesForGID would lead to compile error
2014-02-19 15:47:45 +08:00
810196d25b
closed #2920 : add a variable to save shared director.
2014-02-19 14:23:41 +08:00
49cb2ce9d5
closed #2920 : fix compile error after merge.
2014-02-19 14:12:57 +08:00
52a0b906da
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 13:58:15 +08:00
4ecd7ba58d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 05:58:15 +00:00
d28e8485ec
issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv
2014-02-19 13:56:06 +08:00
e1a256d6f1
Merge pull request #5319 from samuele3hu/developDynamic
...
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
2014-02-19 13:52:08 +08:00
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
dd9f072429
add more commands: resume, pause, stopanimation and startanimation
2014-02-19 11:19:29 +08:00
8be6932863
refactor tilemap xml format index count.
2014-02-19 10:41:12 +08:00
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
58d3311da0
Merge pull request #5342 from heliclei/console-user-command
...
closed #4063 :revise CCConsole to support more easily for adding custom command.
2014-02-18 16:54:56 +08:00
5361413383
replace [auto] with [const auto&] in FOR loop.
2014-02-18 16:41:01 +08:00
97ff6c5bdf
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-18 08:04:14 +00:00
ee4972ae96
Merge pull request #5371 from andyque/refactorActionEase
...
closed #3620 : Merge cocostudio/CCActionXxx to CCAction。
2014-02-18 15:58:49 +08:00
2ad81b0edb
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
2014-02-18 14:30:51 +08:00
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
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
bcfa32f4e9
remove unused std::function declare
2014-02-18 14:22:14 +08:00
68b1c9f2c1
change CCTweenFunction class to tweenfunc namespace
2014-02-18 14:22:13 +08:00
838c71b135
refactor EaseIn with CCTweenFunction
2014-02-18 14:22:13 +08:00
ab11147eeb
rename namespace of CCTweenFunction to cocos2d and fix some compile errors
2014-02-18 14:22:13 +08:00
f16b0022a3
move CCActionEaseEx content to CCActionEase
2014-02-18 14:22:13 +08:00
895b2a0055
move CCActionEaseEx and CCTweenFunction to core engine
2014-02-18 14:22:12 +08:00
5acb556c74
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-18 13:46:21 +08:00
8cb424b535
close #3593:Add more test cases about SceneReader of cocoStudio
2014-02-18 13:44:11 +08:00
8bad243903
remove redudant prompt
2014-02-18 12:00:23 +08:00
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
34f8f0a308
Uses `malloc` instead of `new[]`, keep malloc/free matching.
2014-02-18 11:14:02 +08:00
b4121f47fc
[Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env.
2014-02-18 11:07:58 +08:00
650331769a
closed #3964 , Use GL methods instead in function RenderTexture::newImage()
2014-02-18 10:47:14 +08:00
007d2c507c
use local variable to reduce coupling
2014-02-18 10:32:32 +08:00
905443d17c
new[] free mismatching after PR #5326 .
2014-02-18 10:11:04 +08:00
7283e9fdc1
fix console hang
2014-02-17 23:29:09 +08:00
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
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
19b1945efb
closed #4054 : Removing child from TMXLayer may cause crash.
2014-02-17 21:15:26 +08:00
35ae3702f4
fix console readline
2014-02-17 16:49:57 +08:00
4f94064242
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
2014-02-17 14:35:49 +08:00
1ec2d35631
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103
2014-02-17 10:12:49 +08:00
e02f488224
Merge branch 'develop' into issue3964
2014-02-16 11:01:07 +08:00
daf9c3f868
delete un-used code
2014-02-14 14:57:12 +08:00
2ec75919c0
use stl map to oprate command
2014-02-14 14:54:26 +08:00
a5a8ff2d87
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 06:22:19 +00:00
c7b1ab4525
Merge pull request #5362 from ucchen/develop
...
closed #4037 : fix copy-paste error, all spxxx_to_jsval use lower case;
2014-02-14 14:17:33 +08:00
185ed86214
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
2014-02-14 13:24:56 +08:00
104e0b4b29
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 03:24:11 +00:00
78163e604e
Merge pull request #5358 from dumganhar/merge5343
...
closed #4037:Exposed the missing data structures of Spine to JS
2014-02-14 11:17:38 +08:00
32012ee72a
Adds missing files for vs.
2014-02-14 10:53:30 +08:00
79e7d218cb
Updates Android.mk
2014-02-14 10:37:50 +08:00
2078f6de57
Updates CMakeLists.
2014-02-14 10:34:28 +08:00
bc222774d8
Merge pull request #5354 from CocosRobot/updategeneratedsubmodule_1392341386
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 09:44:22 +08:00
8700d0f64e
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343
2014-02-14 09:44:06 +08:00
1693ea0ef6
Typo fix in CCDevice.mm.
2014-02-14 09:41:06 +08:00
acefa4e237
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
2014-02-14 09:33:42 +08:00
498a5e5b47
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 01:29:48 +00:00
0d5c702708
move labelttf's platform-dependent code from CCImage to CCDevice
2014-02-13 21:08:43 +08:00
933ecc4f4c
Merge pull request #5350 from bagobor/patch-1
...
Code format fix and small optimizations.
2014-02-13 20:53:58 +08:00
05e5af7f5f
use realloc to avoid memory leaks
2014-02-13 17:15:47 +08:00
4837b2dd2d
issue #3990 : setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles.
2014-02-13 17:01:38 +08:00
deb4666e27
-fixed formating and small optimizations
2014-02-13 11:39:53 +03:00
cffd1e0cc5
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-02-13 16:32:57 +08:00
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +08:00
391768007b
do not allow adding same commands
2014-02-13 14:07:12 +08:00
4eecc7e56b
#3947 Simulate 'setTimeout' and 'setInterval' in JSB.
2014-02-13 13:54:05 +08:00
9befe56a7e
update unit test
2014-02-13 11:10:23 +08:00
67630311f2
Adds 'ParticleSystemQuad::updateTexCoords' method.
2014-02-13 11:03:35 +08:00
c0b8460aef
closed #3990 : ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
2014-02-13 11:03:34 +08:00
2c961bdfbf
add spine manual binding;
2014-02-13 11:01:54 +08:00
7c11657242
simplify add custom command
2014-02-13 10:40:57 +08:00
4146ce69da
Merge pull request #5339 from azmeuk/jsb-linux
...
closed #3895 : Linux javascript bindings support.
2014-02-13 09:51:45 +08:00
8adca38efa
Linux javascript bindings support.
...
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
2014-02-13 01:42:14 +01:00
2108ae0c35
Merge pull request #5324 from heliclei/develop
...
set prompt for async console commands
2014-02-13 08:05:07 +08:00
4272d4fa61
Linux websockets support.
2014-02-13 00:53:51 +01:00
3fb2b61591
Linux local storage support. Depends on libsqlite3-dev
2014-02-13 00:53:51 +01:00
61e4ffbc3c
quick fix for positioning the FPS on non HD
2014-02-13 04:10:23 +08:00
200eb9713c
Merge branch 'develop' into droid_fonts
2014-02-12 20:23:40 +08:00
cd4478f17c
Merge pull request #5327 from chuanweizhang2013/jsruntime
...
issue #3984 : Adds JS runtime and project-creator supports creating JS runtime.
2014-02-12 18:51:30 +08:00
0a2d701e9f
Update verts and calls every frame
2014-02-12 08:41:32 +08:00
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
d5aee5eb04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
2014-02-11 18:08:14 +08:00
ea6edd5417
closed #3988 : fix bug Node::setRotation() moves opposite when node has a physics body.
2014-02-11 17:10:27 +08:00
60faacab02
remove redundant return
2014-02-11 17:05:10 +08:00
c39d9f57c8
add return
2014-02-11 17:00:09 +08:00
f925bb17cf
add back prompts
2014-02-11 16:57:30 +08:00
a0c3cbe054
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
2014-02-11 16:50:39 +08:00
c15fdc3161
Merge pull request #1 from cocos2d/develop
...
merge upstream/develop
2014-02-11 16:41:41 +08:00
e7679a62b0
fix console prompt
2014-02-11 16:41:12 +08:00
4a2fd2b52d
fix console prompt
2014-02-11 16:14:49 +08:00
29bae34bc3
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-11 06:34:17 +00:00
30942e9fba
set prompt for async console commands
2014-02-11 10:48:18 +08:00
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
e9dd3d828a
issue #3498 : commit jsruntime
2014-02-10 18:15:30 +08:00
67a48c2a85
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-10 17:41:06 +08:00
ba73217667
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
2014-02-10 15:03:53 +08:00
12b5fba628
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 06:42:10 +00:00
51ba0cbb17
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
2014-02-10 14:09:57 +08:00
6f81e7f304
Merge pull request #5256 from Dhilan007/develop_label
...
Label::reduce unnecessary calculation amount.
2014-02-10 14:08:49 +08:00
4f54b36127
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-10 05:58:44 +00:00
a05cd6fbb2
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311
2014-02-10 12:53:08 +08:00
47e16728cc
reduce unnecessary calculation amount.
2014-02-10 12:38:32 +08:00
6a662a6330
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-02-10 11:47:05 +08:00
68143d3093
re-add missing assert
2014-02-09 19:39:56 -08:00
99c20c4e30
Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268
...
Conflicts:
tests/test-javascript/tests
2014-02-10 11:38:56 +08:00
907446d8d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
2014-02-09 19:32:35 -08:00
24f655f9b1
Better 'vertices drawn'
2014-02-09 19:31:45 -08:00
e12c1f57ac
Label::reduce unnecessary calculation amount.
2014-02-10 11:21:54 +08:00
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
9a02568eca
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
2014-02-10 11:15:56 +08:00
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
1c4321304c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
2014-02-09 19:01:55 -08:00
a8387a12f0
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
2014-02-10 10:09:56 +08:00
3420e9bd55
Merge pull request #5305 from hbbalfred/develop
...
close #2128 : remove the redundant check when load a file in ccbreader.
2014-02-10 09:51:50 +08:00
a1a914faa9
Merge branch 'develop' into fast_tmx
2014-02-08 21:30:47 -08:00
337271cc46
Event more improvements in the console
...
Much better help system
2014-02-08 21:29:39 -08:00
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
13aa3ad2b5
Adds new commands to Console
...
* resolution
* projection
2014-02-08 12:35:11 -08:00
c7a999335c
Console. Less error prone, easier to use, more documentation
2014-02-08 10:20:12 -08:00
ceba63db8b
Merge branch 'develop' into fast_tmx
2014-02-08 09:08:33 -08:00
f5d4dd4afe
remove the redundant check
...
ccbreader can load file without the owner setting
2014-02-08 19:12:33 +08:00
c9e4944321
Fix one character disappears when breaking line
2014-02-08 15:18:18 +08:00
da2a58ccc9
Improved formatting when using both CJK and ASCII
2014-02-08 15:05:36 +08:00
7484286f25
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:59 +08:00
b5e9a4a00a
Rename ischinese_unicode as iscjk_unicode
2014-02-08 14:52:10 +08:00
61c8bf23b6
optimized draw
2014-02-07 22:19:03 -08:00
7aebdd89a5
Added ischinese_unicode function
2014-02-08 14:15:42 +08:00
c775681767
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-08 06:09:04 +00:00
ae8057b933
Added ischinese_unicode function
2014-02-08 14:07:18 +08:00
d1a0dd395c
Merge pull request #5300 from dumganhar/iss3900-sp-v27
...
closed #3900 : Upgrades spidermonkey to Firefox v27.
2014-02-08 14:04:53 +08:00
82700339c0
Adds a way to print the renderer vertices
2014-02-07 19:37:44 -08:00
bca9bba8c5
A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE.
2014-02-08 10:41:02 +08:00
5163f1f78d
issue #3900 : Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;)
2014-02-08 10:35:03 +08:00
78fdabe926
more cleanup in TMX code
2014-02-07 18:33:30 -08:00
616feadda1
More fixes and "tiles" is an uint32 (GID)
2014-02-07 18:11:17 -08:00
f2836e627b
Code is cleaner
2014-02-07 17:33:27 -08:00
6cc22ac0b0
issue #3900 : Fixes wrong include.
2014-02-07 17:26:28 +08:00
f0418a17d3
issue #3900 : Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows.
2014-02-07 17:04:44 +08:00
c25787e575
issue #3900 : Removes the definition of DEBUG. Windows uses _DEBUG .
2014-02-07 16:01:57 +08:00
e33baac396
iso almost working
2014-02-06 22:20:28 -08:00
03292f44e2
issue #3900 : TestJavascript could run on Mac platform with spidermonkey v27.
2014-02-07 13:09:38 +08:00
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
c1cfa1cce2
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-02-07 11:26:46 +08:00
e4366e3e00
issue #3900 : JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
2014-02-07 11:16:13 +08:00
408c3fdda9
issue #3900 : JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
2014-02-07 11:15:05 +08:00
ad7b54eb0e
iso almost working 100% ok
2014-02-06 18:47:45 -08:00
cf08d0b3f9
isometric kind of working
2014-02-06 16:19:46 -08:00
02af5059bf
code cleanup
2014-02-05 22:43:06 -08:00
314d3955b6
working!!
2014-02-05 22:36:03 -08:00
d3aed1124a
what is happening here?
2014-02-05 20:09:04 -08:00
3560227d09
sort of working
2014-02-05 19:51:24 -08:00
9a53f5a9f5
Testing a new TMX renderer
...
faster
2014-02-04 17:59:21 -08:00
822f141748
log() in win32 doesn't add extra \n
2014-02-04 08:59:56 -08:00
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
33a12a594e
fix timeout getting status of sockets in Console::loop()
...
'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
2014-02-03 00:24:58 +02:00
3026e6d5ca
Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
2014-02-02 20:46:15 +08:00
881757a792
Fixed crashing when calling CCDirector's end().
2014-02-01 22:10:00 +02:00
4da6b97786
Added getPropertiesForGID that assings value instead of returning it.
2014-01-31 14:57:26 -08:00
28a6626852
Updates Windows project
2014-01-30 21:30:51 -08:00
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
3198bd85ef
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-31 03:37:29 +00:00
c9dc113fa2
Fixes compilation issues on Android and Linux
2014-01-30 17:28:12 -08:00
5691829b72
Linux with #ifdef
2014-01-30 17:10:18 -08:00
7da8c84a75
Renames EGLView -> GLView
2014-01-30 16:51:43 -08:00
862500f99a
Renames EGLView -> GLView
2014-01-30 15:40:56 -08:00
d19a1012a4
Adds the possibility to create EAGLView with an EAGLView
2014-01-30 15:11:37 -08:00
f1af117a1c
code follows c++ guidelines
2014-01-30 15:11:11 -08:00
43a4c1937f
Add `else` to `if`
2014-01-30 15:10:52 -08:00
3c94caa9a8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact
2014-01-29 11:39:11 +08:00
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
a5863aafb3
closed #3716 : edit lua support
2014-01-28 17:06:37 +08:00
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
1917ffe8b9
issue #3716 : refactor physics contact
2014-01-28 14:59:34 +08:00
9cf659bb0a
Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact
...
Conflicts:
cocos/physics/CCPhysicsContact.h
2014-01-28 14:35:29 +08:00
20346499ab
Continue with the refactoring
2014-01-27 19:16:09 -08:00
b96c4f1ad0
Only compile iOS files on iOS
2014-01-27 16:44:10 -08:00
67b62224b4
restore it to platform=10
2014-01-27 12:39:24 -08:00
3bb74c08ca
Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements
2014-01-27 10:53:12 -08:00
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
23d2d586ed
closed #2920 : fix bug voice recognition input crash on ios7
2014-01-27 18:08:34 +08:00
a2fc1cf970
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-27 09:50:08 +00:00
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
8141397bbd
closed #3871 : event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
2014-01-27 16:30:20 +08:00
35cf49c26d
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
2014-01-27 15:37:36 +08:00
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
cb9330dfd6
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
2014-01-27 13:53:57 +08:00
6c69626a4f
closed #3867 : "Testing empty labels" in LabelTest crashes on Linux platform.
2014-01-27 10:31:24 +08:00
1ad43e676e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 22:31:57 +08:00
46ce35c0bd
fix:Resolve the compile error of the cast_type on vs
2014-01-26 22:30:26 +08:00
d3824c9592
issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation
2014-01-26 22:27:37 +08:00
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
1e50a93bb7
A compilation error fix in lua_cocos2dx_manual.cpp.
2014-01-26 21:54:00 +08:00
a1b02b24ae
Merge pull request #5245 from Dhilan007/develop_label
...
fix mistake of label's transparency.
2014-01-26 05:39:56 -08:00
75dddf390b
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:33:22 +08:00
f2981adf1f
unsigned short int * -> unsigned short* , remove unneeded `int`.
2014-01-26 21:32:21 +08:00
710b614680
fix mistake of label's transparency.
2014-01-26 21:19:40 +08:00
2ee58c913c
NewLabel memory leak fix.
2014-01-26 20:53:55 +08:00
77538c53e9
Merge pull request #5241 from dumganhar/develop
...
Some fixes:
Updates JS Test to the latest version
Remove unused files cocos/2d/cocos2dx.mk
Don't define CC_ENABLE_CHIPMUNK_INTEGATION in extension project for android.
Don't check whether CC_ENABLE_CHIPMUNK_INTEGATION is defined in CCPhysicSprite.h and CCPhysicDebugNode.h, check it in source file.
2014-01-26 04:08:05 -08:00
551f95b83c
The implementation of Object::release was moved to cpp source file.
2014-01-26 18:34:48 +08:00
6a302735d8
Removes unused files.
2014-01-26 17:54:13 +08:00
d2cc2d4065
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 17:22:49 +08:00
2d66419394
close #3802 : Add the createWithTTF(text, ...) lua binding to support 3.0beta0
2014-01-26 17:21:36 +08:00
8fa44baa2e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 09:12:47 +00:00
351ac4a5d7
[LUA] Adds missing cc prefix for lua classes.
2014-01-26 17:05:35 +08:00
a4a010465c
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
2014-01-26 16:41:35 +08:00
4862bbbd86
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 08:30:04 +00:00
d8b1f78039
Update WebSocket.cpp
...
bufix: when connecting fail, libwebsocket_client_connect() will return NULL, and onSocketCallback() will not be called, so we need trigger WS_MSG_TO_UITHREAD_ERROR here.
2014-01-26 15:59:14 +08:00
cf684bc3f4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 15:16:02 +08:00
8260a2a5c1
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-26 06:56:11 +00:00
d2893c1e1e
Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix
...
closed #3858 : Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
2014-01-25 22:46:56 -08:00
6ecc8d37c5
Fix a typo, this._is_nativeObj -> this.__nativeObj.
2014-01-26 14:45:45 +08:00
26125f4e26
closed #3858 : Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
...
Please refer to http://www.cocos2d-x.org/issues/3858 .
2014-01-26 14:41:27 +08:00
6f45d9ca27
Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac
...
closed #3856 : Crash when Firefox connects to JSB application.
2014-01-25 21:55:34 -08:00
04f2cc48a2
closed #3856 : Crash when Firefox connects to JSB application.
2014-01-26 13:54:48 +08:00
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
682a6819cb
issue #3401 : change getContactData function return value back to pointer.
2014-01-26 12:02:42 +08:00
48498f726e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
...
Conflicts:
cocos/scripting/lua/bindings/CCLuaStack.cpp
2014-01-26 11:59:54 +08:00
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
c7e9cee835
updated vs project[Lua]:
...
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
2014-01-26 10:25:49 +08:00
e6b1df3388
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-26 09:46:41 +08:00
7a8ecb108c
issue #3837:Add the debug support for Mac
2014-01-26 09:42:07 +08:00
609ee3db2b
Added Dutch for 3.x branch
2014-01-25 20:38:15 +00:00
98215dd4e4
Merge pull request #5221 from Dhilan007/develop_vs
...
fix link error on vs.
2014-01-25 03:43:53 -08:00
b6cd40521e
fix link error on vs.
2014-01-25 19:41:20 +08:00
8c62fcb7ba
Merge branch 'develop' into glview_improvements
2014-01-24 14:22:25 -08:00
ed299202b6
Android works again
2014-01-24 13:43:46 -08:00
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
8efa186649
Fixes a comment typo in CCObject.h.
2014-01-24 22:34:14 +08:00
04d91f7e1d
Fix a mistake in Color4B(const Color3B& color).
2014-01-24 22:33:43 +08:00
7a8f24a313
Merge pull request #5219 from dabingnn/develop_hotFix
...
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 06:20:53 -08:00
52ca254ecf
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
2014-01-24 18:39:26 +08:00
68dc82c217
Merge pull request #5203 from dumganhar/iss3713-ref-patch
...
issue #3713 : Object::release() of debug version will check whether the object was in autorelease pool.
2014-01-24 02:04:15 -08:00
cdae60b6c8
Merge pull request #5212 from samuele3hu/developBug
...
Add luasocket's support for lua
2014-01-24 02:00:15 -08:00
b6932d580d
issue #3713 : Modifies the scope of DEBUG macro in CCAutoreleasePool.h , contains(Object* obj) should be valid in RELEASE version too.
2014-01-24 17:57:36 +08:00
6e704b6843
issue #3713 : Adds AutoreleasePool::isClearing() for easily debugging memory issues. It only valid in DEBUG mode.
2014-01-24 17:51:36 +08:00
8c3af04b72
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-24 09:48:11 +00:00
7c53586f1f
Merge pull request #5210 from Dhilan007/develop_label
...
close #3835:fix TMXMapInfo::startElement insert property to properties fail.
2014-01-24 01:32:22 -08:00
e2325924e4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
2014-01-24 17:24:46 +08:00
58eab72d26
issue:Add luasocket's support for lua
2014-01-24 17:24:10 +08:00
6655ad79d7
use const ValueMap& for setters.
2014-01-24 16:05:38 +08:00
e19c6e2caa
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-24 07:38:34 +00:00
43ef9051a3
close #3835:fix TMXMapInfo::startElement insert property to properties fail
2014-01-24 15:37:32 +08:00
3aedb8ec43
issue #3713 : Object::release() of debug version will check whether the object was in autorelease pool.
2014-01-24 14:46:06 +08:00
771ed300c4
close #3642:fix bounding box of new label is incorrect.
2014-01-24 14:04:08 +08:00
27ff8f3c68
Merge pull request #5195 from dumganhar/iss3833-ccs-scenetest-crash
...
closed #3833 : SceneTest of CocoStudio crashes
2014-01-23 20:04:43 -08:00
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
c6e7093270
closed #3833 : SceneTest of CocoStudio crashes
2014-01-24 11:50:58 +08:00
5f71d320c3
Merge pull request #5189 from samuele3hu/developNewEventDispacther
...
close #3822:Use the new event-dispatcher to update some lua test cases which used the old event-dispatcher
2014-01-23 19:41:09 -08:00
43ff0c42cf
fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly.
2014-01-24 11:05:34 +08:00
2b92ba75b4
more fixes for new GLView API
2014-01-23 16:04:11 -08:00
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
6b927fb6b0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewEventDispacther
2014-01-23 22:28:05 +08:00
402d0cf7b1
issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne`
2014-01-23 22:26:14 +08:00
1a34a6ff84
remove unused header
...
remove CC Prefix
2014-01-23 18:55:51 +09:00
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
0d05db2326
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-23 18:40:07 +09:00
c042c5f3db
updateColor should be called after updating quads on alignText
2014-01-23 17:27:28 +09:00
636205147f
Merge pull request #5184 from minggo/update-version
...
update version
2014-01-23 00:26:35 -08:00
c1f503bed0
update version
2014-01-23 16:25:38 +08:00
a91d9161c7
issue #3822:Update the KeypadTest using the new event-dispatcher
2014-01-23 16:17:24 +08:00
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
d0319fea2c
Syncing develop
2014-01-23 16:43:52 +09:00
4773fd0937
Merge develop
2014-01-23 16:20:42 +09:00
39904e304d
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-01-23 15:57:25 +09:00
5edc28c849
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-23 05:58:35 +00:00
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
bd97394ccc
1.Label:Change the default parameters
...
2.Label:let setString method do a single function
2014-01-23 13:42:27 +08:00
b0c828b471
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-23 03:56:45 +00:00
9292d92f63
Merge pull request #5143 from pandamicro/develop
...
closed #3806 : SAXParser was supported with manual binding in JSB
2014-01-22 19:50:15 -08:00
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
ce28972269
Updates cocos/2d/cocos2d.vcxproj.
2014-01-23 10:36:44 +08:00
19062d716d
Updates includes path to 'desktop/CCEGLView.h'. And added windows relevant codes.
2014-01-23 10:27:42 +08:00
9b02f97217
Updates windows project to use the unified 'desktop/CCEGLView.h/.cpp'.
2014-01-23 09:58:12 +08:00
a1729fa1b4
Merge pull request #5159 from natural-law/develop
...
Add test case for issue 2572
2014-01-22 17:49:56 -08:00
c48415ef3c
Merge pull request #5163 from dabingnn/develop_improve_renderer
...
Develop improve renderer
2014-01-22 17:04:19 -08:00
dceb9cb1b9
compiles on Linux
2014-01-22 14:17:32 -08:00
6b8781241c
code is cleaner
2014-01-22 13:51:01 -08:00
7249d3ca76
Unified CCEAGLView on Linux and Mac
2014-01-22 13:05:37 -08:00
1b6dfcda40
Merge branch 'develop' into cceglview_in_desktop
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-01-22 11:21:16 -08:00
913360e526
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 22:32:44 +08:00
d6df71cc11
Fixed #3806 : Change parameters to const &
2014-01-22 22:31:26 +08:00
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
159f44a5dc
issue #3812 : performance improvement, 1. add vector reserve 2. use C++11 range loop
2014-01-22 18:24:23 +08:00
e900504e8b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 10:03:04 +00:00
ec297a2c31
close #3642:fix bounding box of new label is incorrect.
2014-01-22 18:01:37 +08:00
a2f5146731
close #3642:fix bounding box of the new label is a bit off.
2014-01-22 17:45:56 +08:00
351814c0be
Merge pull request #5158 from Dhilan007/develop_label
...
Label:remove unused code and optimization performance.
2014-01-22 01:24:48 -08:00
1b89a058fa
Merge pull request #5160 from samuele3hu/developBugFix
...
fix:Update the some test cases for lua
2014-01-22 01:21:50 -08:00
292c5a17c6
Merge pull request #5161 from pyrasis/develop
...
[Win32] fix localStorageGetItem crash when column text is NULL.
2014-01-22 01:17:32 -08:00
e1476c8d60
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
2014-01-22 17:09:33 +08:00
cc39ca4f16
issue #3812 : rename convertToWorldCoordiantes->convertToWorldCoordinates
2014-01-22 17:09:13 +08:00
f9615d891e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 08:57:36 +00:00
9c6a65baba
Merge pull request #5156 from minggo/deprecate-function
...
deprecated some functions in Object
2014-01-22 00:51:50 -08:00
e5d45583b7
[Win32] fix localStorageGetItem crash when column text is NULL.
2014-01-22 17:37:29 +09:00
7ea9a4f025
issue #3812 : remove member variable _lastCommand
2014-01-22 16:03:04 +08:00
5bbd48a9bf
issue #3812 : remove member variable _firstCommand, remove comment codes
2014-01-22 15:52:00 +08:00
e848167b25
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-22 15:44:33 +08:00
c4d2f1d83c
fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case
2014-01-22 15:41:46 +08:00
3c2ef04f2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 15:39:28 +08:00
3007f34240
issue #2572 , Add test case for issue 2572.
2014-01-22 15:38:59 +08:00
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
4095ab36b6
update xcode project.
2014-01-22 15:22:46 +08:00
cf6785ffcf
issue #3812 : using std::vector<QuadCommand*> to hold current batched command
2014-01-22 15:18:27 +08:00
65c2e03721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-22 15:08:05 +08:00
df21bbf7df
1.remove unused code
...
2.reduce calculation amount.
3.reduces expenses of function calls
2014-01-22 14:57:11 +08:00
4381685a9d
deprecated some functions in Object
2014-01-22 13:47:29 +08:00
64ab0c0e35
Merge remote-tracking branch 'remotes/upstream/develop' into develop
...
Conflicts:
cocos/2d/CCFontDefinition.cpp
2014-01-22 14:15:21 +09:00
97b473731d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 04:20:57 +00:00
88ef4e1cc5
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-22 11:58:59 +08:00
63543b0f32
Merge pull request #5151 from minggo/iss3713-replace_CCObject
...
fix memory leak of autorelease pool
2014-01-21 19:52:47 -08:00
4efb5bd686
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-22 03:41:19 +00:00
562d10c89f
issue #3713 : every autorelease will cause a release operation
2014-01-22 11:40:07 +08:00
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
c906075017
issue #3713 : use reference in loop
2014-01-22 11:03:06 +08:00
9ffcef4982
issue #3713:fix memory leak of autoreleas pool
2014-01-22 10:17:42 +08:00
0ab5ec742a
closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context
2014-01-22 10:16:34 +08:00
1113587f47
mac/CCEGLView moved to desktop/
2014-01-21 17:52:30 -08:00
94ea94a113
global Z order uses floats
2014-01-21 16:36:19 -08:00
b51b04f315
ActionsProgress test include fixes
2014-01-21 16:28:52 -08:00
06be466f29
Removed unused code and files.
...
Making the mac platform easier to mantain
2014-01-21 16:25:29 -08:00
98d23d30a6
First step in simplifying the mac platform
2014-01-21 15:44:01 -08:00
e402f35e7f
BatchCommand API fixes
...
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
2014-01-21 11:13:21 -08:00
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
f1444a26a1
Improves documentation with local z order
2014-01-21 09:26:58 -08:00
2343d0f9cb
Merge pull request #5141 from samuele3hu/developBugFix
...
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 06:40:18 -08:00
30f07ccdea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-21 18:40:10 +08:00
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
3de7ed93f9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
2014-01-21 18:18:32 +08:00
a467fe3244
Fixed #3806 : SAXParser supported with manual binding in JSB
2014-01-21 18:12:12 +08:00
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +08:00
77b5d4c772
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-21 17:52:13 +08:00
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
2338d773dc
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 17:51:49 +08:00
6378d10d5d
issue #3713:add test case for autorelease pool
2014-01-21 17:47:59 +08:00
b9e5484e57
Merge pull request #5139 from samuele3hu/developPerf
...
closed #3802:Add some manual lua-binding functions for the cocos2d::Lable and update the related test cases
2014-01-21 01:11:53 -08:00
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
88be8606b9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
2014-01-21 16:46:28 +08:00
da8e208f47
close #3802 : Add some manual lua-binding functions for the Lable and update the related test cases
2014-01-21 16:36:29 +08:00
6c0ccea547
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-21 16:33:53 +08:00
89c8e7e2fb
closed #2572 , The arithmetic of child's position in ParallaxNode::addChild() is wrong.
2014-01-21 16:25:35 +08:00
09579abac9
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2014-01-21 17:24:07 +09:00
12fb55a291
Merge pull request #5137 from Dhilan007/develop_crash
...
fix crash cause by string(null).
2014-01-20 21:59:38 -08:00
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +08:00
b8adba4c64
fix crash cause by string(null).
2014-01-21 11:59:43 +08:00
8af2ac76df
Merge pull request #5136 from dumganhar/iss3789-dispatcher-global-z
...
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-20 18:54:51 -08:00
f22e4d474f
move some method to FontFreeType that only relating to FontFreeType from Font.
2014-01-21 10:36:32 +08:00
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
ee06a5908c
issue #3713:invoke static member function to destroy singleone object
2014-01-21 10:14:00 +08:00
d0e3a81d18
fix compiling error cause by undefined ssize_t on vs.
2014-01-21 09:52:43 +08:00
1c31871543
Compilation fixes in LocalStorage. include localStorage.h.
2014-01-20 23:01:44 +08:00
e5f723774d
Updates jsbindings and localStorage.
2014-01-20 22:45:40 +08:00
8b6763a6ac
LocalStorage: const char* —> const std::string&.
2014-01-20 22:31:56 +08:00
43b2217fcf
Include fix: CCFileUtils.h —> platform/CCFileUtils.h
2014-01-20 21:30:32 +08:00
432534d857
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
2014-01-20 17:31:12 +08:00
7d6dda5727
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 17:14:45 +08:00
3e5fbb2422
issue #3713 : remove Object::_autoReleaseCount
2014-01-20 17:08:22 +08:00
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
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
0468a1234b
A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
2014-01-20 14:22:30 +08:00
000d68b8b7
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 13:46:33 +08:00
223857398d
Add "override"
2014-01-20 13:44:44 +08:00
f10e1ee04c
optimize scissor clipping
2014-01-20 13:38:13 +08:00
f97b40187c
closed #2789 : Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map.
2014-01-20 12:01:40 +08:00
a3f9a636e2
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-20 11:54:11 +08:00
802fc092be
fix compiling error cause by miss include header file.
2014-01-20 11:43:13 +08:00
7d44da43c4
fix compiling error cause by include a non-existent file.
2014-01-20 11:34:31 +08:00
b8943da99e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-01-20 11:24:42 +08:00
0d4d4c53f4
issue #2789 : Improves performance for Map<K,V>::keys.
2014-01-20 11:13:29 +08:00
5018c9ba6c
Removes unused cast in CCTMXTiledMap.cpp.
2014-01-20 11:13:29 +08:00
a0b86abcf4
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
2014-01-20 10:32:12 +08:00
47c8243812
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-18 19:53:43 +00:00
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
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
86e102ab16
fix namespace in spine lua manual binding
2014-01-18 10:58:17 +08:00
3c74044929
Merge pull request #5117 from samuele3hu/test-rebase
...
close #3626:Add the “override “ keyword
2014-01-17 18:49:33 -08:00
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
9d040ff09c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase
2014-01-17 22:23:57 +08:00
85539e7548
issue #3626:Add the “override “ keyword
2014-01-17 22:20:21 +08:00
d485ade977
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-17 14:14:30 +00:00
8eca8e25cb
Merge pull request #5099 from samuele3hu/test-rebase
...
close #3626:Make lua bindings-generator support the namespace binding
2014-01-17 06:07:45 -08:00
a33465638d
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-17 15:24:23 +08:00
f33064a2fc
Fixed bug of label
2014-01-17 15:22:59 +08:00
0a6316a2f3
Merge pull request #5105 from Dhilan007/develop_label
...
close #3678:fix incorrect spacing between characters
2014-01-16 23:18:44 -08:00
805e2ad2ba
Merge pull request #5107 from CocosRobot/updategeneratedsubmodule_1389939079
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-16 22:34:53 -08:00
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
58ed383c01
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
2014-01-17 14:12:19 +08:00
0c777b0d85
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-17 06:11:22 +00:00
db4dc28c1a
close #3678:fix incorrect spacing between characters
2014-01-17 14:04:52 +08:00
1b5b9da102
compiles on Android
...
compiles on Android
2014-01-16 21:58:14 -08:00
cfbceb0e22
Fixes compilation issues on Linux
2014-01-16 21:49:14 -08:00
a74a524eaa
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes
2014-01-16 21:36:22 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
233faea690
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-17 13:11:29 +08:00
bea46fa290
Add clone method to LayoutParameter
2014-01-17 13:10:04 +08:00
602133a071
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-17 11:25:38 +08:00
cf857aade2
issue #3626:Modify some files that skipped some modifications because of merge
2014-01-17 11:22:03 +08:00
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
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
d086f7a259
issue #3626:Add the deprecated support for the tolua.cast
2014-01-17 10:19:57 +08:00
31339d10e5
issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script
2014-01-17 10:19:57 +08:00
d49e28610b
issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times
2014-01-17 10:19:56 +08:00
35d031ea06
issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module
2014-01-17 10:19:56 +08:00
de698aaea7
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
2014-01-17 10:19:55 +08:00
811aa69d39
issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases
2014-01-17 10:19:55 +08:00
fdac224a7b
issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace
2014-01-17 10:19:55 +08:00
510fce7b12
issue #3626:Add namespace’s support for manual lua binding of functions about physics
2014-01-17 10:19:55 +08:00
b72f309076
issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases
2014-01-17 10:19:54 +08:00
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
f5afa09de1
remove unneeded empty line.
2014-01-17 09:46:59 +08:00
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
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
3210e12e1c
fixes #3734
2014-01-16 14:23:52 -03:00
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
671b008f3d
fix compiling error cause by sprintf_s.
2014-01-16 17:50:09 +08:00
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
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
d000d9739d
Merge pull request #5084 from andyque/develop
...
closed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
2014-01-15 23:33:45 -08:00
4a6e137389
fixed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate
2014-01-16 15:00:35 +08:00
18bd978480
1.add label crash test
...
2.fix lose char when label have unknown character.
2014-01-16 14:37:07 +08:00
91b89fc647
Merge pull request #5083 from natural-law/android_bugs
...
Solve some bugs on android
2014-01-15 22:04:54 -08:00
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
e7b584908e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
2014-01-16 11:58:49 +08:00
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
afe49b3a2b
1.Fix crash bug when using unknown character
...
2.Fix text align mistake
2014-01-16 11:47:06 +08:00
3c816c3c85
closed #3723 , Make sure the init method of Cocos2dxHelper only invoked once.
2014-01-16 11:26:23 +08:00
2f53cd4483
Merge pull request #5081 from ricardoquesada/renderer_optimizations
...
More renderer optimizations
2014-01-15 19:11:59 -08:00
3b20ad5ab7
More renderer optimizations
2014-01-15 19:10:40 -08:00
3dddfa885e
Merge pull request #5079 from CocosRobot/updategeneratedsubmodule_1389840190
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 18:47:54 -08:00
beb7015d7e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-16 02:43:13 +00:00
f6ad3a9971
Merge pull request #5078 from ricardoquesada/sprite_fixes
...
Sprite: removed _hasChildren
2014-01-15 18:38:04 -08:00
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
9b490a9124
Sprite: removed _hasChildren
...
_hasChildren has been replaced with !_children.empty()
2014-01-15 18:37:07 -08:00
5ef9eef0ae
use data.isNull() instead of !data.getBytes()
2014-01-16 10:09:04 +08:00
a410c38e54
Update VS project file.
2014-01-16 09:55:13 +08:00
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
65602a4574
Updates Xcode, Android and Linux project
...
with new BatchCommand
2014-01-15 16:06:47 -08:00
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
4278f024b8
Console::log(format, va_args) is private
...
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
1c4399de36
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-15 20:08:50 +08:00
fdf5a4c0b5
Fixed bug of reader.
2014-01-15 20:06:49 +08:00
68eddf3cd7
fix compiling error
2014-01-15 17:29:07 +08:00
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
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
a5c26b7da9
issue #3401 : add physics action and pump test for lua.
2014-01-15 13:52:24 +08:00
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
60009a818e
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-15 12:05:17 +08:00
fc05002a77
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-15 11:11:41 +08:00
226054e810
Merge pull request #5067 from ricardoquesada/compile_error_fix
...
ooops
2014-01-14 18:55:34 -08:00
f0537f17da
ooops
2014-01-14 18:55:14 -08:00
3b208337fe
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 02:39:20 +00:00
3f62a87ef7
remove the workaround cast
2014-01-15 09:46:41 +08:00
82797d8434
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 01:37:15 +00:00
2efeb32352
Merge pull request #5063 from ricardoquesada/performance_test_fixes
...
Performance Test fixes
2014-01-14 17:24:49 -08:00
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
a18788ff0a
Fix artifects when VBO is full
2014-01-14 16:45:40 -08:00
a71367a7de
fix compile error
2014-01-14 19:37:07 +08:00
b9a7031f92
refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
2014-01-14 19:21:09 +08:00
de30a9cfea
issue #3401 : add lua physics slide test, add more banding code, and fix some bugs.
2014-01-14 15:48:44 +08:00
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
4d665bc96a
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-14 15:01:24 +08:00
9ecc1309d9
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-14 14:52:29 +08:00
7e1fd18f76
FLT_MIN —> FTL_EPSILON.
2014-01-14 14:38:34 +08:00
fdfa84ce20
Fixed bugs.
2014-01-14 14:37:31 +08:00
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
83a42dc760
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-14 13:59:00 +08:00
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08:00
c49aa1f125
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-13 23:07:44 +00:00
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
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
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
567455dd38
convert tab to space
2014-01-13 21:28:42 +09:00
b45abf3f2d
Bug fixes for new label
2014-01-13 21:14:50 +09:00
4bbcd91bdf
Fix for compiling error for windows
2014-01-13 20:51:56 +09:00
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
d11bfeb8d4
fix compiling error on win
2014-01-12 11:02:48 +08:00
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
b10783972f
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-11 04:39:03 +00:00
f4a99d0627
Removes DirectorDelegate
2014-01-10 20:26:15 -08:00
f76fcf7f2a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-11 04:06:53 +00:00
b870180af6
Mmmm... what?
...
removing useless debug message
2014-01-10 19:26:03 -08:00
c88f81481b
JSB compiles OK
2014-01-10 19:22:04 -08:00
dbcf5021a6
Compiles on Linux
2014-01-10 19:10:35 -08:00
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
c68ad76bfe
don't send "unknown command".
...
... if the command is an empty command
2014-01-10 18:11:35 -08:00
2316e4d55f
Debug messages are forward to the console
2014-01-10 17:58:54 -08:00
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
a013565420
Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange
...
fix layerColor bug for shader change
2014-01-10 06:26:49 -08:00
4e2d6143af
Fixed bug of reader
2014-01-10 17:02:16 +08:00
af6c76c242
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-10 16:05:26 +08:00
3f4db26a2b
Fixed bugs
2014-01-10 16:02:23 +08:00
0088399d94
Merge pull request #5016 from akof1314/develop
...
Support MinGW with CMake for TestCpp
2014-01-09 23:13:19 -08:00
16367b7594
solve conflicted with math.h isnan
2014-01-10 14:20:00 +08:00
8b350cb20a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-10 03:14:18 +00:00
ca5667cb7c
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
2014-01-10 10:46:30 +08:00
a1629a09e8
fix layerColor bug for shader change
2014-01-10 10:03:47 +08:00
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
f87af9e998
fix linux build
2014-01-09 19:49:11 +08:00
c3b7a9645a
Fixed bugs of "anchor point" and "update"
2014-01-09 19:00:47 +08:00
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
13f1fdd79d
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 18:45:49 +08:00
2e4c76a5d7
closed #3644 : Keyboard pressed events are being repeatedly fired before keyboard is released.
2014-01-09 18:34:35 +08:00
2ce23dca2a
Merge pull request #5015 from samuele3hu/developNewUI
...
closed #3643:Lua websocket can't receive more than 64 bytes of data
2014-01-09 02:12:49 -08:00
4dbb0ee1e8
mingw console
2014-01-09 17:48:37 +08:00
8826659cf1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-09 17:24:37 +08:00
2cbe502113
issue #3643:Lua websocket can't receive more than 64 bytes of data
2014-01-09 17:23:22 +08:00
c3b2a99be6
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 17:17:52 +08:00
c60681c556
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 09:17:11 +00:00
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
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
e34ef0d38f
change initialization _data from 0 to nullptr.
2014-01-09 16:33:31 +08:00
1ca7642976
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 15:51:24 +08:00
19f0e55464
fixed bug of layout
2014-01-09 15:43:18 +08:00
e063755596
fix Image crashes in mac when load tag file
2014-01-09 15:26:05 +08:00
2c8c7a7a9d
Merge pull request #5008 from dumganhar/iss3605-websocket-4k
...
Merge PR #5003 : fix WebSocket cannot send/receive more than 4096 bytes of data
2014-01-08 23:23:42 -08:00
f8d369248b
closed #3605 : Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line.
2014-01-09 15:18:06 +08:00
ce0b86e7fe
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 06:56:48 +00:00
a5130633c6
Merge pull request #5005 from walzer/remove_UICCLabelAtlas
...
Hide default constructor of LabelAtlas into protected, and modify related invokes.
2014-01-08 22:50:59 -08:00
1ad14340bf
issue #3627 , remove Hungarian Notation in LabelAtlas
2014-01-09 14:26:34 +08:00
8da4879560
issue #3627 , remove lua/js doxygen mark from LabelAtals constructor & destructor.
2014-01-09 14:21:43 +08:00
b0f6ae8c42
Merge commit 'refs/pull/5003/head' of git://github.com/cocos2d/cocos2d-x into websocket-test
2014-01-09 14:16:44 +08:00
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
480a9277da
fix WebSocket cannot send/receive more than 4096 bytes of data
2014-01-09 13:29:56 +08:00
2945322b97
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 04:50:38 +00:00
7055340ace
fixed #3627 . There're no UICCLabelAtlas any more.
2014-01-09 12:43:57 +08:00
2d8fcb2c00
issue #3627 , remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
2014-01-09 12:40:51 +08:00
ac547cedca
Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-08 19:38:18 -08:00
746a360176
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 03:37:44 +00:00
23dec543b3
Merge pull request #4995 from Dhilan007/develop_crash
...
amendment incorrect use of macro
2014-01-08 19:30:29 -08:00
4cadcca497
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 11:01:47 +08:00
e66468025d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-09 02:59:53 +00:00
dc443e36d3
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
2014-01-09 09:59:39 +08:00
e3667a2894
Fixed bugs.
2014-01-09 09:58:27 +08:00
fe7d5cbdfb
update If Construct
2014-01-09 09:46:17 +08:00
d18da42695
fix addImageAsync bad judgment of generate image for the first ImageFile.
2014-01-08 23:42:54 +08:00
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
Dhilan007