50dee1a214
Reverting tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
2014-10-12 15:53:32 +08:00
86aee1e548
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
2014-10-12 15:39:22 +08:00
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
7747e2ecf5
Merge branch 'v3' into v3_addStaggeredTileMap
2014-10-11 15:15:12 +08:00
55431d6a83
add tile map staggered test
2014-10-11 15:09:58 +08:00
b064d9bbf8
Update project setting for Linux and Win32
2014-10-11 14:28:07 +08:00
0e1b680ab2
Revert "add test case for staggered map"
...
This reverts commit 4bbae0d9c5
2014-10-11 14:24:38 +08:00
9b9b9d9700
Fix the lua-tests compile error
2014-10-11 14:14:08 +08:00
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
ffd83bbdd0
Modifying win32 and wp8 protocol buffers lib
2014-10-10 22:38:34 +08:00
59ff2fbf72
remove dead code
2014-10-10 18:08:25 +08:00
0f0c3878e5
add more indicator
2014-10-10 17:36:33 +08:00
4bbae0d9c5
add test case for staggered map
2014-10-10 17:29:13 +08:00
fb1adb5b90
add issue tests skeleton
2014-10-10 17:07:08 +08:00
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
01e3ae2c61
Merge pull request #8606 from andyque/fixButtonContentSize
...
fix button title only content size issue
2014-10-10 15:23:25 +08:00
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
a26e91f839
no message
2014-10-09 18:30:39 +08:00
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
27cb6afb5e
fixes warnings on Android
2014-10-08 18:55:33 -07:00
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
84da993677
more samples using node::schedule(labmda)
2014-10-03 17:11:39 -07:00
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
12e9d18ab7
Compiles on Windows Phone 8
2014-10-01 19:08:34 -07:00
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08:00
d9204b009e
scale9Sprite without scale9enabled scale fix
...
scale9Sprite crop > border tile bug fix
2014-09-30 10:59:20 +04:00
90769ef242
fix compile error on win32
2014-09-30 14:40:24 +08:00
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
d1e41c771b
Merge pull request #8162 from super626/light
...
3D Light
2014-09-30 11:13:59 +08:00
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
3d69e5e1d4
Fix copy files in cpp-empty-test in MSVC build
2014-09-29 22:08:41 +02:00
a16c5d5e43
Adds missing includes
2014-09-29 14:45:43 -03:00
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
f00187d3bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-09-29 09:48:35 +08:00
99e1c6640e
Add BillBoardTest and update related bindings files
2014-09-29 09:43:22 +08:00
6b2acf88fc
Modify CameraTest and update related lua-bindings files
2014-09-28 16:47:06 +08:00
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
e50eaf684f
Add CameraTest and update related lua-bindings files
2014-09-28 14:31:58 +08:00
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
094716a500
Scale9Sprite cropped frames tests
2014-09-28 01:58:26 +04:00
abd960725a
add to linux project
2014-09-26 16:54:01 +08:00
2ac96ed06e
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
2014-09-26 16:39:54 +08:00
691074eb7c
Add Camra3DTest and update sprite3DTest
2014-09-26 16:00:57 +08:00
fd35d43510
remove unused resource
2014-09-26 15:57:18 +08:00
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
db2ff49f26
adjust according to minggo
2014-09-26 14:13:26 +08:00
bf84aba47e
do not add ambient color by default
2014-09-25 16:27:31 +08:00
eab0951c2d
reset
2014-09-25 16:07:57 +08:00
567c632d98
config max support light number in shader
2014-09-25 15:29:32 +08:00
38530772ae
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-25 15:26:03 +08:00
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
2cc48d1f81
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-25 10:40:31 +08:00
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
fdb30f1ee7
Merge pull request #8115 from Dhilan007/v3-audio903
...
New Audio Engine -MAC
2014-09-24 15:00:53 +08:00
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
b9c57f7e28
changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist
2014-09-23 10:39:17 -07:00
ed4e800d70
Add audio resource.
2014-09-23 15:38:40 +08:00
b8b5397e4e
Tests for Mac/iOS android Linux & Windows
2014-09-22 17:54:49 +04:00
908311ff7f
Added tests for opening a URL.
2014-09-22 17:51:05 +04:00
077ffb2b43
update lua binding
2014-09-22 15:54:35 +08:00
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
f0608a6d70
Update lua bindings for Mesh and add a Sprite3DHitTest
2014-09-22 15:29:38 +08:00
e8b20d8583
Merge pull request #8093 from wohaaitinciu/v3_WebView_win32
...
web view win32
2014-09-22 09:30:29 +08:00
681621805d
Merge pull request #8109 from andyque/fixTests
...
fix editbox test
2014-09-19 16:29:07 +08:00
06c0adcf6d
remove unused resource
2014-09-19 14:52:25 +08:00
7615eb8d39
fix editbox test
2014-09-19 14:21:18 +08:00
650f810815
add obb by default
2014-09-19 11:22:37 +08:00
62777e9552
compile Android
2014-09-18 18:35:18 +08:00
3c67515378
Finished light reconstruction
2014-09-18 16:38:35 +08:00
418ec69abf
compile error
2014-09-18 15:18:30 +08:00
442f30af1f
Merge pull request #8091 from dabingnn/v3_PageTurnZFighting
...
new version of avoid z fighting in pageTurn
2014-09-18 10:50:31 +08:00
39c6f9bfbd
remove setDepthTest(true) because it is not needed to be set for pageTurn
2014-09-18 10:00:36 +08:00
e9c6f5d02b
fix compile errors
2014-09-18 01:30:14 +08:00
27919dad77
add simple implement of WebView for win32
...
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
2014-09-17 22:30:15 +08:00
3a0e9be97e
new version of avoid z fighting in pageTurn
2014-09-17 18:33:18 +08:00
ccbf694927
Merge pull request #8086 from huangshiwu/v3_test
...
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
2014-09-17 14:50:42 +08:00
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
6badfb30e1
add getTitleRenderer interface to UIButton
2014-09-17 10:57:40 +08:00
7d97aaeeb3
Merge pull request #8078 from minggo/SchedulerPauseResumeAll-issue
...
SchedulerPauseResumeAll can not resume at 5s
2014-09-16 17:30:20 +08:00
da29b92ff4
Merge pull request #8072 from Dhilan007/v3-audio903
...
move AudioEngine to cocos2d:experimental namespace
2014-09-16 17:12:03 +08:00
3de82474c0
SchedulerPauseResumeAll can not resume at 5s
2014-09-16 16:38:30 +08:00
3907e5c1a2
fix ClippingNode's memory leak bug
2014-09-16 14:50:00 +08:00
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
27528f3e5f
Merge pull request #8061 from minggo/fix-cocostudio-test-crash
...
[ci skip]remove unneeded Android.mk
2014-09-15 22:53:18 +08:00
a61cda04ee
remove unneeded Android.mk
2014-09-15 22:47:44 +08:00
5f95ad221e
improve iOS WebView
2014-09-15 18:02:11 +08:00
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
7bb391ce55
Merge pull request #8033 from Dhilan007/v3-audio903
...
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
9cc9359b78
fix compile error
2014-09-15 11:16:27 +08:00
030fe34afa
fix UI related warnings
2014-09-15 11:13:56 +08:00
70f922d07a
Merge pull request #8030 from andyque/fixButtonScaleIssue
...
fix button scale issue
2014-09-15 09:49:06 +08:00
788f3c5c38
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
...
fix Editbox lua binding
2014-09-15 09:36:36 +08:00
7b0f41ed7b
remove auto scale text
2014-09-15 09:28:56 +08:00
51e3b1af7b
Add lua test case of AudioEngine
2014-09-14 22:54:48 +08:00
28af7999e5
update test case of AudioEngine
2014-09-14 22:49:27 +08:00
880929f102
fix button scale issue
2014-09-13 22:08:02 +08:00
02d2282b83
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
2014-09-12 17:07:06 +08:00
0addaf3912
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
2014-09-12 15:38:29 +08:00
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
11d8829b3a
Deprecate DrawPrimitives and enhance DrawNode --little modify
2014-09-12 14:50:41 +08:00
c81cfc1ecf
fix text doesn't scale with button issue
2014-09-12 14:24:27 +08:00
ed22792a72
fix text only button issue
2014-09-12 13:50:13 +08:00
6182a872c6
Deprecate DrawPrimitives and enhance DrawNode --more modify
2014-09-12 11:12:20 +08:00
147bb7301b
fix wp8 compile error --add BillBoard and BillBoardTest
2014-09-12 09:33:30 +08:00
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
9901cad113
merge cocos
2014-09-11 15:55:00 +08:00
df9ab144fe
light work
2014-09-11 15:46:32 +08:00
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
fc27c5e32a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-09-10 14:35:33 +08:00
46d4f487bb
Merge pull request #7978 from super626/v3
...
Calculate Content Size for Sprite3D
2014-09-10 14:06:47 +08:00
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
acae8a2535
Merge branch 'v3' into addChipmunkStaticLib
...
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
2014-09-10 10:00:15 +08:00
f5cd48f154
Android properties back to 10
2014-09-09 18:46:47 -07:00
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
2014-09-09 12:18:31 -07:00
4099015421
Sprite3D set default _contentSize by AABB
2014-09-09 17:47:34 +08:00
117c38f806
Sprite3DHitTest use AABB testing
2014-09-09 17:05:33 +08:00
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
6a4397a3eb
change toolset from 12.0 to 4.0
2014-09-09 15:57:21 +08:00
6697989174
Update test case of AudioEngine.
2014-09-09 10:48:07 +08:00
a295159a3a
Merge branch 'newcode' into transition
2014-09-09 10:37:08 +08:00
1b96b2ac87
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
2014-09-09 10:32:56 +08:00
59dc56bfcb
remove chipmunk dependency
2014-09-05 21:59:30 +08:00
01358f0b62
fix wp8 compile error and modify default resource path
2014-09-05 15:43:08 +08:00
730ab846c3
code adjustment
2014-09-05 14:59:14 +08:00
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
6b4b5ed943
Refactoring API:
...
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 11:13:51 +08:00
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
a5e1e692e8
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-04 17:00:49 +08:00
c42bef1f02
Add a bulletin board test example
2014-09-04 16:58:00 +08:00
d114e11a0b
android, linux and lua
2014-09-04 16:45:42 +08:00
ed63f01c7e
seperate billboard test from Sprite3D test
2014-09-04 16:27:18 +08:00
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
047025696c
Merge pull request #7680 from andyque/fixNormalizedPosition
...
fix normalizedPosition bug
2014-09-03 10:07:22 -07:00
a352a10d38
Add test case for new audio engine.
2014-09-03 18:20:31 +08:00
58f4e84b9a
Merge pull request #126 from songchengjiang/billboard
...
Billboard
2014-09-03 18:12:08 +08:00
68ce6449e8
repaired camera orientation
...
Testing RotateBy action
2014-09-03 17:17:57 +08:00
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
1bd09f21d0
merge cocos
2014-09-03 15:42:58 +08:00
58f219fc20
test extension::Scale9Sprite and remove unused file compile flags
2014-09-03 15:00:09 +08:00
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
b00a7b3b38
add Node normalizedPosition bug test
2014-09-03 09:16:31 +08:00
a79d35d08b
remove NodeNormalizedPositionTest
2014-09-03 09:16:31 +08:00
fab9a0052b
fix normalizedPosition bug
2014-09-03 09:16:31 +08:00
8dff467b27
Merge branch 'newcode' into transition
2014-09-03 09:15:12 +08:00
dafbf28283
fix release mode compile error
2014-09-02 16:42:23 +08:00
fadfa87afd
fix vs2013 compile error
2014-09-02 16:42:04 +08:00
18d06015c6
Added More Models
...
Code optimization
2014-09-02 11:24:19 +08:00
c13e7b7224
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
2014-09-02 10:06:17 +08:00
6dc45f86e4
fix windows compile error
2014-09-02 10:05:22 +08:00
fa33ab76fc
remove UIEditBox test
2014-09-01 18:23:45 +08:00
e24192aeb2
fix linux compile
2014-09-01 18:06:21 +08:00
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
0076953f97
fix iOS compile error
2014-09-01 15:55:09 +08:00
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
538fe2e543
Merge branch 'newcode' into transition
2014-09-01 15:14:30 +08:00
3f8b430b3e
deleted Meshcommand
2014-09-01 09:33:08 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
a039d6b0fc
animate3d transition
2014-08-29 18:25:42 +08:00
9f715e4e00
Added Sprite3D Model
2014-08-29 18:18:19 +08:00
8d971054f2
Android -p 10
2014-08-29 18:02:17 +08:00
0d75998027
pressure test
2014-08-29 17:58:20 +08:00
4aa4287d28
test on Android
2014-08-29 17:29:15 +08:00
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
71d722854c
added mesh command
2014-08-29 12:08:28 +08:00
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
f5ea9a2219
tab format
2014-08-29 09:33:28 +08:00
06e3eb955f
repaired BillBoard Depth Test
2014-08-29 09:30:59 +08:00
ac8158c60b
Tab Format
2014-08-29 09:14:54 +08:00
e16fb5977e
Finished BillBorad
2014-08-29 09:14:22 +08:00
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
e24a903c88
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
2014-08-28 16:13:11 +08:00
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
681c3c06f1
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
...
stopAllActionsByTag && removeAllActionsByTag
2014-08-28 14:24:37 +08:00
2fd6cf8f43
fix compiling error
2014-08-28 13:59:56 +08:00
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
014ba0d12e
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
2014-08-28 10:17:32 +08:00
5067741140
Deleted Plane Model
2014-08-28 10:16:15 +08:00
d0943afb62
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-08-28 09:24:04 +08:00
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
dbdd2b3e13
Adds ClippingNode bug test case
2014-08-27 10:54:15 -07:00
26dc7de802
Repaired Light Shader BUG On ios
2014-08-27 21:03:52 +08:00
731d1165c3
Spot Light Shader optimization
2014-08-27 17:09:20 +08:00
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
c5515874d5
merge cocos
2014-08-27 11:00:14 +08:00
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
4597de069d
improve test case and make program more robust
2014-08-27 08:02:22 +08:00
84c5542a0e
Merge branch 'v3' into addWebView
2014-08-26 22:11:35 +08:00
9449152caf
finish WebView Tests
2014-08-26 22:03:55 +08:00
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
e12db46866
fix style
2014-08-26 12:08:26 +08:00
2226d4b420
change WebView namespace and add WebViewTest
2014-08-26 11:39:56 +08:00
3d59aaf86e
Replaced Tab Format
2014-08-26 09:43:11 +08:00
cff5b65314
Merge branch 'newcode' into v3
2014-08-25 21:20:49 +08:00
dd93439c4b
replace model
2014-08-25 19:25:51 +08:00
00085c157f
Added skeleton Model
...
Light On/Off
2014-08-25 16:32:15 +08:00
07cf4d3526
Fix the win32 and android compile error
2014-08-25 14:10:13 +08:00
1a1ccda3ed
repaired Action BUG
2014-08-25 13:58:15 +08:00
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
8bfd56c080
use normal walk
2014-08-25 11:31:38 +08:00
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
74fc9931e7
fix compiling error of cpp-tests on linux
2014-08-24 19:12:36 -07:00
1126e950b2
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
2014-08-25 09:52:48 +08:00
1b985db2ff
adjust android.mk for lua-tests
2014-08-25 09:49:16 +08:00
25aab05b1f
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
2014-08-25 09:48:14 +08:00
dcea3b6134
Merge pull request #7843 from huangshiwu/v3_glviewattrs
...
V3 glviewattrs
2014-08-25 09:46:19 +08:00
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
1db3d14896
reset bone number to 60, put test in alphabetical order
2014-08-22 16:06:36 +08:00
1938817187
reset girl name
2014-08-22 14:24:40 +08:00
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
aba973b1ea
Merge pull request #7834 from andyque/improveUI
...
add click event listener to all Widget classes
2014-08-22 14:00:10 +08:00
d90572fc10
engine refactor hide concept of submesh
2014-08-22 13:52:03 +08:00
1bda276392
Update android.mk for related cpp test cases
2014-08-22 13:49:54 +08:00
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
0c9c873edb
Merge pull request #7846 from andyque/addUILuaBindings
...
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 13:40:02 +08:00
2d5431353a
engine adjust
2014-08-22 13:25:26 +08:00
13003fe0a6
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 11:56:13 +08:00
84cf0ee834
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 11:49:39 +08:00
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
5bad6e216b
Added No Normal Shader
2014-08-21 10:33:16 +08:00
3f51926c5d
add click event listener to Widget
2014-08-21 10:21:07 +08:00
2369a5900d
merge v3 to v3_glviewattrs
2014-08-21 10:18:55 +08:00
c26a81bb55
Merge branch 'newcode' into v3
2014-08-21 09:53:06 +08:00
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
26cb5d8bae
Replace Tab Format
2014-08-20 16:43:01 +08:00
3a1c0583fb
optimization
2014-08-20 16:41:45 +08:00
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
8b5bd3dbb6
Repaired the errors of Shader PassValue On Android
...
Light modification
2014-08-20 16:20:22 +08:00
46f3ab9b57
add Scale9Sprite to create method of ui::EditBox
2014-08-20 16:08:28 +08:00
34629f1014
fix windows & win8 & wp8 compile error
2014-08-20 12:02:12 +08:00
a27a420a91
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCSprite3D.cpp
2014-08-20 11:45:48 +08:00
07eb0d373c
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
cocos/ui/Android.mk
2014-08-20 09:32:29 +08:00
58abc4c08f
Light Shader modification for Android
2014-08-19 19:24:19 +08:00
a8ab1a85b7
fix linux compile error
2014-08-19 17:42:17 +08:00
b7fa3624cf
stopAllActionsByTag test
2014-08-19 13:31:19 +04:00
4cf1c6a47c
deleted redundant code
...
Replace Tab Format
2014-08-19 16:32:49 +08:00
d9bf2c2b7e
Finished Light And Test
2014-08-19 15:51:30 +08:00
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
54423efe9f
fix reskin
2014-08-19 15:25:00 +08:00
534938d88c
fix linux compile error
2014-08-19 15:17:48 +08:00
9f444b7010
Merge pull request #104 from liuliang2004/Meshv3
...
Modification is compatible with the old model
2014-08-19 14:32:05 +08:00
94be97f724
Modify change interface
2014-08-19 14:30:27 +08:00
06dfaf9db5
Modify change interface
2014-08-19 14:21:48 +08:00
9d3bab3810
Modification is compatible with the old model
2014-08-19 14:03:41 +08:00
680f089ae1
Shader: Light struct modification
2014-08-19 13:54:30 +08:00
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
38fdef614a
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
...
add swallow touch and propagation to parent widgets customization
2014-08-18 23:16:22 +08:00
9603366fcb
Fixed Android compiled Problem
2014-08-18 18:05:13 +08:00
3fd122391c
reset sprite3dtest
2014-08-18 18:01:57 +08:00
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
e0168c373c
Add manual lua bindings for 3d and adjust related test case on different platform
2014-08-18 15:04:32 +08:00
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
9b3a02f350
Added Light Test
...
Added Point Light
2014-08-17 21:33:33 +08:00
7159914248
old model work
2014-08-16 16:56:04 +08:00
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
08a4ebba06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
0517ceb0dc
add scrollView nested tests
2014-08-15 16:21:27 +08:00
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
ae11f24cc8
Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline
...
V3 fix skinned outline
2014-08-14 11:26:35 +08:00
18851d3e81
add customization to UIButton and UIPageView
2014-08-14 11:14:24 +08:00
a9a403013c
fix skinned outline effect
2014-08-14 10:44:03 +08:00
5d49afec0e
fix ios running error
2014-08-14 10:04:01 +08:00
a88504b153
Merge pull request #7756 from andyque/fixTestCase
...
fix custom particle tests position
2014-08-14 09:44:16 +08:00
0b86e129b0
Merge pull request #7762 from andyque/addAlignmentToUILabel
...
add UITextField color & place hold color, fix double delete bug
2014-08-14 09:38:57 +08:00
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
d223629477
Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
...
add callback for RenderTexture::saveToFile
2014-08-13 10:05:08 +08:00
e269ad49c1
fix custom particle tests position
2014-08-13 09:56:37 +08:00
cc37780861
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
...
V3 add skinned outline
2014-08-12 15:07:21 +08:00
e4bb0ad3c8
fix some merge errors.
2014-08-12 11:39:56 +08:00
5a2564755c
change NULL->nullptr
2014-08-12 11:29:37 +08:00
3a7b673164
add callback for RenderTexture::saveToFile
2014-08-12 10:50:57 +08:00
790ef9e818
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
...
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
2014-08-12 10:20:34 +08:00
e387caf763
add create(modelPath) interface for EffectSprite3D
2014-08-12 09:56:25 +08:00
0dff45cfc2
adjust SkinnedEffectCode
2014-08-12 09:51:03 +08:00
e66d1f6f69
add skinned outline effect
2014-08-11 18:11:15 +08:00
b34e97cfd6
Merge pull request #7729 from andyque/fixCascadedColor
...
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:33:36 +08:00
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
43a3603a8b
Merge pull request #7720 from samuele3hu/v3_module
...
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
2014-08-11 15:01:28 +08:00
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
6d15c26a61
move create default camera to Scene::initWithSize
2014-08-11 10:55:14 +08:00
47c034af5d
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
2014-08-11 10:25:40 +08:00
933439c6ca
fix linux
2014-08-09 09:27:48 +08:00
014b6d06e4
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
2014-08-08 18:26:34 +08:00
e904ee646a
windows work
2014-08-08 18:25:36 +08:00
6d5b63ec6a
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
2014-08-08 18:15:01 +08:00
504ef32b97
linux
2014-08-08 18:14:41 +08:00
7e1adeb3e9
add new test case
2014-08-08 18:01:36 +08:00
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
2dacbf6f26
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-08 16:59:33 +08:00
2ffc0e2e53
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 16:56:22 +08:00
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
00865c8abb
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 15:22:12 +08:00
7408250113
add drawline
2014-08-08 15:01:24 +08:00
d00e3349a3
fixed loadingBar change direction affect position issue
2014-08-08 11:17:17 +08:00
28769c9b15
add obb sample
2014-08-08 11:16:33 +08:00
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
7b11c6a74e
Merge pull request #7237 from martell/v3
...
Cmake update and remove old scripts from build folder
2014-08-07 10:36:10 +08:00
4542b1882d
Merge pull request #7617 from rny/SpriteFrameCache
...
SpriteFrameCache load from plist file content data
2014-08-07 10:20:36 +08:00
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
0daa30419b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
2014-08-06 00:37:19 +08:00
99c52f0102
Split module for Linux on Lua and adjust related test cases
2014-08-06 00:15:44 +08:00
d86a37110d
Split module for win32 and adjust related test cases
2014-08-05 19:46:13 +08:00
da18657f4f
Add module Android.mk config and adjust related test cases
2014-08-05 13:29:54 +08:00
cc75a8e860
Merge pull request #7632 from super626/v3
...
SubMesh and AttachMement
2014-08-05 09:59:38 +08:00
f44906d56c
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
2014-08-05 08:11:37 +08:00
cd0c82f8b7
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
2014-08-04 17:11:57 +08:00
11a13ce9e2
Merge branch 'newcode' into v3
2014-08-04 15:41:21 +08:00
e5f9c1b488
Adjust common script and related test cases
2014-08-04 15:22:07 +08:00
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
6f4cafcc1b
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
5af4657fbb
fix windows utf8 source code file can not compile erorr
2014-08-01 21:20:27 +08:00
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
137de84b05
add test case
2014-08-01 14:39:45 +08:00
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +08:00
2b562ace1a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-07-31 17:22:33 +08:00
2851bd9193
Merge pull request #7627 from andyque/fixScale9Sprite
...
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +08:00
a47e52b5bc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-07-31 15:22:46 +08:00
9666f1ad7f
Split luabindings module to some independent modules
2014-07-31 15:20:23 +08:00
0e7eb3614e
Merge pull request #7618 from dabingnn/v3_buildAllTarget
...
add target to build All target
2014-07-31 14:25:37 +08:00
a77b8e7320
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
...
add utf8 support for TextField widget
2014-07-31 13:41:57 +08:00
cd379ab412
add axe model
2014-07-31 11:26:27 +08:00
1de2b78d61
refactor, optimize Scale9Sprite
2014-07-31 11:07:20 +08:00
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +08:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
428e9b1b1a
Merge branch 'v3' into v3_buildAllTarget
2014-07-30 14:12:28 +08:00
f2b0528cc9
refactor
2014-07-30 10:45:35 +08:00
7abea5dc58
add utf8 support for UITextField
2014-07-30 10:34:37 +08:00
955da5d3cc
move utf8_substr to ui::helper class.
2014-07-30 10:34:37 +08:00
d86cc0a811
decouple libcocos2d and cocosdenshion
2014-07-29 18:08:40 +08:00
5a22636441
fix windows compile error
2014-07-29 17:51:34 +08:00
c5ca0dbf10
fix android and linux compile error
2014-07-29 16:24:27 +08:00
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
ebf05d1acc
add UIScale9Sprite tests
2014-07-29 16:24:27 +08:00
5d63ce17ad
Merge pull request #7610 from dabingnn/v3_windowChangeModule
...
V3 window change module
2014-07-29 14:29:01 +08:00
c722c0fcd0
libcocostudio for windows
2014-07-29 11:31:37 +08:00
1b6cda488a
add ParticleResetTotalParticles test.
2014-07-29 11:21:11 +08:00
d53ce4d664
libcocosbuilder rename for windows
2014-07-29 11:09:17 +08:00
6d0b8852d1
libSpine rename for windows
2014-07-29 10:53:39 +08:00
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +08:00
aaa65dcae4
Merge branch 'v3' into v3_windowChangeModule
2014-07-29 10:20:23 +08:00
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
d6bc2f4998
liuGUI->libui for windows
2014-07-28 22:12:07 +08:00
c6956504bf
change CocosDenshion to libcocosdenshion
2014-07-28 21:35:16 +08:00
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
b2e705acd8
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
...
fix remove self in Widget touch callback issue
2014-07-28 14:04:20 +08:00
2795c10627
rename box2d->libbox2d
2014-07-28 12:05:58 +08:00
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
7353f8685a
Simplify Widget ContentSize cascade change algorithm
2014-07-25 14:59:58 +08:00
e56e015be2
minor modification of tests
2014-07-25 14:40:58 +08:00
3502cb0a23
fix remove self in Widget touch callback issue
2014-07-25 14:23:04 +08:00
20e3a61524
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
...
mac custom font fix v2
2014-07-25 11:38:38 +08:00
b0c922d91e
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Add new file&directory apis into FileUtils and test cases
2014-07-24 22:18:10 +08:00
92ac809bfe
Mac fonts tests
2014-07-24 12:27:17 +04:00
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
21f1624462
minor fix of RichText
2014-07-23 14:10:00 +08:00
524d9cb8af
Merge pull request #7552 from andyque/fixScale9Sprite
...
fix scale9Sprite addChild zorder issue
2014-07-22 18:39:04 +08:00
1f4c289db4
fix scale9Sprite addChild zorder issue
2014-07-22 16:26:40 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
d2c6602dea
Refactor #5580 : Merge createDirectories to createDirectory
2014-07-21 16:51:48 +08:00
e666ab88ed
fix windows compile error
2014-07-21 14:59:47 +08:00
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
21647839b6
Merge pull request #7515 from Dhilan007/v3-320final
...
fixed warn and replace 'printf' with 'log';
2014-07-18 13:56:54 +08:00
c10e49201d
fixed compil
2014-07-18 13:44:07 +08:00
5d22bca240
fixed warn and replace 'printf' with 'log';
2014-07-18 10:20:37 +08:00
88da5d5fdb
disabled custom shader tests for WP8
2014-07-17 08:13:49 -07:00
7ff78c61ba
fix richText UTF8
2014-07-17 18:36:09 +08:00
578af01ef1
Merge pull request #7499 from andyque/fixRichTextUTF8
...
fix richText utf8 error
2014-07-17 17:57:41 +08:00
fc2ab110cc
fix richText utf8 error
2014-07-17 17:58:40 +08:00
6d0bf8e143
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
2014-07-17 17:25:32 +08:00
24d87ad05b
1. fixes ActionManagerEx crashes.
2014-07-17 17:24:41 +08:00
c482e2e14f
Merge pull request #7491 from Dhilan007/v3-320final
...
fixed text line wrap issue in UITextField.
2014-07-17 16:48:41 +08:00
d28fdb6752
Merge pull request #7490 from geron-cn/chukongv3
...
fix bug: cpp-test binary load test crash
2014-07-17 16:38:45 +08:00
8ac1398037
fixed text line wrap issue in UITextField.
2014-07-17 16:23:38 +08:00
4e9a710053
fix binary test crash bug
2014-07-17 16:16:49 +08:00
441f0ebca8
fix binary test crash bug
2014-07-17 16:13:12 +08:00
1a2caaeebf
fix binary test crash bug
2014-07-17 16:09:17 +08:00
8212ed3822
fix binary test crash bug
2014-07-17 16:01:03 +08:00
e975b0d5f9
Update experimental lua bindings、related test cases and project setting
2014-07-17 14:54:34 +08:00
ab0fe54d32
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 14:11:15 +08:00
4f5cd2a368
change FastTileMap to TileMap
2014-07-17 14:09:53 +08:00
2b3fbd743a
Merge pull request #7478 from Dhilan007/v3-320final
...
update test case of game controller[lua]
2014-07-17 13:37:49 +08:00
c6349ef246
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
...
disable FastTileMapTest on WP8
2014-07-17 13:35:52 +08:00
5682a983bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 12:57:31 +08:00
c29766a4ad
disable FastTileMapTest on WP8
2014-07-17 12:56:58 +08:00
eb8d1d70f7
Update the FastTileMapTest and VideoPlayerTest
2014-07-17 12:55:28 +08:00
6429cf06fb
update test case of game controller[lua]
2014-07-17 11:26:26 +08:00
e58626c11c
Merge pull request #7476 from Dhilan007/v3-gc0717
...
Fixed bugs[Ouya controller]
2014-07-17 11:12:31 +08:00
1ff937aa48
Fixed bugs[Ouya controller]:
...
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
2014-07-17 11:09:08 +08:00
5a5b245e84
Merge pull request #7474 from andyque/fixFastTileMap
...
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:52:40 +08:00
880c2c4c3f
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:46:20 +08:00
4c7d777f25
Merge pull request #7471 from visiblelight/wp8_shader_update
...
Wp8 shader update
2014-07-17 10:14:54 +08:00
40951d586c
update
2014-07-17 10:10:33 +08:00
c47d844d20
update the buildin shaders on WP8. Disable the effect 3d test.
2014-07-17 10:08:49 +08:00
ce4f5f0e96
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 10:02:16 +08:00
a653d0eb28
Merge pull request #7440 from boyu0/add_utils_atof
...
Add utils::atof(), fix bug: particle not shown on android.
2014-07-17 09:59:15 +08:00
d6d182cb59
Fix the action can’t be triggered in the TriggerTest
2014-07-16 23:18:10 +08:00
b782814b4b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-16 22:08:48 +08:00
1b2d389011
Update ListViewEventType for Lua
2014-07-16 17:18:01 +08:00
80de57be39
1、 fixes lua TriggerTest bug.
2014-07-16 14:50:35 +08:00
7e7c3a1e55
Merge branch 'v3' into android-dependencies
2014-07-16 13:49:20 +08:00
8bf4c8b6c9
1. Fixes CCTimeLine warning.
...
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
2014-07-15 18:07:33 +08:00
714048059c
fix loading bar switch loading method issue
2014-07-15 17:03:35 +08:00
19cc5b9c4d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 13:34:46 +08:00
15a7ab8450
Update the TextureAsyncTest
2014-07-15 13:33:36 +08:00
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
55e77d8fd2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 11:34:57 +08:00
3ab7520667
Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest
2014-07-15 11:34:24 +08:00
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
b3bfa87f51
Fix the TMXOrthoFlipRunTimeTest bugs.
2014-07-14 18:30:59 +08:00
f1ed090f4f
Fix the OpenGLTest display bugs.
2014-07-14 18:30:02 +08:00
6d063fb97b
Merge pull request #7431 from andyque/addTextFieldTTFTest
...
add TextField TrueTypeFont tests
2014-07-14 16:31:36 +08:00
7f68bdf179
Merge pull request #7434 from samuele3hu/v3_hot_fix
...
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
2014-07-14 16:26:42 +08:00
4cb6c1c74f
Add lua bindings for TextureCache::addImageAsync and update the related test cases
2014-07-14 16:05:48 +08:00
a5317dde87
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
2014-07-14 15:50:20 +08:00
5f453d0105
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-14 15:32:03 +08:00
ace0d05bd4
Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest
2014-07-14 15:28:52 +08:00
4fe3723edf
add TextField TrueTypeFont tests
2014-07-14 14:29:28 +08:00
8949d90212
update test case of new label[lua].
2014-07-14 13:48:28 +08:00
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
3b59b41116
3D:Sprite3D -> Node:Sprite3D
2014-07-12 22:26:46 +08:00
05b485cd41
Merge pull request #7407 from visiblelight/fix_wp8_errors
...
Fix compile errors on WP8
2014-07-11 18:51:23 +08:00
9c7999d1c2
Fix the tests-lua crash on windows platform
2014-07-11 18:13:08 +08:00
3c8dc7a596
Update the cocos2d.ini config
2014-07-11 17:21:55 +08:00
01c3f2a4ed
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
2014-07-11 16:44:59 +08:00
7495a611ea
fix conflict
2014-07-11 16:03:40 +08:00
82070e5205
Remove glView setting form cpp to lua script
2014-07-11 15:34:56 +08:00
d8cdb75851
Fix compile errors on WP8
2014-07-11 15:10:19 +08:00
74772e97c9
fix linux compile error
2014-07-11 14:17:57 +08:00
43255e2b96
Merge branch 'v3' into addStudio1.4
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
646f7c7e3f
Merge branch 'v3' into addStudio1.4
2014-07-11 13:39:34 +08:00
72f8ab8483
Merge pull request #7395 from samuele3hu/v3_controller
...
Add Lua bindings for controller and related test case project
2014-07-11 13:39:30 +08:00
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
7cf8cf42d3
Merge pull request #7389 from Dhilan007/v3-gc-nibiru
...
Update Nibiru SDK and remove prompt box of install driver .
2014-07-11 13:36:19 +08:00
2cbe262842
Add newline for some files
2014-07-11 12:00:43 +08:00
dd76ae93f6
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
900d4b36fc
Enabled nibiru\moga\ouya controller support.
2014-07-11 09:57:26 +08:00
caae8392d4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
2014-07-10 22:42:09 +08:00
e876065d3e
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
...
Add VideoPlayer Lua bindings and update bindings-generator submodule
2014-07-10 22:04:46 +08:00
4895e6d54a
Merge pull request #7362 from geron-cn/chukongv3
...
Chukongv3
2014-07-10 21:17:19 +08:00
f76f71eb5d
fix win32 & win8 compile error
2014-07-10 16:37:15 +08:00
eec40ff2a8
fix linux and android compile
2014-07-10 16:37:15 +08:00
6de47ea53a
update ccs-res and add custom ImageView and custom particle widget support
2014-07-10 16:37:15 +08:00
afe5e7527a
update cocostudio resource path
2014-07-10 16:37:15 +08:00
8b42eb4ce9
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-10 16:37:15 +08:00
41ccd5e465
add v1.4 tests
2014-07-10 16:37:15 +08:00
937b0ab52a
add cocostudio parser test template
2014-07-10 16:37:15 +08:00
831b0b332b
Merge pull request #7371 from minggo/enumerateChildren-fix
...
Node::enumerateChildren just searches from itself
2014-07-10 15:46:04 +08:00
c7856b21fd
Merge pull request #7366 from Dhilan007/v3-fixed-warn
...
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
01e1508239
Merge pull request #3 from cocos2d/v3
...
merge V3
2014-07-10 11:33:59 +08:00
5b7852c5f6
update ccs-res hd csbs
2014-07-10 11:17:01 +08:00
316564d58a
Node::enumerateChildren just searches from itself
2014-07-10 11:07:39 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
2bc1cd0486
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
...
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
2014-07-09 22:31:05 +08:00
2a64bd8945
udpate ccs-res
2014-07-09 18:35:10 +08:00
243fa49c09
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-09 18:08:09 +08:00
3546c131dd
Add Lua bindings for controller and related test case project
2014-07-09 18:05:02 +08:00
cd84081c37
udpate ccs-res
2014-07-09 18:02:17 +08:00
7b35f36ba3
Merge branch 'newcode' into v3
2014-07-09 09:56:23 +08:00
90b6841e25
adjust api according feedback
2014-07-09 09:53:15 +08:00
85d29ec803
Refactor #5580 : Refactor Hungary style code in test case
2014-07-09 09:52:21 +08:00
0f7968de89
Merge pull request #7339 from super626/v3
...
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
f7af8938bd
Merge pull request #7277 from darkdukey/fix_rotation3D
...
Fix setRotation3D
2014-07-08 22:05:27 +08:00
bf3e0cb132
Update ini configure and bindings-generator submodule
2014-07-08 15:17:46 +08:00
521f805219
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
2014-07-08 14:57:19 +08:00
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
75ee088631
resolve conflict Bone in cocos2d and cocostudio
2014-07-08 11:03:29 +08:00
3344ebbcdd
Merge pull request #7267 from andyque/addBinaryFileTests
...
add tests to GUI
2014-07-08 09:51:17 +08:00
b0f5ce36ff
Merge pull request #48 from lvlonggame/v3
...
delete the cube model file and modify 3DBundle
2014-07-07 21:51:10 +08:00
e1b29a8ef6
Merge pull request #7329 from Dhilan007/v3-gc-refactor
...
issue #4689:Fixed lose disconnected event and incorrect device name/id.
2014-07-07 18:45:23 +08:00
9cf01c0e47
update test case
2014-07-07 17:57:08 +08:00
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
70b9d9b9ac
delete cube_anim
2014-07-07 17:11:37 +08:00
cd77690032
Merge pull request #7326 from Dhilan007/v3-gc-refactor
...
issue #4689 : support external key.
2014-07-07 17:04:27 +08:00
9a77ea9d57
add nested layout
2014-07-07 15:48:50 +08:00
6f33e4b84f
add UIPageView button tests
2014-07-07 15:31:06 +08:00
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
982d7441a0
Merge pull request #7310 from boyu0/lua_SceneEditorTest
...
Add SceneEditorTest for lua
2014-07-06 16:01:49 +08:00
9db0f36c33
Merge pull request #7313 from Dhilan007/v3-gc-refactor
...
issue #4689 : Refactoring game controller API.
2014-07-05 01:05:48 +08:00
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
27bc3dc640
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
2014-07-04 17:56:22 +08:00
c73a88c4a5
Add resources
2014-07-04 17:55:20 +08:00
b68ee428b0
Remove useless codes
2014-07-04 17:15:34 +08:00
d9ffa33601
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
2014-07-04 16:25:53 +08:00
85dd2e55bf
Add Lua bindings for utils and CaptureScreen test case
2014-07-04 16:24:00 +08:00
992245e744
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
2014-07-04 15:29:40 +08:00
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
8b00e72f33
Merge pull request #7311 from andyque/fixWindowsError
...
fix windows compile and running error
2014-07-04 13:44:55 +08:00
fc3caa1845
initialize member variable
2014-07-04 11:48:55 +08:00
dc81b07998
add new line at the end of the file
2014-07-04 10:27:24 +08:00
fc994d5ec0
add SceneEditorTest for lua
2014-07-04 10:08:17 +08:00
95fe74a34b
Merge pull request #7299 from dabingnn/fast_tmx
...
Fast tmx
2014-07-04 09:49:30 +08:00
3e75a10362
merge upstream/v3
2014-07-03 16:15:01 +08:00
1f768f80aa
update curl test url
2014-07-03 16:08:34 +08:00
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
fffdfb3711
Merge pull request #7290 from chengstory/v3_OpBinaryParse
...
V3 op binary parse
2014-07-03 14:00:01 +08:00
f3863eb072
add hex tile map test back
2014-07-03 11:31:30 +08:00
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
ff79be2d3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
2014-07-02 17:01:14 +08:00
320dc4737b
Update Sprite3D test cases for Lua
2014-07-02 17:00:31 +08:00
1551854c30
revert submodule res-ccs
2014-07-02 17:00:30 +08:00
9204ac28df
1. merge v3
2014-07-02 15:37:15 +08:00
e1bb1158bc
update test case.
2014-07-02 15:25:18 +08:00
1271c1b62e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-02 14:29:33 +08:00
2aee9ed35d
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
2014-07-02 14:26:56 +08:00
c5dc7b9cd0
fixed can't get valid value from trigger button.
2014-07-02 14:19:10 +08:00
187646ef3f
Merge branch 'v3' into fast_tmx
2014-07-02 11:38:19 +08:00
bcf2b0e2b6
fixed no response in test case of curl.
2014-07-02 10:18:07 +08:00
3304bba017
add switch method to all the GUI tests
2014-07-02 10:00:34 +08:00
21b11cc3c6
add switch method to LoadingBar, ListView , pageView and scrollView
2014-07-02 10:00:34 +08:00
f492643755
add switch method to UILayout and UIIamgeView
2014-07-02 10:00:34 +08:00
7fdc37a70e
add switch method to checkBoxTest
2014-07-02 10:00:34 +08:00
3326941939
add switch loading method to buttonTest
2014-07-02 10:00:34 +08:00
c3a5692e84
add test frame to UIScene_Editor
2014-07-02 10:00:33 +08:00
4cb59683e4
Add Sprite3DRotation test
2014-07-01 12:36:53 -07:00
ca7e95b342
Merge pull request #7274 from Dhilan007/v3-320beta
...
fixed crash cause by addChild on win 7.
2014-07-01 22:15:26 +08:00
6294a3024f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter
2014-07-01 19:10:15 +08:00
6ba111cbff
fixed crash cause by addChild on win 7.
2014-07-01 18:23:20 +08:00
318962c40a
update test case.
2014-07-01 16:46:11 +08:00
0fbcbec9de
Add missing file for game controller support.
...
Fix using incorrect library project.
2014-07-01 16:44:10 +08:00
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +08:00
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +08:00
cc3a9d0737
fix crash caused by std::regex()
2014-07-01 16:09:25 +08:00
39650e12c4
Merge pull request #7266 from dabingnn/v3_fix
...
V3 fix
2014-07-01 15:52:50 +08:00
daa5e257df
Merge pull request #7259 from Dhilan007/v3-gc0627
...
issue #4895:split controller adapter[android]
2014-07-01 15:51:21 +08:00
e1d97ecb59
Merge branch 'v3' into v3_fix
2014-07-01 14:54:28 +08:00
75c7777999
fix Effect3dSprite memory leak
2014-07-01 14:48:46 +08:00
80204e3048
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
...
Cleanup binary loader add scene binary parse
2014-07-01 13:47:35 +08:00
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
83f4e536c5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
...
Conflicts:
tests/game-controller-test/proj.android/project.properties
2014-06-30 19:27:01 +08:00
9bf36a1045
update test case.
2014-06-30 18:43:09 +08:00
a24526fd53
Merge pull request #7258 from andyque/fixSchedulerTest
...
call parent onExit method
2014-06-30 18:20:05 +08:00
9ef0544953
call parent onExit method
2014-06-30 18:22:58 +08:00
d7cbc2872e
Merge pull request #7250 from minggo/fix-compiling
...
fix compiling error
2014-06-30 18:06:54 +08:00
100968e4e5
Merge pull request #7254 from dabingnn/v3_fix
...
fix outline bug
2014-06-30 17:26:11 +08:00
f85d84f2ef
Merge pull request #7252 from visiblelight/beta_test
...
Fixing compile errors on WP8
2014-06-30 17:24:08 +08:00
395e61f977
fix outline bug
2014-06-30 17:21:04 +08:00
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
26f3445311
add missing files for the projects
2014-06-30 17:07:55 +08:00
c1e56e62c1
fix compiling error
2014-06-30 15:51:35 +08:00
2a9e10be2c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
2014-06-30 13:41:55 +08:00
98d3e22777
re add commented test case back
2014-06-30 11:23:41 +08:00
a63216d97b
issue #4895:Add test case
2014-06-30 03:25:49 +08:00
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
4f79176da2
Merge pull request #7234 from boyu0/iss5614_physics_transform
...
closed #5614 : add transform support for physics
2014-06-29 17:23:20 +08:00
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
3771654e66
remove deprecated function
...
rename enum to static const member of class
remove hex tile map(we do not support it yet)
2014-06-27 18:00:06 +08:00
318e39a6d2
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
2014-06-27 17:58:59 +08:00
fccc517eef
add test for physics transform.
2014-06-27 17:30:50 +08:00
4685a8654e
Animate3D transition
2014-06-27 17:02:08 +08:00
33a8b6563f
windows works for fast tmx
2014-06-27 16:56:26 +08:00
2a6ce26335
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-27 16:36:36 +08:00
343ef9ae55
update sprite3d test
2014-06-27 16:36:01 +08:00
a497cc0ed2
wrong suffix name
2014-06-27 15:53:25 +08:00
acc1004e28
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-06-27 14:53:25 +08:00
b1d07f2711
Add VideoPlayer Test for Lua
2014-06-27 13:56:39 +08:00
fac17097a0
add a new model and change girl model to it
2014-06-27 11:44:44 +08:00
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
ccb39e51b2
animation3d transition not finished
2014-06-26 18:35:12 +08:00
768eb4e1d0
Merge pull request #7222 from minggo/warnings-fix
...
fix warnings
2014-06-26 17:24:13 +08:00
dc635db163
fix warnings
2014-06-26 16:15:02 +08:00
e0e9d3379c
Merge pull request #6948 from lite3/v3
...
Add immediate send request
2014-06-26 16:05:58 +08:00
b033f7f664
Merge pull request #7218 from minggo/add-findChildren
...
Add utils::findChildren
2014-06-26 15:19:54 +08:00
2917596d5e
add utils::findChildren()
2014-06-26 14:05:30 +08:00
a6d6287b29
1. remove hungary style.
...
2. fixes build error.
2014-06-26 10:08:17 +08:00
c892939968
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
2014-06-26 09:52:41 +08:00
3bd195d4ef
Add Lua binding for ActionTimeline related and related test cases
2014-06-26 09:51:32 +08:00
46d380b5ac
Merge pull request #7204 from andyque/fixListViewTestHorizentalCarsh
...
fix ListView addChild problem
2014-06-25 17:20:17 +08:00
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
5f63514d6b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
2014-06-25 15:15:05 +08:00
3a0e750926
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
2014-06-25 15:13:08 +08:00
5c765f6883
Add coco studio ui focus test cases for Lua
2014-06-25 15:08:59 +08:00
986f77a827
Merge pull request #7156 from samuele3hu/v3_keypad_fix
...
Update controller.lua for CocosIDE’s need
2014-06-25 14:40:08 +08:00
bdf7be6fa0
1. add classname = "" log.
2014-06-25 14:32:38 +08:00
5f569cb423
Merge pull request #7193 from samuele3hu/v3_ui_binary
...
Add UI Editor test cases for Lua
2014-06-25 14:30:34 +08:00
7eb6ed75b8
Merge pull request #7197 from andyque/dimissListViewFocus
...
dimiss ListView focus tests
2014-06-25 14:11:36 +08:00
634f1b58c4
add todo to reminder me
2014-06-25 14:10:53 +08:00
1902fdc9f4
dimiss ListView focus tests
2014-06-25 14:04:32 +08:00
6df8079fd7
closed #5591 , fix UIButton setTitleColor & getTitleColor not match
2014-06-25 13:47:29 +08:00
7331ef49b6
don't rotate girl model
2014-06-25 13:29:45 +08:00
8cc4520deb
add boss.c3b
2014-06-25 13:22:04 +08:00
658a955e36
modify skindata binary reading
2014-06-25 13:20:42 +08:00
644b61e261
1. add SceneBinary to 2.x
2014-06-25 11:58:36 +08:00
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
617e2bc592
Add a newline
2014-06-25 09:36:34 +08:00
ea99c08d0e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
2014-06-25 09:31:57 +08:00
300821e61f
Add UI Editor test case for Lua
2014-06-25 09:29:06 +08:00
63d0f66553
Merge pull request #7189 from andyque/feature5161
...
replace size with contentSize
2014-06-24 18:43:33 +08:00
9d450d6513
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
2014-06-24 14:57:12 +08:00
415f97b00f
Refactor #5580 : Add test case for FileUtils' file and directory manipulations
2014-06-24 14:51:35 +08:00
dc0101737c
test for tony
2014-06-24 14:43:20 +08:00
431378a41e
commit for tony test
2014-06-24 14:10:03 +08:00
03a4e014e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
2014-06-24 11:04:38 +08:00
4bb6545250
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
...
closed #5541 : Add rotation action support for physics.
2014-06-24 10:46:10 +08:00
66763bd400
Merge pull request #7180 from MSOpenTech/wp8-v3
...
WP8 v3 broken build fix
2014-06-24 10:31:56 +08:00
199ad9c623
issue #5161 , replace deprecated methods
2014-06-24 10:18:01 +08:00
e34fcf05f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
2014-06-24 10:14:53 +08:00
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
87a6b83001
added missing files for wp8
2014-06-23 08:35:39 -07:00
c65e5d6872
simplify shader, bath sprite3D render
2014-06-23 19:08:26 +08:00
fc7b42c0e5
Merge pull request #7157 from 2youyouo2/v3
...
update action timeline
2014-06-23 18:38:46 +08:00
7eae7625c1
Merge branch 'v3' into cleanupBinaryLoader
2014-06-23 18:30:03 +08:00
a339afb2c0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
2014-06-23 17:53:41 +08:00
9126608138
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix
2014-06-23 17:30:24 +08:00
dce4c8a0a8
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
2014-06-23 17:29:56 +08:00
808c4bd763
remove unused override method
2014-06-23 15:46:07 +08:00
e72d89ba2f
fix windows tests compile error
2014-06-23 15:21:25 +08:00
c40c461848
closed #5541 : add warning code and comment.
2014-06-23 13:55:52 +08:00
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
02e0bad3f1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
2014-06-23 10:28:05 +08:00
5624da5448
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
dfd68f128a
c3b file
2014-06-23 09:03:53 +08:00
ebbcb3ea33
change immediateSend to sendImmediate
2014-06-22 11:39:39 +08:00
7c65968b56
add immediateSend test
2014-06-22 00:11:20 +08:00
5e1f0b5799
added missing files and tests that broke wp8 build
2014-06-20 09:07:51 -07:00
2a6dfaf91b
Merge branch 'newcode' into v3
2014-06-20 22:55:27 +08:00
1e319bc1f8
fix compile bug
2014-06-20 22:38:09 +08:00
2fa266e917
closed #5541 : change PhysicsActionTest for rotate action.
2014-06-20 18:42:36 +08:00
478ea8949a
Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
tools/cocos2d-console
2014-06-20 16:14:46 +08:00
69436ddd65
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
2014-06-20 16:02:22 +08:00
e4bbfad773
1. binary loader is OK.
...
2. add some comment.
2014-06-20 15:30:08 +08:00
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
1aa07906a1
add new line at the end of the file
2014-06-20 11:36:48 +08:00
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
d9848a62d2
Update controller.lua for CocosIDE’s need
2014-06-20 11:09:26 +08:00
ec62f05b12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-20 10:51:13 +08:00
0019d9a061
Optimize the win32 projects configuration.
2014-06-20 10:50:43 +08:00
9f0a566b8a
Merge pull request #6945 from John-He-928/mingw-build
...
Fix MinGW build
2014-06-19 22:08:28 +08:00
af88cf053b
Merge pull request #7022 from samuele3hu/v3_fix
...
Add bytecode and encrypted files test cases for Lua
2014-06-19 21:20:05 +08:00
0d07e19cd1
Merge pull request #7054 from 2youyouo2/v3
...
add TimelineAction
2014-06-19 21:05:15 +08:00
7553060ba7
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
...
[ci skip]Add new line at the end of a file to *.[cpp|h]
2014-06-19 20:47:17 +08:00
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
2c837b0960
add new line at the end of a file to *.mk
2014-06-19 20:43:27 +09:00
5f10ff2c29
issue #4437 : change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
2014-06-19 15:57:13 +08:00
8493c4579b
before switch branch save
2014-06-19 15:43:02 +08:00
3a350e11ae
Add Lua binding for Animation3D and Animate3D ,and add related test case
2014-06-19 14:05:38 +08:00
e60e3c217d
Merge pull request #7046 from Dhilan007/v3-label-improve
...
1.Support setting up the line height and additional kerning of label.
2014-06-19 09:44:51 +08:00
797085574c
add binary read to test-cpp
2014-06-18 20:13:06 +08:00
6abc9aba0e
add binary read to test-cpp
2014-06-18 20:09:12 +08:00
d2746f64a6
cpp-tests
2014-06-18 18:11:21 +08:00
9351172baf
add test case for new API of Label.
2014-06-18 18:01:55 +08:00
aa5df68b96
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
f614e9a89b
fix tests
2014-06-18 15:06:45 +08:00
95f1bd7e72
update loader
2014-06-18 11:54:25 +08:00
6ecca08340
Merge pull request #7039 from minggo/get-child-by-name
...
issue #4693 : add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
246d6f12c9
Merge pull request #7047 from samuele3hu/v3_keypad_fix
...
Resolve the compile warning for Lua bindings project
2014-06-18 11:29:54 +08:00
2cef0cb437
update ccs-res
2014-06-18 11:26:26 +08:00
719fdb712d
add frame event test
2014-06-18 11:22:38 +08:00
ca24ad6768
Merge branch 'v3' into cleanupBinaryLoader
2014-06-18 11:19:19 +08:00
df798baa8b
Merge pull request #7059 from Rumist/v3
...
BUG FIX : #5553
2014-06-18 11:18:33 +08:00
2c8c9dea01
use a small texture for sprite3D
2014-06-17 22:31:56 +08:00
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
806d74b6f9
add change play section test
2014-06-17 15:57:30 +08:00
17854cd922
change speed
2014-06-17 13:45:58 +08:00
d2a6782a9e
fixed start frame not right
2014-06-17 11:45:57 +08:00
53963a2441
issue #4693:enumerateChildren() support regular expression
2014-06-17 11:43:03 +08:00
7ee90b4114
add performance test
2014-06-17 11:13:46 +08:00
9ab45744bb
Merge branch 'v3' into cleanupBinaryLoader
2014-06-17 09:45:16 +08:00
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
9acd373a0e
make girl up
2014-06-16 19:41:10 +08:00
32cc5b12d6
ready
2014-06-16 19:30:45 +08:00
4b7f6a6185
static Sprite3D is ok
2014-06-16 19:08:43 +08:00
bc31d6b082
merge lv
2014-06-16 16:45:43 +08:00
920b358764
new girl.c3t
2014-06-16 16:23:24 +08:00
2282c98f2e
do some test
2014-06-16 15:38:03 +08:00
2840409933
for tony test
2014-06-16 14:09:41 +08:00
fda54a21f1
change test title
2014-06-16 09:45:44 +08:00
414aab8553
update CMakeLists.txt
2014-06-16 09:40:27 +08:00
0fa4e921f0
delete girl - 副本.c3t
2014-06-16 09:25:12 +08:00
79d2de3b67
make character up
2014-06-16 00:31:31 +08:00
dd8f66ce57
merge loader
2014-06-16 00:01:38 +08:00
9dd7241176
load c3t animation work 90%
2014-06-15 22:45:56 +08:00
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
71f74f0825
fixed android compile failed
2014-06-15 13:10:44 +08:00
4ae01d148f
11
2014-06-13 19:26:46 +08:00
369ed3e6d3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-13 18:00:01 +08:00
2031e0e92d
change TimelineAction to ActionTimeline
2014-06-13 16:03:03 +08:00
1c5d9ba212
remove resource to use armature resource
2014-06-13 14:41:28 +08:00
9b3b6c0e53
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
2014-06-13 14:39:11 +08:00
4b7b32e81e
BUG FIX : #5553
...
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
2014-06-13 15:24:37 +09:00
4e94eaabed
Merge branch 'v3' into v3Animation
2014-06-13 12:06:11 +08:00
ee919b673f
issue #4437 : config for android and linux.
2014-06-13 11:07:21 +08:00
3af0bdfef6
texture
2014-06-13 09:18:25 +08:00
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
b36741865c
add hd resource
2014-06-12 19:38:08 +08:00
f63939945d
change NodeCache to NodeReader
2014-06-12 19:34:22 +08:00
14f4b6430f
modify 3dloader, you can run animation.
2014-06-12 18:26:42 +08:00
e4f1ac6126
add hd resource
2014-06-12 17:38:26 +08:00
7eda0ae999
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-12 16:43:04 +08:00
1ca69d2689
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2014-06-12 16:28:36 +08:00
f536020d26
remove unused files
2014-06-12 16:21:41 +08:00
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
acb87f414e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
2014-06-12 14:44:28 +08:00
e37c6ab7ee
test action sequence
2014-06-12 14:20:38 +08:00
6845a69655
issue #4693 : remove unneede codes
2014-06-12 14:00:41 +08:00
990c491746
issue #4693 : add test case for getName, setName, getChildByName and enumerateChildren
2014-06-12 13:55:23 +08:00
1df80a8ce4
closed #5537 : add test case
2014-06-12 12:57:29 +08:00
6c7b538ee1
Add deprecated support for the related UI addEventListener functions
2014-06-12 12:02:22 +08:00
dc4cdc9c0f
remove the comments
2014-06-12 10:19:08 +08:00
97b578185d
new parameter for setting blur shader effect
2014-06-12 09:49:48 +08:00
4d1bf0c1a2
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
28ae57c5fc
add AsyncReader
2014-06-12 00:38:23 +08:00
aa06fab776
support relative path for reading json
2014-06-11 21:11:22 +08:00
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
18663609b4
add interface for speed and playback in animate
2014-06-11 15:07:37 +08:00
e2c75c1f11
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
2014-06-11 14:54:14 +08:00
2f6f1b7151
improve binary format
2014-06-11 14:45:35 +08:00
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
54379f48a9
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
2014-06-11 11:24:17 +08:00
09a2ceb7df
add TimelineAction
2014-06-11 11:10:07 +08:00
2d50df8b01
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:19:07 +08:00
d200dd83a4
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:15:38 +08:00
2252bc271b
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:14:24 +08:00
4ce2d7f193
Update values of KeyCode used in the Lua to fix related error
2014-06-11 10:10:11 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
6d09b50699
animation bug
2014-06-10 19:53:06 +08:00
48f7743daa
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-10 15:08:10 +08:00
5a80b4da2e
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
2014-06-10 11:30:39 +08:00
f6f75e8810
Update controller.lua
2014-06-10 10:01:08 +08:00
cb3af59d38
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-10 09:51:50 +08:00
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +08:00
29ac8d746d
Merge pull request #7012 from Dhilan007/v3-testcast
...
update test cast of label.
2014-06-09 16:32:32 +08:00
c387ae3bc7
add text effect test
2014-06-09 14:34:46 +08:00
791737befa
update test cast of label.
2014-06-09 13:41:32 +08:00
361bfad5f8
initilization missed.
2014-06-09 11:39:19 +08:00
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
fc5e58b521
issue #4437 : add dirty tag.
2014-06-06 18:03:44 +08:00
560053d23c
issue #4437 : add test and fix transform.
2014-06-06 17:33:27 +08:00
eba954b410
Add bytecode and encrypted files test cases for Lua
2014-06-06 17:17:43 +08:00
890bc20475
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-06 11:44:23 +08:00
5ab8b81205
Update control.lua for lua-tests
2014-06-06 11:42:18 +08:00
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
39f2669886
remove the new images and use the old ones.
2014-06-06 10:37:45 +08:00
f7d5d837bf
add new tests for different pixel formats
2014-06-05 16:33:42 +08:00
919524cf89
Update controller.lua for lua-tests and bindings-generator submoudle
2014-06-05 14:39:09 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
3dc6e86c25
add binary file parsing into ui tests
2014-06-05 10:25:45 +08:00
a11740ff29
ouch, more windows compile issues
2014-06-04 10:11:16 -07:00
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
7a4d46dc1b
Merge pull request #6965 from Dhilan007/v3-wp8fix
...
Support Fast App Resume and fixed black screen may arise when using third sdk.
2014-06-04 17:15:13 +08:00
a495747a7c
Merge pull request #6971 from andyque/refactorUIFramework
...
refactor ObjectFactory
2014-06-04 17:08:27 +08:00
a31710973c
Merge pull request #6962 from visiblelight/AlphaIssues
...
Fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 15:10:54 +08:00
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
7bf2be6033
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
...
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
5432698674
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
...
closed #5482 : Node::setPhysicsBody() doesn't work after node added to another node.
2014-06-04 13:52:43 +08:00
368c5b0d3b
closed #5482 : add a test case for bug 5482.
2014-06-04 11:59:15 +08:00
52ad2063bd
Support Fast App Resume.
2014-06-04 11:19:53 +08:00
ad230bb412
fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 10:39:18 +08:00
dbca937835
add test case to break buggy code
2014-06-03 17:58:09 +08:00
691a77b148
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
...
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-06-03 14:38:07 +08:00
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
5e82d9db4d
set libws2_32 as standard library for mingw.
2014-05-30 20:14:22 +08:00
2e42c77b9a
fix typo
2014-05-30 11:13:53 +08:00
95b6fb52de
only use _backToForeGroundListner when on Android
2014-05-30 10:56:03 +08:00
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
0739f40726
fix faults of load project on Win 32.
2014-05-29 17:30:55 +08:00
b68525ac1f
Merge pull request #6916 from John-He-928/mingw-build
...
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
2014-05-29 15:17:07 +08:00
bfb3567131
Merge pull request #6924 from minggo/remove-test-case
...
Remove test case
2014-05-29 14:54:28 +08:00
e48b14b55d
Merge pull request #6932 from Dhilan007/v3-labelfix
...
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:54:16 +08:00
3182fd56b8
Merge pull request #6931 from VisualSJ/v3
...
Test case action name error
2014-05-29 14:07:23 +08:00
dd2b7e036a
Test case action name error
2014-05-29 14:00:43 +08:00
2a6158bae1
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:00:38 +08:00
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
8633ab9c14
add background/foreground listener for EffectSprite/Effect framework test case
2014-05-29 12:43:04 +08:00
44950a57f1
fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones.
2014-05-29 01:30:14 +08:00
ad3b1cf827
add background/foreground listener for Effectsprite3d/Effect3d test case
2014-05-28 21:07:12 +08:00
d7cca2a044
closed #4819 : remove KeyboardTest
2014-05-28 18:31:00 +08:00
0acc4cd961
issue #4819 : remove KeyPadTest
2014-05-28 18:17:22 +08:00
0ad0f9c405
issue #4819 : remove AccelerometerTest
2014-05-28 18:10:37 +08:00
90cac02de6
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:27:03 +08:00
c52132179a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-28 10:05:41 +08:00
04d2d4a22e
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:04:29 +08:00
c44a5a2b3e
Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork
...
V3 refactor effect3 d frame work
2014-05-27 20:53:40 +08:00
99290b83c7
Merge pull request #6871 from asuuma/v3_Repeat_fix
...
Fix Repeat will run one more over in rare situations
2014-05-27 16:22:42 +08:00
e59813476a
clclosed #5369 : Fix wrong logic when setTarget to Effect3D
2014-05-27 15:08:38 +08:00
0b661d8192
Merge pull request #6907 from visiblelight/screenshot_refactor
...
adding comments for the new utility
2014-05-27 14:52:09 +08:00
453ff81d2a
closed #5369 : refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite
2014-05-27 14:50:46 +08:00
b8f9b1f20b
Add test case for reproducing Repeat bug
2014-05-27 15:40:38 +09:00
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
034e2c6f75
Merge pull request #6809 from heliclei/autotest-stop
...
Support autotest stop command
2014-05-27 14:01:38 +08:00
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
363fd8dc2a
move the capturen screen interface from Director to ccUtils
2014-05-27 10:44:23 +08:00
f7450730fb
Merge pull request #6901 from andyque/fixDpadNavigation
...
issue #5176 , refactor FocusNavigationController
2014-05-27 10:40:00 +08:00
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
20bae53f4a
fixing typos
2014-05-26 16:32:13 +08:00
28d30a5c40
fix a typo
2014-05-26 16:24:57 +08:00
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
75cb686573
Merge pull request #6894 from andyque/refactor5183
...
refactor Layout, LayoutParameter and LayoutExecutant
2014-05-26 00:41:04 -05:00
f29654ff6c
Merge pull request #6890 from visiblelight/FixTextureCache
...
Fix the crash in TextureAsync test
2014-05-25 20:55:13 -05:00
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
006f082f74
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-23 19:15:46 +08:00
3bd196f077
Update the openGL lua binding and related test case
2014-05-23 19:12:30 +08:00
1b3a474646
Merge pull request #6891 from boyu0/3.1_test
...
Roll back test_image_ar.pvr
2014-05-23 04:25:56 -05:00
80e184312a
Roll back test_image_ar.pvr
2014-05-23 17:19:39 +08:00
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
dc03571076
fix some bugs for lua-tests
2014-05-23 16:48:18 +08:00
f76e2a5476
Readd the lua binding for `visit` and modify a requirement for IDE
2014-05-23 10:00:59 +08:00
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
5e4f481ae5
capture this instead of reference in lambda
2014-05-22 14:52:19 +08:00
a6efd4f650
Move `setSearchPat` operation from cpp to script
2014-05-22 14:00:39 +08:00
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
57d5e6f2d5
issue #5176 , add ListView focus test
2014-05-22 11:01:58 +08:00
6c8e38871c
issue #5255:Remove Sprite3D effect test
2014-05-22 10:22:10 +08:00
4da8ad502f
tests release/debug build
2014-05-21 21:13:44 +04:00
fa5d43741c
fix keypad test
2014-05-21 10:46:26 +08:00
a2ebe428da
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-20 18:11:28 +08:00
2d65f9bc6f
issue #5255:Add Sprite3D test cases for Lua
2014-05-20 18:09:04 +08:00
b07e82f7c3
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
...
This reverts commit 1ed9b9749e
2014-05-20 16:17:10 +08:00
9a276c66a0
Merge pull request #6740 from zifter/FixProgressTo
...
Fix Progress Action. Not working with charging from 100 to 0.
2014-05-20 15:36:10 +08:00
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d226f2f2046c7
2014-05-20 14:36:29 +08:00
b6373b5303
Merge branch 'v3' into refactorLayout
2014-05-20 09:30:23 +08:00
cffd53ea94
accelerometer fix
2014-05-19 17:44:28 +08:00
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
2ddfc45fee
support autotest stop
2014-05-19 13:46:17 +08:00
b89a073b90
replace texture resources
2014-05-19 12:09:55 +08:00
99f17ec88d
commnet out the Renderer test in PerformanceTest
2014-05-19 11:46:32 +08:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
e3f2c3985d
Merge pull request #6777 from boyu0/physics_rollback_for_lua
...
Roll back lua PhysicsTest.
2014-05-16 21:55:52 +08:00
74335a92f7
Roll back lua PhysicsTest.
2014-05-16 17:19:02 +08:00
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
f9f0142842
default value is 0.5 for interpolation
2014-05-15 16:52:15 -07:00
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
e5494cd9e5
multiple pass sprite
...
on ShaderSprite2.cpp
2014-05-15 13:13:31 -07:00
cde4e4811b
Update some GuiConstants and resubmission pr#6361.
2014-05-15 16:54:55 +08:00
5a14b1d67b
fix compile error and synchronizate the UI change for Lua
2014-05-15 15:39:15 +08:00
1c13f901ae
Even better shader test
2014-05-14 16:55:57 -07:00
839170c147
Improvments on the shader2 tests
2014-05-14 13:09:33 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
6fcef92708
Fix Progress Action.
2014-05-14 19:13:14 +03:00
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
048d6c09d3
Merge pull request #6701 from heliclei/autotest-autorun
...
support auto start cpp-tests
2014-05-14 18:16:58 +08:00
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
dfb016dde3
move the utility from Renderer to UtilsHelper
2014-05-14 16:25:47 +08:00
6213747c41
fix the compile failure on win32.
2014-05-14 19:37:04 +08:00
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
e7df247d65
replace more tabs with spaces to uniform the code styles.
2014-05-14 10:40:56 +08:00
021be6ef9b
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-14 09:22:36 +08:00
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
0171e27747
Merge pull request #6714 from Dhilan007/v3_nodefix
...
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
2014-05-13 14:14:27 -07:00
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
541d03d668
Now it shoudl run fine on iOS
2014-05-14 01:06:26 +08:00
ed0ae9d5b3
fix compiling fail on Linux.
2014-05-13 18:51:02 +08:00
05c16de87a
Merge pull request #6715 from dumganhar/iss5160-animation-notification
...
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 18:38:44 +08:00
fe91f46882
The target filename shuld use a writable path.
2014-05-13 18:34:35 +08:00
24524cb5be
issue #5160 : Updates actiontest
2014-05-13 17:30:48 +08:00
35b19a239a
exit gracefully after running all tests
2014-05-13 17:20:12 +08:00
5459b581b0
replace tab with spaces; remove the 'flipped' parameter;
2014-05-13 17:17:15 +08:00
0dd22af688
closed #5160 : Updates ActionTest
2014-05-13 17:08:52 +08:00
fbfbcaffc8
update project
2014-05-13 16:43:19 +08:00
47e4ee4ff2
add a new utility function to capture the screen
2014-05-13 16:23:35 +08:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
17cd12f8b1
fix win32 compile
2014-05-13 14:43:11 +08:00
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
13f3c9705a
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 14:24:00 +08:00
8cc224dcef
change default auto-run config to false
2014-05-13 14:17:43 +08:00
45d8547622
add config item
2014-05-13 14:16:06 +08:00
eaa879a9f3
fix for winrt build
2014-05-13 14:08:49 +08:00
0b7b9f6131
Merge branch 'v3' into reparentChildren
2014-05-12 22:52:19 -07:00
e1f82c174b
add TestCase for reparentChildren bug
2014-05-12 22:50:31 -07:00
471f218acf
add config item to control whether start autorun
2014-05-13 11:47:32 +08:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
98f1c6768c
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 07:53:49 +08:00
1aabedb316
support auto start tests
2014-05-12 21:47:55 +08:00
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
9d7d06a1f8
issue #5047 , refactor UIVideoPlayer
2014-05-12 11:35:57 +08:00
4f3c128c4f
issue #5057 , refator UITextField
2014-05-12 11:29:22 +08:00
eeaf48d3e5
issue #5047 , refactor UISlider
2014-05-12 11:17:06 +08:00
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
4d275f91d0
issue #4660 : Updates utf unit test, use c memcmp and run 10000 times
2014-05-11 11:24:32 +08:00
945ad2eb04
issue #4660 : Adds utf8/16 conversion unit test
2014-05-10 21:52:19 +08:00
006fe7eb94
Merge pull request #6667 from super626/improved_glprogram
...
remove unused shadertest
2014-05-09 21:42:01 -07:00
4d579892b1
Merge pull request #6668 from dabingnn/v3_fix_accident_changes
...
V3 fix accident changes
2014-05-09 21:38:09 -07:00
ba63befa5e
roll back target=android-10
2014-05-09 21:36:35 -07:00
cb3bd52d9a
remove unused shadertest
2014-05-09 21:34:59 -07:00
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
1a0ab4bf92
10 tests
2014-05-09 20:51:46 -07:00
e84d96234b
add two shaderTest case for Trace
...
comment out one(it is not working on IOS device)
2014-05-09 20:35:15 -07:00
4a49668940
plist are not executable files
2014-05-09 20:11:36 -07:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
1be6ba961c
Merge branch 'newcode' into improved_glprogram
2014-05-09 16:05:42 -07:00
877d8dd771
android works!!
2014-05-09 15:59:49 -07:00
47f6f8871f
compiles on windows
2014-05-09 14:43:20 -07:00
4c4a974287
use STRINGGIFY(A) instead R""
2014-05-09 12:03:09 -07:00
4bcdccd302
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 12:01:18 -07:00
e72633c066
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram
2014-05-09 11:53:22 -07:00
0b8aed3536
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 11:51:00 -07:00
168ff78e18
add test case for y flipped coord
2014-05-09 11:49:51 -07:00
88f1d8ac4e
Add ShaderTest sample and shader code
2014-05-09 11:48:11 -07:00
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
7d1cb7af47
issue #5057 , refactor UILoadingBarTest
2014-05-09 11:52:51 +08:00
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
2e669c1d28
GLProgram::create() returns a linked GLProgram
2014-05-08 16:04:59 -07:00
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
eea1ba6946
added missing files to projects
2014-05-08 10:11:42 -07:00
59e1fc39b3
Merge pull request #6638 from Dhilan007/v3_video
...
fixed compilation fails on android.
2014-05-08 21:43:21 +08:00
24452cada1
fixed compilation fails on android.
2014-05-08 21:39:53 +08:00
0ed33cacf4
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which
...
was set in '.user' file
2014-05-08 21:19:54 +08:00
972f9447dd
issue #4876:Add test case to play video
2014-05-08 18:14:32 +08:00
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
9f0e25d808
Merge pull request #6628 from andyque/refactor5056
...
refactor 5056. pull gui tests from ExtensionTest to UITest
2014-05-08 17:00:38 +08:00
97ee5cb456
closed #5056 . fix windows compile error
2014-05-08 16:18:46 +08:00
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
e48e26cfdc
issue #5056 . fix linux & android compile error
2014-05-08 15:20:24 +08:00
bea98a1416
Lua xcode project fix
2014-05-08 15:09:02 +08:00
88b0eb3baa
Adds missing 'fps_images.png', our test case needs them
2014-05-08 15:09:02 +08:00
898a66131a
issue #5056 . move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
f6d0135b9b
Merge branch 'v3' into focus3861
2014-05-08 11:27:57 +08:00
323987beb2
closed #4861 , done
2014-05-08 11:26:29 +08:00
90ec7dd9ec
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-07 20:21:03 -07:00
b401f6adc1
Lots of new code
...
Adds GLProgramState
2014-05-07 20:20:19 -07:00
b5f1f7455b
issue #4861 , fix a problem when layout focus loops
2014-05-08 10:46:05 +08:00
ec45dbb0c9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-08 10:22:52 +08:00
41f48e7fa9
Merge branch 'v3' into tony_improved_glprogram
2014-05-07 15:30:04 -07:00
98454eeb69
Adds GLProgram::createXXX()
2014-05-07 14:38:41 -07:00
02405a8efe
Improved samples
2014-05-07 12:41:04 -07:00
b1ed7178fe
Improved API for Uniforms
2014-05-07 10:44:45 -07:00
5190fb27c8
use proposed vertex attribute api
2014-05-07 09:27:44 -07:00
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
05b7d274c8
issue #4861 . fix distance calculation
2014-05-07 18:27:05 +08:00
72709c30d5
fixed compilation fail on Android.
2014-05-07 18:20:40 +08:00
8615e13c91
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-07 17:16:40 +08:00
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
657720e509
Merge remote-tracking branch 'upstream/v3' into focus3861
2014-05-07 11:42:09 +08:00
ef44b2687b
closed #4861 , finished focus
2014-05-07 11:40:01 +08:00
ef70c684de
issue #4861 , add requestFocus method and the layout current can get focus
2014-05-07 10:23:57 +08:00
62a66872aa
issue #4861 , fixed some boundary conditions
2014-05-07 10:05:20 +08:00
db759005e0
Improvements for Attributes and Uniform API
2014-05-06 17:58:14 -07:00
21dd6fef69
Improves code a little bit
2014-05-06 12:46:35 -07:00
cf9e8ff0bd
Merge branch 'newV3' into improved_glprogram
...
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
2014-05-06 12:07:42 -07:00
69fd841b30
fix the include error
2014-05-06 11:19:51 -07:00
9d71ae29b9
issue #4861 . fixed all widget focus diabled bug
2014-05-06 17:28:12 +08:00
51a704dcc8
issue #4861 , refactor improve nested focus test
2014-05-06 15:11:55 +08:00
29c57568bf
issue #4861 , add nested focus test
2014-05-06 14:38:45 +08:00
e52370e1c2
issue #4861 , refactor UIFocusTest, simplify code
2014-05-06 14:20:01 +08:00
ad4e1f1e2c
issue #4861 , improve UIFocusTest, add click event to ImageView
2014-05-06 14:14:22 +08:00
3017c776e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-06 13:59:44 +08:00
0ce2a38f17
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
2014-05-06 13:59:16 +08:00
e65b144ee6
issue #3861 , fixs windows compile error
2014-05-06 10:17:10 +08:00
16ebe8d41c
issue #3861 , fix linux compile error
2014-05-06 09:40:50 +08:00
703c6c2b39
added missing Assets folder
2014-05-05 13:47:43 -07:00
cb5b2a4f85
issue #4861 , Merge branch 'v3' into focus3861
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
67b2fbf14b
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
399f5cf721
Adds submodule for CocoStudio resources (70MB)
2014-05-05 15:11:35 +08:00
e16d6fa63f
Re-adds resources in cpp-tests and lua-tests, but removes some large
...
files. We need to reuse some resources when doing some tests.
2014-05-05 13:27:47 +08:00
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
852191a928
issue #4861 , improve the horizontal layout test
2014-05-05 11:37:39 +08:00
0dc224a123
issue #4861 . fix android compile error
2014-05-05 11:37:39 +08:00
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
207e67318d
rolling back tests
2014-05-01 16:55:28 -07:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
c590bbe547
target is android-10
2014-04-30 13:18:57 -07:00
23ece1a91d
restores project.properties to 10
2014-04-30 13:16:50 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
c722b74e36
Merge branch 'v3' into v3_refactor_normalize
2014-04-30 20:08:37 +08:00
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
c3f40bdc24
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
2014-04-28 14:05:08 +08:00
d3670644bf
Fix compile error for Lua
2014-04-28 14:04:37 +08:00
35f83fc40a
fixed compile fail
2014-04-28 11:42:54 +08:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
828401a23d
Merge pull request #6302 from zifter/FixParticle
...
closed #4880 : Particle systems loading incorrectly in CocosBuilder
2014-04-25 14:15:44 +08:00
06d9187783
Merge pull request #6270 from andyque/feature4783
...
closed #4783 , add outline shader files
2014-04-25 13:50:44 +08:00
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +08:00
cd6fe294b8
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
...
closed #4771 : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
328408d792
Merge pull request #6263 from Mazyod/develop-cpp11-http-client
...
closed #4702 : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
c2da6727be
fix compile warning after merge
2014-04-24 17:00:28 +08:00
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
cd2a8e90d2
Remove the comments for ClippingNodeTest
2014-04-22 13:52:52 +08:00
6b34239d75
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-22 13:48:00 +08:00
771ce05d95
fix the bugs of SpriteTest that the Sprite created by passing rect display error
2014-04-22 13:41:10 +08:00
560d24545a
3.0hotfix: Node: Clipping->RawStencilTest4-6
2014-04-22 10:58:42 +08:00
582e961f2a
Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest
2014-04-21 18:28:05 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
b3ac3b2324
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-21 17:13:34 +08:00
b313b4ce74
Comment the last three test cases
2014-04-21 17:09:44 +08:00
440702aa06
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
2014-04-21 15:26:57 +08:00
0a5b92c56f
Merge pull request #6305 from samuele3hu/developAudio
...
fix the bug that exit layer can’t end the SimpleAudioEngine
2014-04-21 14:40:40 +08:00
710fe9d940
closed #4771 : modify test.
2014-04-21 13:32:47 +08:00
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
3930beda40
input event refactor. console enabled for wp8
2014-04-19 10:10:44 -07:00
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
d8d847bd65
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl
...
closed #4903 : Build libcurl.a with openssl
2014-04-18 17:10:53 +08:00
9756709473
closed #4903 : change HttpClientTest get test 3 to https protocol.
2014-04-18 17:03:06 +08:00
7e81f32016
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
2014-04-18 11:55:30 +08:00
914516a4e0
fix the compile error about luabindings and add the `RichText` test cases.
2014-04-18 11:54:57 +08:00
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
1331fff62c
fix the bug that exit layer can’t end SimpleAudioEngine
2014-04-17 10:36:08 +08:00
08d975268d
Fix for issue http://www.cocos2d-x.org/issues/4880 .
2014-04-17 03:15:43 +03:00
718f3b3a57
remove warning message---continue
2014-04-16 10:47:29 +08:00
60c1ed28dc
Removes unused enum in PerformaceCallbackTest
2014-04-16 10:41:42 +08:00
ec40dda7f3
Adds performance test for callbacks: 1) std::function,
...
2) (target->*selector)(), 3) simulate new api of Scheduler
2014-04-16 10:35:58 +08:00
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
5303f50904
Migrate to Vector2 in DrawPrimitive.h
2014-04-15 17:29:23 +08:00
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
b53961b78d
issue $4771: fix lua test and fix some bugs
2014-04-15 13:40:44 +08:00
584ccf65e4
Culling working again
2014-04-14 16:46:19 -07:00
c98f50026f
issue $4771: move PhysicsWorld to layer.
2014-04-15 03:21:18 +08:00
a5e900a86b
manually enable depth test in test case TMXIsoVertexZ
2014-04-14 17:06:35 +08:00
bb15d0ecf9
Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option
...
Add interface setCullingEnabled(), culling is disabled by default
2014-04-14 14:50:11 +08:00
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
87b437dd3a
closed #4783 . replace deprecated function call
2014-04-14 13:48:17 +08:00
10cca8674a
closed #4783 . remove unused comments in shader file
2014-04-14 12:06:42 +08:00
00d2bd833f
closed #4783 . finish the shading effects
2014-04-14 12:03:37 +08:00
2c1f5da69c
issue #4783 , add outline shader files
2014-04-14 11:52:17 +08:00
d2dd57d412
change indention to space and remove comment code
2014-04-14 11:45:06 +08:00
9935e8ddfb
setCullingEnabled set to public access
...
changed renderer->culling test case
2014-04-14 11:33:40 +08:00
40e6288ac7
[NEW]: update HTTPClient to use C++11 callbacks
...
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
2014-04-13 01:06:04 +04:00
8919931a50
small indentation fix
2014-04-13 00:26:38 +04:00
b369c24f01
+ [NEW]: setting the font for Editbox text
...
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
043f86cd6b
Memory leak fix in SchedulerTest
2014-04-12 12:59:28 +08:00
427ca4ecf0
Small fix in Lua test.
2014-04-11 05:45:18 -07:00
b71e1c1570
Merge pull request #6250 from natural-law/develop
...
fix the error effect of ` FontTest` in lua-tests.
2014-04-11 20:26:30 +08:00
350f61c4da
Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0
...
closed #4497 : use /z7 to build without .pdb
2014-04-11 20:20:47 +08:00
99766cdd03
fix the error show of ` FontTest`
2014-04-11 20:17:34 +08:00
d611cfb49f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-11 20:03:24 +08:00
0eee9bc288
Solve the incorrect effect of some transition test case in lua-tests.
2014-04-11 20:02:11 +08:00
1aa909371d
remove kmMat4 in Cpp-tests
2014-04-11 18:03:07 +08:00
b40773f6d0
Merge pull request #6240 from dabingnn/develop_add_rendererAssert
...
Trigger an assert if a command is added while render is rendering.
2014-04-11 17:37:02 +08:00
bf2450ad54
Merge pull request #6242 from andyque/fix_zfighting
...
fix a compile error
2014-04-11 16:49:21 +08:00
280c2755b3
closed #4761 . fix a compile error
2014-04-11 16:47:35 +08:00
96ce8cb8cb
Merge pull request #6241 from andyque/fix_zfighting
...
closed #4761 , fix zfighting between tests
2014-04-11 16:41:39 +08:00
83664e2322
closed #4761 . fix a improve super class function call
2014-04-11 16:34:26 +08:00
4be149e492
closed #4761 , fix zfighting between tests
2014-04-11 16:30:25 +08:00
51289e8a4c
1. add assert condition of rendering when adding command
...
2. fix bug: renderTexture->SpriteRenderTextureBug
2014-04-11 16:05:22 +08:00
b69b14382e
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont
2014-04-11 15:25:18 +08:00
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
70dec15e76
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
2014-04-10 23:38:57 +08:00
c687b97c6e
fix the crash invoked by deprecated `create` function of `Label`
2014-04-10 23:36:25 +08:00
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
5d882cea23
Merge pull request #6213 from koowolf/wp8_fix
...
fix compiler error in wp8
2014-04-10 17:10:08 +08:00
9c07ca5722
Merge pull request #6220 from Dhilan007/develop
...
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:54:38 +08:00
b5433f05c1
replace LabelTTF with Label
2014-04-10 16:51:25 +08:00
d583dcc0f0
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:48:51 +08:00
8fcf687452
Merge pull request #6216 from Dhilan007/develop
...
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:17:10 +08:00
fce85e08f9
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:13:07 +08:00
428cea061c
Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node
...
closed #4744 : EventDispatcher::setDirtyForNode doesn't consider node's children
2014-04-10 15:35:29 +08:00
8a66f43f30
closed #4744 : Adds test for issue4744.
2014-04-10 15:31:53 +08:00
2800133c99
Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`
2014-04-10 14:54:14 +08:00
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
ba1f535201
Merge pull request #6199 from Dhilan007/develop_label
...
closed #4743 : Label:Makes the create functions of Label clearer.
2014-04-10 11:15:56 +08:00
5475a0fc02
fix compile error after merge
2014-04-10 10:58:43 +08:00
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
d865341694
remove kmMat4 interface in cpp-tests
2014-04-10 10:16:16 +08:00
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
2beed5d398
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
...
Develop fix renderer bug
2014-04-10 00:27:33 +08:00
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
b6579aa322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 16:25:44 +08:00
7de6552f54
Update the NewEventDispatcherTest
2014-04-09 16:22:03 +08:00
1c124f52ad
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 14:29:04 +08:00
dbd01051d8
close #4721:clone for EventListeners of lua didn't clone the related property
2014-04-09 14:26:05 +08:00
43eaccca09
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703
2014-04-09 13:47:18 +08:00
50be1ca3ad
Fix win32 build
2014-04-08 22:47:08 -07:00
ddffa3b120
closed #4703 , Solve the incorrect effect of test case : RenderTexture test issue 937.
2014-04-09 13:40:43 +08:00
d64603a856
Attempt to fix the linux build.
2014-04-08 22:29:40 -07:00
8e428d7321
Merge pull request #6163 from heliclei/fix-autotest
...
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-09 13:28:30 +08:00
14b210a082
RefPtr<T> - add move semantics
...
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
2014-04-08 11:34:27 -07:00
440a0adcde
Whoops... Shouldn't remove the test cpp.
2014-04-08 10:40:32 -07:00
a34b952e8d
Revert "Fix Android build for RefPtr addition."
...
This reverts commit 586383a05e
2014-04-08 10:35:55 -07:00
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
e8596094a4
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-08 16:58:51 +08:00
fb777b1a1d
[ci skip], delete ShaderFail sample in ShaderTest.cpp.
2014-04-08 14:52:17 +08:00
fae742c0b8
modify ShaderTest.cpp not crah to autotest.
2014-04-08 14:32:25 +08:00
798708f775
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-08 11:29:42 +08:00
bb85df66b1
Add an event dispatcher test
...
Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.
2014-04-07 16:46:03 -07:00
1b0c55ef15
issue #4629 : test case add a spriteInGroup instead of sprite, the sprite can not be seen now
2014-04-07 22:31:24 +08:00
beda294be1
issue #4629 : add test case for group command
2014-04-07 22:02:43 +08:00
f1a2db9006
Merge pull request #6140 from dumganhar/render-clean
...
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
2014-04-04 13:34:29 -07:00
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
6b4451482f
remove matrixToKmMat4 function
2014-04-04 18:13:10 +08:00
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
7b4a1308ea
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
...
children Test`.
2014-04-04 12:48:16 +08:00
1ec3f014e8
Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener
...
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 18:02:44 +08:00
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
c501aa2dec
issue #4636 . replace __String with StringUtils::format
2014-04-03 17:42:04 +08:00
67e62ce73d
readied director::getMatrix again. remove kmGLgetMatrix
2014-04-03 17:26:06 +08:00
b68f6bf65e
fix the error about `draw` of GLNode and modify the related test cases
2014-04-03 17:02:14 +08:00
c35c006fbd
Merge branch 'develop' into feature3636
2014-04-03 16:02:00 +08:00
5e76c6713d
migrate cpp-tests to director matrix stack
2014-04-03 15:59:55 +08:00
0875b4e51f
closed #4636 . Done
2014-04-03 15:56:45 +08:00
8996ab1956
issue #4636 , finish refactorying UITextFieldTest
2014-04-03 15:52:42 +08:00
ed2c38eb98
issue #4636 , finish UITextBMFont
2014-04-03 15:45:06 +08:00
08bf6c27f4
issue #4636 . finish UITextAtlasTest
2014-04-03 15:38:52 +08:00
b59beab61a
issue #4636 , finish UISlider
2014-04-03 15:33:57 +08:00
f6859a3ca9
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 15:32:16 +08:00
a7a1a6b05b
issue #4636 , finish UIRichTextTest and UIScrollViewTest
2014-04-03 15:22:23 +08:00
8b9af0e94c
issue #4636 . finish UIPageViewTest
2014-04-03 11:52:35 +08:00
48429f5738
issue #4636 . finish UILoadingBar
2014-04-03 11:34:06 +08:00
278e2c3e3b
issue #4636 . finish UIListViewTest
2014-04-03 11:23:12 +08:00
bff1d6c2a6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-03 11:15:59 +08:00
fe33588038
issue #4636 . finish UILayout
2014-04-03 11:14:35 +08:00
b9ff51782f
Synchronize LabelTest of cpp to lua to fix some bug and add more tests
2014-04-03 11:08:59 +08:00
1a97ebdcb0
issue #4636 . finish UIImageView
2014-04-03 10:42:30 +08:00
52bdb840ee
issue #4636 . finish UICheckBox
2014-04-03 10:34:20 +08:00
10134ccc65
issue #4636 . finish button
2014-04-03 10:31:10 +08:00
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
b27fe6ecc2
issue #4636 . add parameter create method to UITextBMFont
2014-04-03 10:07:46 +08:00
0b5c10a0fb
issue #4636 . add parameter create method to UITextAtlas
2014-04-03 10:07:46 +08:00
a03dc76f7d
issue #4636 , add parameter create method for UILoadingBar
2014-04-03 10:07:46 +08:00
92945715eb
issue #4636 . add parameter create function for UIText
2014-04-03 10:07:46 +08:00
558abf1a6b
issue #4636 , add parameter create method to UIImageView
2014-04-03 10:07:46 +08:00
ba9a605568
issue #4636 , add parameter create method to UICheckBox
2014-04-03 10:07:46 +08:00
1b0583214b
issue #4636 , add parameter create method to UIButton
2014-04-03 10:07:46 +08:00
f744ddc860
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-02 17:15:39 +08:00
0e0000e6d5
The projection reset to DEFAULT when a test case onExit().
2014-04-02 17:12:09 +08:00
0c93c6ae60
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
2014-04-02 15:34:26 +08:00
45b0ba3871
migrate Vertex2f to Vector2(tests)
2014-04-02 15:25:50 +08:00
56aa50617c
migrate Vertex3f to Vector3(Tests)
2014-04-02 15:25:19 +08:00
944e752509
fonts/xxx.ttf -> Xxx for old LabelTTF test.
2014-04-01 14:49:02 +08:00
eadbca8ee7
1.fixed logical error in Label::enableShadow.
...
2.Add test case for shadow and outline take effect at the same time.
2014-04-01 14:15:35 +08:00
7804fdf0a1
Merge pull request #6078 from boyu0/3.0rc1_test
...
1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
2014-04-01 11:23:16 +08:00
18b0c041b4
1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.
2014-03-31 18:17:00 +08:00
bc5a2ff5db
Merge pull request #6075 from Dhilan007/develop_label
...
fixed warnings in LabelTest.
2014-03-31 17:40:30 +08:00
687b2e9f87
update test case.
2014-03-31 17:38:54 +08:00
51f3833a7e
fixed warn.
2014-03-31 17:31:04 +08:00
72811d8869
fixed warn in test case.
2014-03-31 17:21:56 +08:00
f4a7da8457
Merge pull request #6069 from Dhilan007/develop_label
...
fixed can't type chinese.
2014-03-31 16:46:43 +08:00
6c99f992dc
fixed can't type chinese.
2014-03-31 16:18:45 +08:00
98ed579b34
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301
...
Fixed bugs for Editor
2014-03-31 15:37:45 +08:00
7840a246b7
Merge pull request #6063 from koowolf/add_bg_wav
...
add background.wav to wp8 to play
2014-03-31 15:20:26 +08:00
313108af82
Merge pull request #6065 from boyu0/3.0rc1_test
...
fix box2dbed dynamic tree test draw.
2014-03-31 14:38:00 +08:00
48854f4649
delete Time of Impact test which can not shown
2014-03-31 13:41:48 +08:00
9b75fc5595
add box2dbed test keyboard event.
2014-03-31 12:07:21 +08:00
ce78b6369a
add background.wav to wp8 to play
2014-03-31 11:46:39 +08:00
4fa8d24561
fix some box2d test position
2014-03-31 11:26:11 +08:00
8aa187d8dc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-31 10:47:04 +08:00
95ab15195c
Optimize the performance of BlurSpriteTest in Shader Sprite.
2014-03-31 10:44:48 +08:00
530354ca67
fix box2d dynamic tree draws
2014-03-31 10:21:54 +08:00
6cc51a2cfc
Merge pull request #6057 from samuele3hu/develop_socket
...
Add the omitted socket script for lua-tests
2014-03-31 10:15:38 +08:00
f80bdfff76
Merge pull request #6055 from MSOpenTech/wp8-3.0
...
Cocos2d-x 3.0 Windows Phone 8 support
2014-03-29 23:21:34 +08:00
a874ecf8b0
Merge pull request #6053 from natural-law/develop
...
Solve the error effect of BlurSpriteTest in Shader Sprite.
2014-03-29 21:42:54 +08:00
056303ea35
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
2014-03-29 14:58:45 +08:00
219a91a641
Add the omitted socket script for lua-tests
2014-03-29 14:58:23 +08:00
7127cb560e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
2014-03-29 10:36:15 +08:00
403e96b943
Use the New Label in the Extension test case
2014-03-29 10:34:52 +08:00
c739956582
added wp8 support files and projects
2014-03-28 15:54:36 -07:00
8d1f4188eb
added wp8 support files and projects
2014-03-28 15:53:55 -07:00
8bd5497ac6
use ResolutionPolicy::SHOW_ALL on WP8
2014-03-28 11:28:48 -07:00
210f95c2d3
can't close app on WP8
2014-03-28 11:27:43 -07:00
a387f60f80
Update the font size for new label test display
2014-03-28 23:32:11 +08:00
77e0694883
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-28 20:55:12 +08:00
6a1974a78a
Solve the error effect of BlurSpriteTest in Shader Sprite.
2014-03-28 20:53:14 +08:00
733b364b51
Fixed bugs for Editor
2014-03-28 18:54:06 +08:00
581ef454eb
Merge pull request #6047 from samuele3hu/develop_test
...
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 18:04:12 +08:00
338fd43beb
Solve the error effect of clipping in cpp-tests & lua-tests.
2014-03-28 17:45:28 +08:00
7ca207f993
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
2014-03-28 17:18:41 +08:00
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +08:00
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
5c77b4d4b1
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
...
closed #4586 : Fix crashes in event dispatch other related safety checks/fixes
2014-03-28 11:28:41 +08:00
b607172e57
Merge pull request #6035 from Dhilan007/develop_label
...
Remove the old implementation of LabelBMFont.
2014-03-28 10:32:04 +08:00
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
8ca3cf8a93
Update the test for dangling node pointers in the events system.
...
Should be run when the debug event listener verification for nodes is switched on.
2014-03-27 16:38:06 -07:00
ba450f786c
Fix the new test added to the event dispatcher tests
2014-03-27 16:16:27 -07:00
2b7116060d
Add a test for events being sent to destroyed nodes.
2014-03-27 16:00:21 -07:00
9fbb45136a
closed #4573 : add ParticleVisibleTest.
2014-03-27 17:06:26 +08:00
6fbf1b4cdf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
2014-03-27 11:21:20 +08:00
06f4cb31b2
Replace NativeActivity with Cocos2dActivity and modify lua android project setting.
2014-03-27 11:18:13 +08:00
6f425c96cb
Merge pull request #6007 from Dhilan007/develop_testcase
...
Remove the old implementation of LabelTTF in test case.
2014-03-27 11:13:37 +08:00
87384d8ffa
Fixed #4566 : Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section
2014-03-27 10:55:41 +08:00
87f9eb3217
Fixed #4566 : Remove autorelease for create construct in LayerTest
2014-03-27 10:25:39 +08:00
413e0010f5
Fixed #4566 : Fix LayerTest bug
2014-03-27 10:22:04 +08:00
586383a05e
Fix Android build for RefPtr addition.
2014-03-26 16:30:04 -07:00
036dc5542c
Add cocos2d::RefPtr<T>
...
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
2014-03-26 15:30:15 -07:00
93511a878b
Remove the old implementation of LabelTTF in test case.
2014-03-26 23:33:58 +08:00
2c616fc9da
Merge pull request #6005 from flashjay/develop
...
remove deprecated code in lua tests & template
2014-03-26 20:12:10 +08:00
491dc202df
remove deprecated code in lua tests & template
2014-03-26 19:42:07 +08:00
849d7b9109
Merge pull request #5996 from chengstory/AddNewCreateNodeWay
...
Adding support of using CCComRender as parent for attached component
2014-03-26 18:20:34 +08:00
58a61d94fb
add use CCComRender as parent for attaching component
2014-03-26 16:39:32 +08:00
22fdbbb198
Merge pull request #5980 from Dhilan007/develop_label2
...
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
2014-03-26 16:32:04 +08:00
876f643bc4
issue #4401 , fix a typo
2014-03-26 16:00:55 +08:00
21ba509a35
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
...
closed #4559 : Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
2014-03-26 15:27:57 +08:00
c1faad7e2c
Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp.
2014-03-26 15:04:45 +08:00
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
7a8db8271f
Merge pull request #5930 from andyque/Branch_issue4429
...
closed #4429 : Boolean value could not be written to specified plist file
2014-03-26 11:46:56 +08:00
1247760d95
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-03-26 11:15:48 +08:00
473a6b19ee
Upgrades to Chipmunk 6.2.1
2014-03-25 10:37:35 -07:00
f6c6d428ad
Merge pull request #5926 from andyque/fix_tests_warnings
...
issue #4401 , remove warnings under win32
2014-03-25 18:17:42 +08:00
36892c3a98
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880
2014-03-25 16:21:41 +08:00
d6ad9274c4
closed #2880 , Generate mipmap for the texture has mipmaps when reload textures.
2014-03-25 16:19:34 +08:00
674dffce21
Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs
2014-03-25 16:10:47 +08:00
34245d4bd0
Merge pull request #5953 from dumganhar/merge5934
...
closed #4541 : [ui] Removed Widget::addNode, added ProtectedNode.
2014-03-25 15:46:56 +08:00
3fc15e5e7d
Merge pull request #5896 from splhack/remove_nativeactivity
...
Remove NativeActivity
2014-03-25 15:37:12 +08:00
2dffcb9808
Add ProtectedNode and remove "addNode"
2014-03-25 14:28:58 +08:00
32f647d38b
Merge pull request #5940 from boyu0/iss4513_particle_readd_bug
...
closed #4513 : Particle doesn't animate when it was removed and re-added to another node.
2014-03-25 14:05:12 +08:00
8d28884c9f
Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel
...
issue #3821 : Uses new label instead of LabelTTF in engine.
2014-03-25 13:46:17 +08:00
5625c98443
Merge pull request #5942 from Dhilan007/develop_label2
...
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
2014-03-25 11:39:53 +08:00
289e632a40
closed #4513 : change 1.0 to 1.0f to avoid the warning.
2014-03-25 11:36:35 +08:00
a3b83d68b2
update test case.
2014-03-25 11:10:48 +08:00
b074890b57
update test case
2014-03-25 10:57:44 +08:00
3fba61f384
Remove NativeActivity
2014-03-24 19:57:29 -07:00
04b529d328
fixed use of nullptr in variable args for wp8
2014-03-24 15:09:24 -07:00
1520f85b32
closed #4513 : fix titles.
2014-03-24 18:20:11 +08:00
759ec61639
closed #4513 : Particle doesn't animate when readd it.
2014-03-24 18:08:55 +08:00
a2d00c8f95
Adds another test for stroke.
2014-03-24 17:39:23 +08:00
99b65f0a7c
LabelTest , changed stroke color to blue.
2014-03-24 17:05:24 +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
62e45b37f9
disabled console for wp8/winrt. Don't quit app for winrt/wp8
2014-03-22 06:17:34 -07:00
912d316ae5
use ResolutionPolicy::SHOW_ALL for winrt/wp8. disabled console for wp8/winrt
2014-03-22 06:16:43 -07:00
0d4ae12f1e
disables webp tests for wp8 and winrt
2014-03-22 06:15:45 -07:00
2a13bbccc9
disabled network tests for wp8/winrt until networking code is added
2014-03-22 06:15:18 -07:00
4c03c526c1
added missing virtual. disabled console for wp8/winrt until networking code is added
2014-03-22 06:14:44 -07:00
4df55dc6ee
no mp3 support for wp8. Added define for .wav
2014-03-22 06:14:03 -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
504501896f
closed #4497 : use /z7 to build without .pdb, or will face with error c3130.
2014-03-21 16:39:00 +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
6340547fc5
Merge pull request #5900 from heliclei/fix-test-memory-leak
...
fix memory leak in CocosDenshionTest.
2014-03-21 11:21:04 +08:00
9c00484022
Autorelease custom extended class, fix memory leak
2014-03-21 11:07:28 +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
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
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
dd790ce54d
add id return value to LuaObjectCBridge
2014-03-20 16:59:18 +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
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
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
c4aaaf9231
closed #4424 : fix PhysicsBody::setGravity() doesn't work correctly sometimes.
2014-03-18 16:17:43 +08:00
d59fb25e2a
update test case of issue 4428.
2014-03-18 10:26:45 +08:00
4d5c7fc634
Add a test case to reproduce issue 4428.
2014-03-18 10:20:25 +08:00
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +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
e512235299
Remove the old implementation of LabelTTF
2014-03-14 21:06:40 +08:00
a05d6a55e2
fix: Make Close Menu invisible for iOS platform
2014-03-14 17:38:58 +08:00
4aef65d4b7
fix the error that AssetManager test case can’t find correct resource path
2014-03-14 09:48:48 +08:00
ca56410427
Rename `testlua` to `lua_tests` for luaTest android project
2014-03-13 17:36:53 +08: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
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
7e48dbc572
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
2014-03-12 18:35:06 +08:00
9713a246ee
Replace cc.LabelBMFont:create with cc.Label:createBMFont
2014-03-12 18:33:28 +08: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
c69d9e75b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
2014-03-12 17:58:20 +08:00
1c32c6d96f
Replace cc.LabelTTF:create with cc.Label:create
2014-03-12 17:51:34 +08:00
4d99736e4a
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-12 17:06:48 +08:00
27a7dce447
Adds lua-empty-test to VS project.
2014-03-12 16:20:27 +08:00
611cccd3e7
[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.
2014-03-12 15:59:48 +08:00
dd87df1cbc
rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.
2014-03-12 15:30:21 +08:00
fa40bee023
fix lambda introducer
2014-03-12 14:50:44 +08:00
d06bb83f19
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
...
Conflicts:
tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
2014-03-12 14:33:39 +08:00
9c95c1e456
Replace cc.LabelTTF:create with cc.Label:create
2014-03-12 14:27:52 +08:00
d57d2f3059
Merge remote-tracking branch 'upstream/develop' into walk-node-tree
2014-03-12 14:19:55 +08:00
4a55e98adf
[lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
2014-03-12 14:06:57 +08: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
cb4acc6311
fix linux compile error
2014-03-12 11:03:23 +08:00
2c2a5ee38e
rename gui to ui
2014-03-12 10:46:49 +08:00
0634a1accd
fix lua resource path
2014-03-12 10:19:41 +08:00
d806274f98
change gui to ui
2014-03-12 10:12:02 +08:00
469bee1e87
delete samples
2014-03-12 10:10:14 +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
79e979ac71
updates CMakeLists.txt
2014-03-11 19:10:37 +08:00
25604d3872
Update CMakeLists.txt
2014-03-11 19:10:37 +08:00
58e21884f8
TestsDemo -> CppTests.
2014-03-11 19:10:36 +08:00
99ffde24d2
[Android] Prefer to install tests to external storage device.
2014-03-11 19:10:36 +08:00
431e800dd6
All tests could run on Android.
2014-03-11 19:10:36 +08:00
b635d9abd9
Remove .gitkeep in 'cpp-empty-test', Add proguard-project.txt.
2014-03-11 19:10:36 +08:00
3d5c3001bd
cpp-empty-test works ok for Android.
2014-03-11 19:10:36 +08:00
91a3ba61da
lua-empty-test, cpp-empty-test work for iOS/Mac
2014-03-11 19:10:36 +08:00
fda8cfa740
plist rename.
2014-03-11 19:10:35 +08:00
2485f86777
lua-empty-test folder structure refactoring.
2014-03-11 19:10:35 +08:00
7504a25d9c
cpp-hello -> cpp-empty-test, lua-hello -> lua-empty-test, ouch....
2014-03-11 19:10:35 +08:00
b88de91a15
Renames 'samples' folder to 'tests', ouch....
2014-03-11 19:10:34 +08:00
5354980d75
Rename 'tests' folder to 'samples', adds 'cpp-tests' folder.
2014-03-10 10:22:33 +08:00
7b0d249e00
Fixed crash
2014-03-07 20:46:27 +08:00
e38fc52d15
Fixed crash
2014-03-07 18:24:40 +08:00
c81793b076
Modify projects
2014-03-07 16:47:51 +08:00
0c4bca9bb2
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-07 16:42:38 +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
62dfe630c7
Add custom widget
2014-03-07 15:36:45 +08:00
c233b636cd
closed #4301:Label support vertical alignment and assign dimensions.
2014-03-07 14:58:44 +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
91cae278e0
Merge pull request #5595 from dumganhar/schedule-test-crash
...
Fix of 'schedule test/issue#2268' crashes
2014-03-06 23:14:35 +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
d7774c29ca
Fixes 'schedule test/issue#2268' crashes
2014-03-06 17:41:58 +08:00
99b2c5453e
Solve the crash in WebSocketTest when the network in disconnected.
2014-03-06 16:49:51 +08:00
bd5c11b5ee
Modify mk file and solve warnings
2014-03-06 16:15:03 +08:00
3554dcd749
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-06 11:22:33 +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
183622c718
'EventDispatcherTest/Issue 4129' crashes on Windows.
2014-03-06 10:45:29 +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
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
6d31e4eb15
remove wrong sub-title
2014-03-05 19:58:33 +08:00
12206fc1fd
Merge pull request #5561 from boyu0/v3.0_final_test
...
Move Box2dTestBed step method to onDraw.
2014-03-05 19:28:42 +08:00
f1cd89b168
Merge pull request #5557 from dabingnn/develop_fixRetroTest
...
fix: shader RetroTest by using new label
2014-03-05 19:25:40 +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
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
b0414a88ed
Delete Box2DView::tick() method.
2014-03-05 15:55:08 +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
8a4f16fec6
Move Box2dTestBed step method to onDraw
2014-03-05 15:40:16 +08:00
8e28400725
Some warning fixes in cpp-tests.
2014-03-05 15:04:47 +08:00
b866a16503
fix: shader RetroTest by using new label
2014-03-05 14:41:13 +08:00
e0de7efa8e
Rename ActionManagerTest->RemoveTest to StopActionTest
2014-03-05 14:32:00 +08:00
0bbc1cf5c3
fixes more warnings
2014-03-04 14:00:32 -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
7415ecc2b7
Fixed crash of sample
2014-03-04 17:06:12 +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
99d0ce160a
rename setVirtualViewPort->setVirtualViewport
2014-03-04 15:41:36 +08:00
0d4783dd39
set scaleY to -1 for test case, because renderTexture result is not the same as texture load from file
2014-03-04 15:24:06 +08:00
3e9e33a46b
add new test cases
2014-03-04 15:07:54 +08:00
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
01dd962cb6
Merge pull request #5495 from Dhilan007/develop_gblur
...
fixed incorrect effect of Gaussian Blur.
2014-03-03 18:01:29 +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
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
1aa9e35fb2
Merge pull request #5500 from dumganhar/scheduler-refactor
...
closed #4165 : Refactors Scheduler class.
2014-03-03 11:20:06 +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
104531c22e
Merge pull request #5499 from heliclei/autotest-run
...
add CCConosle [autotest run] command
2014-03-03 10:06:25 +08:00
f3949e078b
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-02 17:41:18 +08:00
23f15ed9b5
closed #4160 : Adds test case for issue 4160.
2014-03-02 16:22:57 +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
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
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -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
02bf79f075
fix windows compile error
2014-02-28 23:41:01 +08:00
d50391e5dd
add CCConosle [autotest run] command
2014-02-28 23:02:22 +08:00
c2167501cc
Merge pull request #5494 from natural-law/develop
...
Modify the depend project path for project "TestCpp".
2014-02-28 17:36:36 +08:00
0837b73dda
fixed incorrect effect of Gaussian Blur.
2014-02-28 17:34:24 +08:00
7d5ac249fb
Modify the depend project path for project "TestCpp".
2014-02-28 17:29:12 +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
015180bf62
issue #4150 : Add physics position/rotation test
2014-02-28 15:47:49 +08:00
7dd75ea2cb
issue #4129 : Adds test case for issue 4119.
2014-02-28 15:46:48 +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
9a5adc5be5
closed #3684 , Optimize the code of TextureAtlas test case.
2014-02-28 11:52:08 +08:00
ddf5957a9c
closed #3684 , Set shader program before TextureAtlas is rendered.
2014-02-28 11:43:41 +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
8c536589df
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve
2014-02-27 20:04:04 +08:00
03ea69d074
Merge branch 'develop' of https://github.com/natural-law/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-02-27 15:29:31 +08:00
f400c1ac68
issue #4118 : edit contact test and fix node setPhysicsBody bug
2014-02-27 13:35:37 +08:00
8afd23a001
closed #3727 , In project "TestCpp", not pause/resume background music & effects when it's going to background/foreground.
2014-02-27 10:18:49 +08:00
75ec508f0a
issue #4118 : improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.
2014-02-27 09:45:35 +08:00
186259b0b1
fix andriod compile error
2014-02-27 00:25:37 +08:00
49b971867b
fix win32 compile error
2014-02-27 00:13:17 +08:00
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
e4837e7f94
issue #4116 : Removes script-bindings codes.
2014-02-26 21:34:06 +08:00
c2acfea633
issue #4116 : Delete non-scripting files.
2014-02-26 21:17:17 +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
2b2979551e
Merge pull request #5460 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : Physical performance improve.
2014-02-26 11:37:13 +08:00
912dad7a71
closed #4144 : fix bug: Node::setPhysicsBody doesn't work at the second time.
2014-02-26 10:53:41 +08:00
2397aaf24d
issue #4118 : add physics contact test.
2014-02-25 15:28:13 +08:00
63344a8560
remove unused declare
2014-02-25 11:58:45 +08:00
514cd031b3
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-25 11:09:58 +08:00
2beacc21c9
Merge pull request #5456 from andyque/fixbug3801
...
closed #3801 : State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test
2014-02-25 10:57:23 +08:00
f88e4be4ce
rollback gui filename change
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
f5b0b77423
fixed #3801 . uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive
2014-02-25 10:16:17 +08:00
8f8b990c85
uncomment the pause() and resume() method call in test-js
2014-02-25 10:16:17 +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
d15009c510
issue #4039 : delete name "converted_x", "converted_y", "converted_width", "converted_height".
2014-02-24 20:14:46 +08:00
115d3e4a3b
Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash
2014-02-24 17:03:28 +08:00
2bc91c2ce3
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:42:07 +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
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
a765178a5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-24 09:38:08 +08:00
fe1160cd8c
changes in API to support 3D
2014-02-22 19:16:42 -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
293ea66401
issue #3956:Remove the usage of “tolua.cast”
2014-02-21 16:22:35 +08: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
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
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
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
97a6ac65d3
Merge pull request #5424 from heliclei/console-autotest
...
testcpp autotest:support next, back and restart test via console
2014-02-20 22:22:55 +08:00
e64a647563
testcpp autotest:support next, back and restart test via console
2014-02-20 21:49:13 +08:00
4410e70ca1
closed #4096 : add s3tc bitmap with no mipmaps test case.
2014-02-20 18:27:52 +08:00
f16d7652df
Merge pull request #5393 from heliclei/console-autotest
...
add console autotest support
2014-02-20 17:58:21 +08:00
1a1f92106a
add more console output
2014-02-20 16:29:04 +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
633604f79c
issue #4058 : Typo fix in ZwoptexTest.lua.
2014-02-20 14:12:14 +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
02af73dd46
add main directive to return main menu
2014-02-20 13:43:28 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
ddd02b463c
optimize label:
...
1.remove unnecessary API
2.reduces object-creation and function calls.
2014-02-19 20:26:14 +08:00
e7209fbfa4
add autotest help
2014-02-19 17:55:32 +08:00
f086f39319
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
2014-02-19 17:00:26 +08:00
f9dceb5c2d
use '==' to do string compare
2014-02-19 16:54:42 +08:00
0eb957e89c
add console autotest support
2014-02-19 16:34:33 +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
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
0b932f4f5f
fixed #3620 . merge cocostudio/CCActionXXX to CCAction
2014-02-18 14:22:14 +08:00
e1ca972d3a
add tests of all the new added CCActionEaseEx in CCActionEase
2014-02-18 14:22:14 +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
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
2ee1330479
closed #4054 : Adds test for removing child from TMXLayer.
2014-02-17 21:16:25 +08:00
69ec932cd4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformance
2014-02-17 10:25:24 +08:00
3f8bc8cc43
issue #3708:Remove the useless test case
2014-02-17 10:24:58 +08:00
e02f488224
Merge branch 'develop' into issue3964
2014-02-16 11:01:07 +08: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
a5aa547c7b
Merge pull request #5316 from natural-law/ScenarioTest
...
closed #3738 : Add performance test case on game scenario.
2014-02-14 11:12:01 +08:00
f04e604a51
Updates JS-Tests.
2014-02-14 10:27:19 +08:00
ea7a27fdf7
Updates JS-Tests.
2014-02-14 09:59:54 +08:00
17dab13502
Resets JS-Tests.
2014-02-14 09:36:27 +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
4837b2dd2d
issue #3990 : setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles.
2014-02-13 17:01:38 +08:00
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +08:00
6e742077c2
add spine setAnimationListener test;
2014-02-13 11:58:54 +08:00
9befe56a7e
update unit test
2014-02-13 11:10:23 +08:00
5da57e4c7d
closed #3990 : Adds test case for issue 3990.
2014-02-13 11:03:35 +08:00
2c961bdfbf
add spine manual binding;
2014-02-13 11:01:54 +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
3d0fabe08c
issue #3708:Performance Test: data structure conversion in lua binding
2014-02-12 18:19:06 +08:00
e7c077bb16
closed #3988 : fix indent.
2014-02-12 16:21:26 +08:00
bfce75f534
Merge branch 'develop' into ScenarioTest
2014-02-12 16:17:03 +08:00
d99af40c32
issue #3738 , Improve the performance test of game scenario.
2014-02-12 16:14:04 +08:00
4fda8a2635
closed #3988 : add bug test
2014-02-12 15:57:02 +08:00
89cc82c332
Merge branch 'develop' into ScenarioTest
2014-02-10 14:26:31 +08:00
51ba0cbb17
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
2014-02-10 14:09:57 +08:00
11dbb37414
issue #3738 , Add move actions for the tile map in PerformanceScenarioTest.
2014-02-10 14:04:21 +08:00
6a662a6330
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2014-02-10 11:47:05 +08:00
926f84d385
issue #3738 , Add game scenario performance test case.
2014-02-10 11:42:15 +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
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
a8387a12f0
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
2014-02-10 10:09:56 +08:00
9d5393631c
Merge branch 'develop' into fast_tmx
...
Conflicts:
tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
tests/test-cpp/Classes/VisibleRect.cpp
2014-02-08 12:49:56 -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
03be459376
Update LabelTestNew.lua
2014-02-08 17:17:35 +08:00
cef84f05af
Add LabelTTFCJKWrappingTest
2014-02-08 17:16:59 +08:00
49163bb774
Add LabelTTFCJKWrappingTest
2014-02-08 17:15:57 +08:00
1170943cf8
Add LabelTTFCJKWrappingTest
2014-02-08 17:14:38 +08:00
82700339c0
Adds a way to print the renderer vertices
2014-02-07 19:37:44 -08:00
616feadda1
More fixes and "tiles" is an uint32 (GID)
2014-02-07 18:11:17 -08:00
c25787e575
issue #3900 : Removes the definition of DEBUG. Windows uses _DEBUG .
2014-02-07 16:01:57 +08:00
5714552458
issue #3900 : mozjs-27.0.lib -> mozjs-27.lib for windows.
2014-02-07 15:29:44 +08:00
4c2da5d286
issue #3900 : mozjs-25 -> mozjs-27 for windows.
2014-02-07 15:16:14 +08:00
e33baac396
iso almost working
2014-02-06 22:20:28 -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
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
6ce6806544
new modules
2014-01-31 16:07:09 -08:00
e77d22a58f
samples -> tests
2014-01-31 14:09:28 -08:00
f9c40f7372
issue #1399 : work ok on iOS after adjusting directory structure
2012-07-19 17:22:36 +08:00
20eec32ff0
Updated proj.android/project.properties. target=android-10 --> 8
2012-06-28 18:26:28 +08:00
26a02804d9
Added some resources. Updated Texture2dTest.cpp.
2012-06-28 17:34:50 +08:00
aba33b5bda
Reverted build_native.sh.
2012-06-28 16:58:32 +08:00
5b08a5996c
add product name for iOS
2012-06-28 13:52:10 +08:00
e3771a8ad4
modify code sign
2012-06-28 13:41:05 +08:00
3c43dfb6fe
disable retina
2012-06-28 11:50:11 +08:00
7348fa12c3
update CHANGELOG and delete some unneeded files
2012-06-28 11:47:54 +08:00
86942aedb4
fixed #1368 : Implement EffectsAdvancedTest (Effect4). Added some comments.
2012-06-27 20:50:47 +08:00
33e32e987c
Implement EffectsAdvancedTest (Effect4).
2012-06-27 18:44:25 +08:00
13793a9d75
fixed #1367 : Updated ShaderTest.cpp, TileMapTest.cpp.
2012-06-27 17:08:50 +08:00
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
f6026d2ba3
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-26 12:09:48 +08:00
95a2696b6b
fixed #1365 : Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
2012-06-26 12:09:23 +08:00
765da0c80a
enable depth test when running test case:Bug-1159
2012-06-26 11:09:37 +08:00
5cc1f7d230
fixed #1338:stop animation when entering background and start animation when comming to foreground
2012-06-21 11:42:49 +08:00
2af75ecd65
fixed #1336 : HelloCocosBuilder/HelloCocosBuilderLayer.cpp
2012-06-20 12:08:34 +08:00
b818c0afa6
fixed #1336 : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
2012-06-20 11:48:31 +08:00
07b9db8e91
Merge branch 'gles20' into gles20-ccbi
2012-06-19 17:28:31 +08:00
c4056b1bb0
fixed #1269 : Updated include search paths for win32 and android.
2012-06-19 17:22:55 +08:00
591566b43a
fixed #1335 : Memory leaks in cocos2dx and CCBReader.
2012-06-19 16:31:26 +08:00
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
2666df9472
issue #1269:mrege latest code and fix conflict
2012-06-19 13:57:33 +08:00
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
9fa74721a7
fixed #1334 : Add ScrollViewTest to CocosBuilderTest.
2012-06-19 10:34:15 +08:00
6f26ea7a56
Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest.
2012-06-18 13:59:45 -07:00
227683bfa4
Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.
2012-06-18 13:33:19 -07:00
6d0608d0f1
fixed #1333 : add CCScrollView for iOS
2012-06-18 19:24:47 +08:00
3cf0f3555c
issue #1330 : Removed virtual for callback functions.
2012-06-16 15:22:23 +08:00
73c9707d5d
CCBIReader fixes + building and running flawless on iOS and Android.
...
Made it works on win32.
2012-06-16 12:48:20 +08:00
13bcf2180c
Merge with gles20.
2012-06-15 16:26:10 -07:00
c38bfd0a24
Updated xcode project file.
2012-06-15 16:16:08 -07:00
d175884f79
Added ParticleSystemTest.
2012-06-15 14:48:36 -07:00
cc572ab8e7
fixed #1329 : Moved all java files part of engine into a certain directory, then all projects refer to them.
2012-06-15 18:15:43 +08:00
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
899022d107
fixed #1292:fix some bugs that caused by modify function name
2012-06-15 17:39:13 +08:00
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
0afdfe33da
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 15:25:37 +08:00
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
266a5e5e66
Merge pull request #1028 from minggo/iss1292_moidify_function_name
...
issue #1292:make some function names more readable
2012-06-15 00:14:13 -07:00
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
159b91b6cd
Fixed a logic error in ActionScaleTest.
2012-06-15 13:56:27 +08:00
bc150ea5a9
fixed #1327 : Exported 'create' method for lua bindings.
2012-06-15 11:46:51 +08:00
6fc2dc5ed9
Use Java code instead of XML to define layout
...
* Android layout for cocos apps are very simple (full screen)
* Avoids creation of R.java for loading the layout
* Can package entire library in jar
* Remove unused layout resource
2012-06-14 19:52:45 -07:00
c965c8d770
fixed 1181: synchronize latest codes
2012-06-15 10:27:52 +08:00
d651da6f0d
Tests : Ant build project files
2012-06-14 19:21:03 -07:00
d86e088e9f
Tests : Use cocos2dandroid library
...
* Remove code and resources that are now in a library
* Add library as a dependency for HelloWorld
* Use cocos2dx_default_ resources
2012-06-14 19:21:03 -07:00
8d7dce0999
Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.
2012-06-14 18:16:54 -07:00
a7ad34864f
CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.
2012-06-14 14:23:53 -07:00
221be759c6
issue #1324 : merge James Chen's codes
2012-06-14 18:54:05 +08:00
9d9e2579e3
issue #1181 : save render texture when comming to background
2012-06-14 18:37:57 +08:00
052d8ea931
fixed #1324 : Added some create methods. Compiling successfully on win32 by vs2008.
2012-06-14 18:32:44 +08:00
3a410c14a1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
...
Conflicts:
cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
cocos2dx/label_nodes/CCLabelBMFont.cpp
cocos2dx/menu_nodes/CCMenuItem.cpp
cocos2dx/menu_nodes/CCMenuItem.h
cocos2dx/misc_nodes/CCRenderTexture.h
cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
cc5eabeb28
ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.).
2012-06-14 01:32:52 -07:00
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +08:00
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
cdd1fb50ac
Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*
2012-06-14 00:01:01 -07:00
5550d9f2b0
Merge with gles20.
2012-06-13 15:56:52 -07:00
3e61e1f014
Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android.
2012-06-13 15:25:59 -07:00
29b22adccc
Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.
2012-06-13 14:19:13 -07:00
9321a8d025
fixed #1322 : vertical alignment works ok on android
2012-06-13 18:33:44 +08:00
f80fd0c232
Merge pull request #1015 from minggo/gles20
...
issue #1310:synchronize some codes
2012-06-12 19:46:45 -07:00
b282d52a65
issue #1310:synchronize some codes
2012-06-13 10:41:04 +08:00
895604f42e
Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector.
2012-06-12 11:59:49 -07:00
d2a16c2b76
issue #1310 : Updated MotionStreakTest.
2012-06-12 18:27:36 +08:00
e943dbf2fd
issue #1310 : Updated TileMapTest, TransitionsTest, ZwoptexTest.
2012-06-12 18:22:48 +08:00
2be8ba120c
issue #1310 : Updated vs2008 project setting.
2012-06-12 18:15:25 +08:00
6d4b80a826
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-12 18:13:02 +08:00
dab90107b9
issue #1310 : Updated SchedulerTest.
2012-06-12 18:12:45 +08:00
92f0364dca
Merge pull request #1008 from dumganhar/gles20
...
issue #1310 : Reverted floatr to CCTimer.
2012-06-12 02:09:10 -07:00
08fc714a7f
issue #1310 : Reverted floatr to CCTimer.
2012-06-12 17:07:54 +08:00
1d77d53af3
Merge pull request #1007 from minggo/gles20
...
issue #1310 : synchronize some codes
2012-06-12 01:57:24 -07:00
9fbe1fef96
issue #1310 : synchronize some codes
2012-06-12 16:56:34 +08:00
c8b5ad0440
issue #1310 : Updated RotateWorldTest and SceneTest.
2012-06-12 16:22:25 +08:00
23519ef85c
issue #1310 : Updated ParallaxTest and RenderTextureTest.
2012-06-12 15:55:23 +08:00
1c0f391e03
issue #1310 : Updated ParticleTest.
2012-06-12 15:40:31 +08:00
ae1ea76ca1
issue #1310 : Updated NodeTest.
2012-06-12 15:22:42 +08:00
f5b2a5d33d
issue #1310 : Updated LayerTest.
2012-06-12 15:14:01 +08:00
b770010c41
issue #1310 : Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString.
...
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
2012-06-12 14:33:53 +08:00
ef8ec1a941
issue #1310 : Added some resources for tests project.
2012-06-12 14:32:57 +08:00
9185f771f1
issue #1310 : Added some resources for tests project.
2012-06-12 14:29:15 +08:00
916b276607
issue #1310 : synchronize CCTexturePVR
2012-06-12 12:02:15 +08:00
974f0d714d
issue #1310 : Updated FontTest. And fixed a compilation error in FontTest.
2012-06-12 11:16:31 +08:00
1f2652a8d7
Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.)
2012-06-11 18:31:11 -07:00
4c8351f304
Removed Zombie files.
2012-06-11 15:00:11 -07:00
342c65e293
Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file.
2012-06-11 14:57:30 -07:00
58b53be708
Merge with gles20.
2012-06-11 11:50:32 -07:00
4378731418
Merge with gles20.
2012-06-11 10:43:07 -07:00
ccbfd24c21
issue #1310 : synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest
2012-06-11 18:25:57 +08:00
2ce7c86c50
fixed #1315 : TileMapTest can't be shown correctly in retina mode.
2012-06-11 14:44:32 +08:00
33ea7905a5
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils.mm
2012-06-11 11:01:36 +08:00
c95cbb1774
issue #1310 : Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status.
...
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
2012-06-11 10:59:57 +08:00
94235d3602
issue #1310 : make tests and HelloWorld work ok
2012-06-11 10:41:52 +08:00
c9dc60b0f7
issue #1310 : fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project.
2012-06-08 17:58:21 +08:00
371b3f9938
issue #1310 : Tests project updated!.
2012-06-08 17:34:15 +08:00
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
6cf8ea283d
Merge pull request #973 from minggo/iss1278_effect_android
...
fixed #1278 : stop effect when unloading effect
2012-06-06 00:41:26 -07:00
1ff04700b5
fixed #1278 : stop effect when unloading effect
2012-06-06 15:38:25 +08:00
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
6bb2941ec9
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-06 10:06:51 +08:00
dc24094b5f
fixed #1290:use Shaders folder in correct way
2012-06-04 11:41:03 +08:00
cfbf29ccfc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati
2012-06-01 13:47:23 +08:00
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
93b5fc37c7
typo fix
2012-06-01 12:04:04 +08:00
9be586e4ec
Updated main.cpp for each project of android.
2012-05-31 10:13:05 +08:00
5ad2bec3d8
Merge pull request #946 from minggo/gles20
...
fix some bug
2012-05-30 03:33:19 -07:00
a698f9bf69
fix some bug
2012-05-30 18:31:20 +08:00
922f7544ad
Updated TouchesTest.
2012-05-30 16:55:46 +08:00
bd248b5ac0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-30 16:09:52 +08:00
7115a7f3c9
issue #1275 : Memory leaks in CCBReader and ActionsTest.
2012-05-30 16:09:19 +08:00
8203cf00ba
use fonts/fps_images.png
2012-05-30 13:37:36 +08:00
ff0dde984c
fixed #1240 : Updated vs2008 project setting (release target).
2012-05-29 18:29:56 +08:00
b4fad0bb2b
fixed #1240 : Updated vs2010 project setting (release target).
2012-05-29 18:06:52 +08:00
1ddb5d51b5
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-29 17:13:21 +08:00
a09bbbd0ba
fixed #1177 : modify project setting, because CCStd.h is moved into platform/ios
2012-05-29 16:23:57 +08:00
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
a00db6e072
fixed #1240 : Updated ios project configuration.
2012-05-25 17:00:33 +08:00
c902e884f4
fixed #1240 : Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.
2012-05-25 16:52:47 +08:00
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
0b8a75e982
fixed #1240 : Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.
2012-05-25 10:58:28 +08:00
138de3171f
Merge pull request #912 from minggo/merge_nicolasgramlich
...
Merge pull request by nicolasgramlich
2012-05-23 19:56:05 -07:00
0ba62c3854
issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp
2012-05-24 10:48:39 +08:00
a5b63d8f6c
fixed #1251 : Added CocosBuilderTest to the test project for VS2008.
2012-05-23 11:41:42 +08:00
a62e017977
Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png.
2012-05-22 13:26:20 -07:00
7dadd8128c
rename tests/Resource/CocosBuilder to CocosBuilder_v1
2012-05-11 21:22:50 +08:00
dc18dc0942
test ccb v2 format, add relative-position support
2012-05-11 20:53:30 +08:00
ae12434128
fixed #1205 , rename CCCustomClass to CCCustomClassProtocol, add windows support.
2012-05-08 11:30:08 +08:00
f10b94fd15
issue #1205 , CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.
2012-05-07 22:52:58 +08:00
1a73064055
issue #1205 , refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android
2012-05-07 18:14:15 +08:00
c76e3c0936
remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.
2012-05-07 17:05:17 +08:00
07276c3bba
Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20
2012-05-05 15:49:11 +08:00
6b374881f0
Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20
2012-05-05 10:07:21 +08:00
f70855e959
fixed #1229 , reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.
2012-05-05 10:06:41 +08:00
be2fa353a7
Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20
2012-05-05 09:55:06 +08:00
1afd7f2701
Merge pull request #893 from minggo/iss1217_EaseAction_reverse
...
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
14b923409a
fixed #1217 : implement reverse() for all subclass of CCEaseAction that missing it
2012-05-04 16:22:50 +08:00
bf0da624b4
issue #1191 : Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.
2012-05-04 11:16:57 +08:00
ebaf1da460
issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.
2012-05-03 15:29:27 +08:00
2fc1322cc8
update copyright and license declaration of CCCBReader relative files
2012-05-03 14:43:27 +08:00
5faaab0d16
add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor
2012-05-03 12:17:28 +08:00
160b0aba88
Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20
2012-05-03 12:02:13 +08:00
9e62412ce9
issue #1205 , add CCBReader, CppReflection, CocosBuilderTestCase
2012-05-03 11:58:53 +08:00
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
136866bc12
issue #1204 : Updated tests/proj.win32/main.cpp
2012-05-02 18:56:03 +08:00
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
77d9b811be
issue #1194 : Updated ChipmunkAccelTouchTest.
2012-05-02 14:06:40 +08:00
abdc94ae3c
Merge branch 'iss1194_tex_wat' of https://github.com/dumganhar/cocos2d-x into iss1194_tex_wat
2012-05-02 12:05:39 +08:00
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +08:00
f37d3dd5d3
issue #1201 : simplify writing of Android.mk
2012-05-02 12:00:39 +08:00
63a8bbf0d9
issue #1194 : Updated ios project configurations after adding CCTextureWatcher.
2012-05-02 10:39:39 +08:00
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
c1bc4fd65a
fixed #1177 : Updated ios project configuration.
2012-04-24 17:42:06 +08:00
26763c200b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
...
Conflicts:
tests/proj.ios/test.xcodeproj/project.pbxproj
2012-04-24 15:44:53 +08:00
1e20f2b6db
fixed #1185 : reload image data and recreate buffer of object when backing to foreground
2012-04-24 15:02:18 +08:00
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
cbfca9d763
add execution permission
2012-04-20 10:54:58 +08:00
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +08:00
f619c3e006
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor
...
Conflicts:
cocos2dx/misc_nodes/CCRenderTexture.cpp
2012-04-19 17:51:58 +08:00
4e4a26a2db
Merge pull request #855 from minggo/iss1150_rendertexture_crash
...
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 02:05:04 -07:00
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
e28c77b574
issue #1176 : Updated ios project configuration.
2012-04-19 15:26:24 +08:00
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
42007ea71c
deleted some unused codes.
2012-04-18 14:15:11 +08:00
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
a71e5be0d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
...
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
2012-04-16 12:45:47 +08:00
9ace0d2fdc
Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.
2012-04-16 10:57:37 +08:00
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
34c805590f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director
2012-04-13 14:11:58 +08:00
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
e9e6256815
Merge pull request #839 from dumganhar/gles20
...
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-12 23:10:57 -07:00
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
91b4d52c31
Merge pull request #838 from dumganhar/gles20
...
fixed #1159 : Updated "CallFuncND + auto remove" test demo.
2012-04-12 20:56:05 -07:00
47af0886d3
fixed #1159 : Updated "CallFuncND + auto remove" test demo.
2012-04-13 11:54:29 +08:00
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
7cf16dbb32
Merge pull request #836 from minggo/touch_case
...
fix TouchesTest crashed on Android and iOS
2012-04-12 18:47:41 -07:00
3fbfeeb7e8
fixed #1142 : fix TouchesTest crashed on Android and iOS
2012-04-13 09:45:31 +08:00
2b5af66974
updated win32 projects configuration release version.
2012-04-10 23:09:58 +08:00
ba37e0e42f
Merge pull request #834 from dumganhar/gles20
...
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 03:45:27 -07:00
b6cc0658f3
invalid pointer check in void TexturePVRRGB888::onEnter().
2012-04-10 18:43:00 +08:00
429e0bcb46
Merge pull request #832 from dumganhar/gles20
...
fixed #1136 : Fixed some bugs as follows:
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 02:46:38 -07:00
675f2b5dd0
Updated strings.xml
2012-04-10 16:21:23 +08:00
c9b1943559
create folder for shader
2012-04-10 15:30:11 +08:00
6cd69523c8
Merge pull request #829 from dumganhar/iss1094_gles20_particlebat
...
issue #1094 : Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
2012-04-08 19:45:38 -07:00
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
3d601048c6
Merge pull request #831 from dumganhar/new_ipad
...
fixed #1095 : IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
2012-04-08 19:02:16 -07:00
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
0f1ab7ab37
issue #1056 : Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
2012-03-27 10:55:13 +08:00
d36933d542
issue #1056 : Update ios project.
2012-03-26 20:29:50 +08:00
d67ea955f2
Delete some shader files.
2012-03-26 20:03:54 +08:00
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
6f5603cfe6
issue #1056 : Updated CCTexture2dTest. Added CCTextureAsyncTest.
2012-03-23 18:16:47 +08:00
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
2a459e23a6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-23 10:27:35 +08:00
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
728835c77b
Merge pull request #806 from minggo/SpriteTest
...
Sprite test
2012-03-22 19:25:24 -07:00
ad8d7cdeff
SpriteTest
2012-03-23 10:23:02 +08:00
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
a8eaf85cfb
Merge pull request #804 from minggo/RenderTextureTest
...
Rendertexturetest
2012-03-22 01:37:58 -07:00
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
56f27c495b
Merge pull request #803 from minggo/MotionStreak
...
issue #1506 : MotionStreakTest
2012-03-21 23:33:03 -07:00
6b7716770e
issue #1506 : MotionStreakTest
2012-03-22 14:32:32 +08:00
3a50022399
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 14:24:08 +08:00
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
2aa61bf798
issue #1506 : LyaerTest
2012-03-22 13:59:47 +08:00
85de198511
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync
2012-03-22 11:49:04 +08:00
3d10006d6f
issue #1506 : implement CCLabelTest
2012-03-22 11:48:37 +08:00
925fee4820
issue #1056 : Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest.
2012-03-22 11:26:39 +08:00
3a287db954
issue #1056 : Update ActionsTest.
2012-03-22 10:27:28 +08:00
b1607b2106
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync
2012-03-22 09:41:03 +08:00
e8b7bc7c7e
issue #1056 : LabelTest
2012-03-22 09:40:32 +08:00
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +08:00
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
e75e35b23f
issue #1506 : add ShaderTest source code
2012-03-21 17:27:13 +08:00
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
159b677dc0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 16:09:26 +08:00
8ad598241f
issue #1056 : Update Tests project for ios platform.
2012-03-21 16:05:24 +08:00
9b4a42c494
issue #1056 : Update Box2dTest and ChipmunkAccelTouchTest.
2012-03-21 15:54:48 +08:00
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
bb908f5a5e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest
2012-03-21 13:36:51 +08:00
f6c113993a
issue #1506 : rename CocosNodeTest to NodeTest and SC
2012-03-21 13:36:24 +08:00
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
a3441a39e7
issue #1056 : rename EaseTatinosTest to ActionsEaseTest and SC
2012-03-20 18:07:42 +08:00
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07:00
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
68809fd5ed
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-19 13:54:34 +08:00
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
41fad74017
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-15 10:05:42 +08:00
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
6336df4024
Fix test to match newer API
2012-03-13 23:07:42 -07:00
7321d33aaf
Added support files for Accelerometer Simulation for iPhone Simulator and
...
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
2012-03-08 11:23:47 +00:00
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
7890333505
fixed #721 : cocosdenshion can play local file on android
2012-03-06 16:56:30 +08:00
d3dedd19f2
fixed #995 : Modify project configure for marmalade port after adding extension support and refactor resource folder.
2012-03-01 17:38:31 +08:00
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
7daeb5cd86
fixed #984 : Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.
2012-02-28 14:59:46 +08:00
6d97e3e381
fixed #972 : update ios project configures.
2012-02-16 11:48:09 +08:00
2c599d31b5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
2012-02-15 17:02:47 +08:00
ac98d22367
update ios project configures for ios, and modify xcode4's template
2012-02-15 16:59:47 +08:00
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
e75dbf2bd9
Merge pull request #724 from minggo/iss957_text_input
...
fixed #957 : avoid to go to background when inputting test
2012-02-14 00:07:51 -08:00
fd9f73f43e
fixed #957 : avoid to go to background when inputting test
2012-02-14 16:02:41 +08:00
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
65b1b20c8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
...
Conflicts:
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
tests/test.win32/test.win32.vcxproj.filters
2012-02-14 11:43:04 +08:00
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
3c41164b23
Merge pull request #716 from minggo/iss971_rtti
...
build cocos2dx as static lib and remove some unneeded codes
2012-02-09 18:35:28 -08:00
6ae40fc12f
fixed #971 : build cocos2dx as static lib
2012-02-10 10:31:56 +08:00
481f1c2532
fix a typo error
2012-02-09 18:17:25 +08:00
357c825fa5
issue #971 : set JavaVM at JNI_Onload()
2012-02-09 16:27:15 +08:00
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
ee08c4629e
Merge pull request #714 from minggo/ndk_module
...
fixed #970 : use modules in the android ndk build
2012-02-07 19:16:01 -08:00
52de292e20
fixed #970 : use modules in the android ndk build
2012-02-08 11:14:47 +08:00
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
ee2139023a
Merge pull request #708 from Wartortle/master
...
fixed #969 : Addition of Accelerometer Simulation for Win32.
2012-02-06 18:57:41 -08:00
a7c96b5371
fixed #954 : correct accelerometer data when set orientation to portrait in tablet
2012-02-07 10:19:40 +08:00
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
1ae8f001b8
Merge pull request #702 from minggo/iss947_closed_loop
...
fixed #947 : fixed a closed loop
2012-02-01 02:22:02 -08:00
5e39489c71
fixed #947 : fixed a closed loop
2012-02-01 18:18:31 +08:00
56677be235
Merge pull request #701 from minggo/iss964_label
...
fixed #964 : compute correct height of a charactor
2012-02-01 02:05:50 -08:00
7b67c04f2f
fixed #964 : compute correct height of a charactor
2012-02-01 18:04:12 +08:00
64c892de79
Merge pull request #697 from dducharme/dalebranch
...
fixed #962 : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
6c2277757a
fixed #958 : delete SelectorProtocol and implement it in CCObject
2012-01-30 17:47:47 +08:00
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
9e180e9c01
Added true type fonts file for Marmalade version
2012-01-17 10:53:47 +01:00
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
df668c9785
Merge pull request #675 from minggo/test
...
fixed #930 : linux supports jpg format file
2012-01-12 01:51:16 -08:00
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
3905e5a47b
Merge pull request #670 from minggo/test
...
fixed #941 : limit background music volume in [0, 1.0]
2012-01-11 01:57:27 -08:00
40b1798f41
fixed #941 : limit background music volume in [0, 1.0]
2012-01-11 17:56:11 +08:00
4848dc9c46
fix a bug in SimpleAudioEngine.cpp on bada platform
...
use float value to change volume
2012-01-11 17:24:46 +08:00
86997d6709
fixed #940 : replace icons and background pictures
2012-01-10 16:45:49 +08:00
317f23f498
fixed #939 : Add create_qnx_project.vbs and add project references
2012-01-09 19:06:49 +08:00
1bd3601b11
fixed #937 : use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform
2012-01-04 18:02:32 +08:00
08e0be754b
fixed #926 : retain/release in Paddle
2011-12-28 15:13:02 +08:00
d82471478d
add run permition
2011-12-23 11:17:20 +08:00
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
b7fbd4fc13
issue #919 : supporting global variable
2011-12-20 16:50:39 +08:00
857ce1d505
fixed #921 : fix a bug that accelerometer axes inverted in android tablet
2011-12-19 16:29:26 +08:00
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
8298e0b6ff
Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
...
Conflicts:
tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
0f8da500c2
Restored Accidentally removed marmalade line from CocosDenshion Test
2011-12-15 02:05:25 +08:00
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
f5d41d21b2
Added CDT Project and Modifying CocosDenshion for QNX
2011-12-14 21:26:47 +08:00
7d01aa0c74
HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors.
2011-12-13 22:25:51 +08:00
4b9cbb85ff
#issue 908: Merge marmalade to latest cocos2d-x source
...
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dea2713f51
fixed #907 : add blackberry port
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
95b43ac563
Merge pull request #614 from minggo/issue892_RTTI
...
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
b1cdb6543d
Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language
...
Added tests for Marmalade and enabled language and font testing
2011-12-11 17:18:01 -08:00
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
5dea9b8205
fix a crash bug in SimpleAudioEngine.cpp
...
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
34759f4411
Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.
2011-12-08 20:47:42 -08:00
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
c5b0a76742
Added support to play more than one sound fx at once
2011-12-08 19:27:20 +01:00
0a7a000c2d
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:21:48 +01:00
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
a3986a9e21
issue 892: add cpp flag to support rtti on android
2011-12-07 16:51:54 +08:00
96d400d918
Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
...
Refactored Accelerometer to match other platforms
Updated SimpleAudioEngine.cpp with new functions. (NOT tested).
Updated app.icf for latest Marmalade
Update deprecated function calls.
Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
520e3365c1
modify some project settings
2011-12-06 16:17:49 +08:00
dfbf2c0cdb
add tests project for blackberry
2011-12-06 15:03:14 +08:00
2f6fb5b189
Merge pull request #602 from minggo/master
...
change file structure in xcode view
2011-12-01 00:28:17 -08:00
d92bdcc40d
change file structure in xcode view
2011-12-01 16:27:11 +08:00
6973525319
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-12-01 14:19:07 +08:00
ef8e34f9a1
fix a bug in ZwoptexTest.
...
step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.
2011-12-01 14:15:10 +08:00
ec70d1d240
Merge pull request #600 from dumganhar/master_base
...
fix a bug in IntervalTest
2011-11-30 22:05:07 -08:00
f02ce4b15a
fix a bug in IntervalTest
2011-12-01 13:56:20 +08:00
34d10fb3db
Merge pull request #598 from dumganhar/master_base
...
DemoModernArt test crash on bada
2011-11-30 20:45:36 -08:00
cddaa3fea2
fixed #885 : make SimpleAudioEngine::setEffectVolume() take effect immediately on android
2011-12-01 12:12:14 +08:00
bdddc188aa
fix a bug that DemoModernArt crash on bada
2011-12-01 12:04:43 +08:00
0ae54cc0fd
comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer.
2011-11-30 17:37:09 +08:00
262d5969c3
fixed #883 : fix a bug in SpriteTest.
2011-11-30 17:29:16 +08:00
adfec68577
fixed #850 : update Box2d for linux
2011-11-29 17:12:21 +08:00
c99d254c01
issue #850 : update box2d for iOS and android
2011-11-29 15:16:16 +08:00
5a984bcc29
Merge branch 'master_base' into box2d2.2.1
2011-11-28 18:32:38 +08:00
3442d17dbe
fixed #880 : implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
2011-11-28 18:05:38 +08:00
cad4ff05f3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
10f5082a83
update box2d to version2.2.1
2011-11-25 18:30:27 +08:00
bd595516b8
issue #781 : add new functions for sound
2011-11-25 09:56:06 +08:00
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
07da67f253
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
bc60ed7856
issue #854 : optimize CCTextureCache::addImageAsync()
2011-11-22 16:47:24 +08:00
efa9275d7f
save the codes for testing
2011-11-21 12:04:21 +08:00
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
775c7ff847
Merge pull request #573 from minggo/iss854_pthread
...
support pthread
2011-11-17 18:40:30 -08:00
0676714436
issue #854 : add TextureCacheTest into makefile
2011-11-17 18:32:52 -08:00
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
81b8fc0ce8
fixed #854 : fix a bug of CCTextureCache
2011-11-17 14:34:41 +08:00
cb75465913
issue #854 : add test case for CCTextureCache
2011-11-17 10:10:13 +08:00
dd8a2deeaf
fixed #758 : fix the bug that TTF fonts cause low memory on android
2011-11-16 11:40:24 +08:00
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
e9a2818d0d
use wvga setting, add SYSTEM_SERVICE
2011-11-02 01:11:06 +08:00
012052b089
modify project configure
2011-10-25 14:32:26 +08:00
4b653c89d1
modify project configure
2011-10-25 14:12:42 +08:00
146d3e1536
modify project config
2011-10-24 14:22:09 +08:00
2c87e5e17e
use default manifest.xml
2011-10-24 11:01:39 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
59a14973ef
change splash and icon to cocos2d
2011-10-24 10:54:08 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
67bbbb2800
1. relative to bug #754 , FontTest should use "fonts/abc.ttf" as external ttf name
...
2. fixed a tiny bug, FontTest can show font name on the top correctly
2011-10-20 14:56:39 +08:00
707e22a2c8
fixed bug #754 , particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version.
2011-10-19 22:20:13 +08:00
e3c39fe835
fixed #753 , visual orientation is wrong on ios5 simulator
2011-10-19 21:43:25 +08:00
8aa014d3cd
Merge pull request #558 from minggo/iss755
...
fixed #743
2011-10-19 05:05:23 -07:00
2490388f28
remove unneeded packages
2011-10-19 20:03:18 +08:00
68d03de677
fixed #743 : let nativeInit() get correct screensize when running on device with software android buttons
2011-10-19 19:55:23 +08:00
7e8e7c7e87
Merge pull request #557 from minggo/iss755
...
fixed #755
2011-10-19 02:03:19 -07:00
2d3bfd4a1a
fixed #755 : get x y coordinate from existing array to avoid crashing on sunsumg devices
2011-10-19 17:01:35 +08:00
e9c133351d
Merge pull request #554 from minggo/master
...
make script more strongable
2011-10-18 23:27:56 -07:00
cc1c29c0ca
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2011-10-18 23:21:53 -07:00
3a17163897
make script more strongable
2011-10-18 23:21:39 -07:00
ae411f9503
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
2011-10-18 17:41:19 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
pipu