Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,346 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1469 Commits

Author SHA1 Message Date
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
pktangyue 3e5c62f905 fix CCScale9Sprite CapInsets bug for rotated sprite frame 2013-07-08 17:00:27 +08:00
James Chen e28cf8d258 issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
yinkaile 6fc0eaf5b1 update 2013-07-07 17:27:42 +08:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
minggo 7e56bb57c8 Merge pull request #3076 from samuele3hu/execDev 
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
 2013-07-05 01:32:06 -07:00
samuele3hu ec2f5376f1 issue #2244:Add namespace to some enums 2013-07-05 16:05:38 +08:00
James Chen ec902c3550 issue #2373: Adding missing overload const getter functions. 2013-07-05 15:08:52 +08:00
James Chen d2746bbe90 issue #2373: Removing inline for virtual function. Adding more const getter functions. 2013-07-05 15:08:52 +08:00
samuele3hu c0e89a4ee9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-05 09:49:01 +08:00
minggo 7bcafb46a4 Merge pull request #3051 from samuele3hu/execDev 
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
 2013-07-04 03:33:12 -07:00
samuele3hu b0e4757c24 issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader 2013-07-04 17:54:02 +08:00
samuele3hu 570f2663f4 issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
minggo 1d94ce12a2 Merge branch 'const_love' of https://github.com/ricardoquesada/cocos2d-x into const_love 2013-07-04 10:29:56 +08:00
Ricardo Quesada adaa72fbb4 Adds const to getters 
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
 2013-07-03 17:22:15 -07:00
YangLe 18b662c942 fix CCScale9Sprite for rotated sprite frame 
fix Issue #1145
 2013-07-04 00:03:44 +08:00
samuele3hu ec801ae89d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-02 15:29:19 +08:00
samuele3hu 9b08cee01f issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
yinkaile 58550a834c 1.Fix empty frame bug 
2.Change Skin function interface name
 2013-07-02 10:32:32 +08:00
Ricardo Quesada b434f7332a Removes #if from header class 
preventing ugly bugs
 2013-07-01 11:52:04 -07:00
James Chen 8b1325b544 Merge pull request #3034 from Squallium/develop 
Added CocosDenshion dependency to libextension project
 2013-07-01 01:54:02 -07:00
Squallium c3e043ef20 Added CocosDenshion dependency to libextension project 2013-06-30 21:38:06 +02:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Ricardo Quesada 5bb256e837 Merge branch 'develop' into js_mac 2013-06-27 10:48:58 -07:00
Ricardo Quesada ccd9cb486c JS Tests compiles and links in Mac 
...but it doesn't work yet due to a bug with the touch events :-(
 2013-06-27 00:58:46 -07:00
James Chen 00d6510a0d Merge pull request #3014 from wtyqm/develop 
close #2338: fix sub ccb node resource root path bug
 2013-06-26 20:49:00 -07:00
wtyqm ab36c433fa fix sub ccb node resource root path bug 
When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
 2013-06-27 09:41:38 +08:00
Justin Hawkwood 9067918d73 Set textview_hidden to true on init 2013-06-26 13:44:49 -07:00
minggo 72937aa6d8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2305-replace-pthread 2013-06-26 14:47:31 +08:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake 
close #2332: [Linux] Adding project part for QtCreator.
 2013-06-25 21:57:20 -07:00
James Chen ae737365d7 issue #2305: Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50)); 2013-06-26 11:34:04 +08:00
James Chen ea36707c57 issue #2305: Using the old logic of "wait". 2013-06-26 11:10:19 +08:00
James Chen 3ad11cc63a issue #2305: Fixing a bug that passing wrong mutex parameter to "wait". 2013-06-26 11:06:13 +08:00
James Chen f2ab73c533 issue #2305: Reverting to use lock and unlock for HttpClient. 2013-06-26 10:45:46 +08:00
James Chen 8a0046a139 issue #2305: Fixing a crash when error is triggered in WebSocket. Using std::lock_guard to replace lock and unlock manually. 2013-06-26 10:11:10 +08:00
James Chen 79962cdf5d issue #2305: Using c++11 std::thread instead of pthread for HttpClient class. 2013-06-26 10:11:10 +08:00
James Chen cfcc39d924 Merge pull request #2987 from dumganhar/iss2305-std-thread 
issue #2305: Using c++11 thread instead of pthread for WebSocket.
 2013-06-24 21:54:09 -07:00
James Chen 3b9fa904ba issue #2305:use c++11 thread instead of pthread for WebSocket. 2013-06-25 12:51:44 +08:00
yinkaile 5d94a5594c 1.Fix color tween bug 2013-06-25 12:15:19 +08:00
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
James Chen d9985d07ce Merge pull request #2981 from dumganhar/iss2325-ios-workspace 
issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
 2013-06-24 03:33:36 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
minggo f5ed772c22 issue #2305:remove unneeded comment 2013-06-24 14:11:30 +08:00
minggo 141105ac69 issue #2305:remove unneeded comment 2013-06-24 14:03:45 +08:00
minggo e5a122ea39 issue #2305:use c++11 thread instead of pthread in AssetsManager 2013-06-24 13:59:41 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen f1eaabb09f issue #2322: Fixing a warning in extensions/CCArmature/utils/CCDataReaderHelper.cpp. 2013-06-23 17:23:14 +08:00
zcgit 912a52a677 a potential bug in ScrollView 
check _touches in setTouchEnabled
 2013-06-21 18:00:56 +08:00
samuele3hu e36c6f544a issue #2276: Modify ScrollView and LuaScrollView class 2013-06-21 14:17:41 +08:00
samuele3hu 35f0b07aa6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 11:16:46 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
samuele3hu a862543a4c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 10:44:03 +08:00
James Chen 2a715ec3cf Merge pull request #2956 from ricardoquesada/cc_namespace_obj 
issue #2129: Re-adds 'CC' prefix to objective-c classes.
 2013-06-20 19:10:01 -07:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
Sam Clegg 3686e8245f [NaCl] Fix sigslot.h compilation on NaCl ARM 2013-06-20 10:54:11 -07:00
samuele3hu 71fe43ee97 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-20 22:40:21 +08:00
samuele3hu 15c69563e2 issue #2276: Add ScrollView lua binding and test sample 2013-06-20 22:39:30 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen cb67ed0227 issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
James Chen e281fdfa73 issue #2129: Renaming EditBoxImplIOS to EditBoxImplIOS_objc since it will be conflict with CCEditBoxImplIOS after removing CC prefix. 2013-06-20 13:07:09 +08:00
James Chen 78a5dff06d issue #2129: Resetting the namespace of armature to 'cocos2d::extension::armature'. 2013-06-20 12:59:32 +08:00
James Chen 1ea7fd2594 Merge pull request #2904 from edwardzhou/master 
closed #2312: WebSocket url parse error for 'ws://domain.com/websocket' pattern
 2013-06-19 05:04:11 -07:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
Ricardo Quesada 159ef1ec68 clone() doesn't use copy constructor 
... and other bug fixes
 2013-06-18 15:06:53 -07:00
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 2013-06-18 09:59:34 -07:00
James Chen 2c0cc603d1 Merge branch 'master' into develop 
Conflicts:
	extensions/cocos-ext.h
 2013-06-18 10:46:25 +08:00
Edward Zhou 53be008dcf fix url parse error for 'ws://domain.com/websocket' pattern 2013-06-17 18:28:12 +08:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet. 
Many methods not implemented yet.
 2013-06-15 18:54:34 -07:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Ricardo Quesada e40adb7ae7 EaseActions and more 
Added more reverse() const
 2013-06-15 12:38:32 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
yinkaile 57ada1fb36 1.Fix when first frame have no key frame, the armature don't display. 
2.Fix color change bug
 2013-06-15 10:16:32 +08:00
minggo 3543ee2ac3 issue #2284: add some files into extensions linux project 2013-06-14 14:55:46 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
sunzhuoshi edda79c703 Added config macro for "spine" extension 2013-06-12 14:12:43 +08:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada 83b43ab93e Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 
Handy macros for callbacks.
Instead of:
	std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
	CALLBACK_1(func_ptr, instance)

And also removes more warnings from the tests
 2013-06-11 16:30:05 -07:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
minggo bb583996d0 define and export LCC_ENABLE_CHIPMUNK_INTEGRATION for extensions anroid project 2013-06-10 22:19:59 +08:00
James Chen 6f01085a01 [emscripten] Updating extension makefile. 2013-06-10 20:53:33 +08:00
James Chen cbcc2022cf [Extension] RENDER_H --> CC_ARMATURE_GLES_RENDER_H 2013-06-10 14:17:16 +08:00
James Chen a14df8d28d issue #2271: Fixing some memory leaks. 2013-06-10 11:43:43 +08:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen 6dcaca78d0 [jsoncpp] Value::null -> Value::jsonNull to avoid conflict when compiling with clang++ or high version of gcc since null is defined as a key word. 2013-06-09 18:56:22 +08:00
James Chen 920418c21f Crash fix in CCControlColurPickerTest. 2013-06-09 16:38:37 +08:00
James Chen 1cc8f94ec7 Crash fix in CCControlColurPickerTest. 2013-06-09 16:37:15 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
James Chen 13dd26c85b [BB] Fixing compilation errors for CocoStudio runtime. 2013-06-09 15:29:51 +08:00
minggo 1a0789cd11 issue #2271: fixed memory leak of WebSocket 2013-06-09 15:08:10 +08:00
minggo c4ab295846 issue #2271: fixed memory leak of CCControlColorPicker 2013-06-09 15:07:58 +08:00
minggo 7a1175601e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-09 14:51:57 +08:00
minggo 81b579c032 issue #2271: fixed memory leak of WebSocket 2013-06-09 14:50:51 +08:00
minggo f00baac00d issue #2271: fixed memory leak of CCControlColorPicker 2013-06-09 14:36:16 +08:00
yinkaile e7d5ac3211 Fix collider detection 2013-06-09 13:34:48 +08:00
James Chen 3067b71ea2 fixed #2270: Adding Armature(CocoStudio runtime) support. Enabling exceptions for marmalade. 2013-06-09 10:54:55 +08:00
James Chen 56f5e9ca32 Changing namespace Json to CSJson to avoid conflicts. 2013-06-09 10:50:03 +08:00
yinkaile af819c6db5 Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x 2013-06-08 22:09:34 +08:00
yinkaile d29931dc4f 1.add hd resource 
2.remove zobie resource
3.support frame event
 2013-06-08 22:08:22 +08:00
James Chen 646d0aa1cf [LINUX] Fix a compilation error in spine/extension.cpp. 2013-06-08 17:22:49 +08:00
James Chen ab15cd8c7b [CCArmature] Updating CCDatas.h. Why to name it 'CCDatas.h" ????? 2013-06-08 16:45:25 +08:00
James Chen aec713ac4e [CCArmature] Ignoring a warning of 'delete-non-virtual-dtor' for linux build. 2013-06-08 16:44:37 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
James Chen d3253dd161 Fixing compilation errors for native client port. 2013-06-08 15:28:58 +08:00
yinkaile f2021982f4 Change CCAnimation to CCArmatureAnimation 2013-06-08 11:16:17 +08:00
James Chen 5c8d4378a6 Fixing compilation errors in TestLua for Win32. 2013-06-07 21:23:15 +08:00
yinkaile a959c621f2 Standardize code 2013-06-07 21:00:45 +08:00
yinkaile 1be7827d03 Standardize code 2013-06-07 20:54:35 +08:00
yinkaile d66a3870d4 Standardize code 2013-06-07 20:07:01 +08:00
yinkaile 718a8e763e Standardize code 2013-06-07 19:57:15 +08:00
yinkaile a10d0734f2 Standardize code 2013-06-07 19:48:31 +08:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
yinkaile ba09c20434 Standardize code 2013-06-07 18:50:35 +08:00
James Chen 43e8573d8b Merge pull request #2807 from dumganhar/master 
[BB] Updating project configuration.
 2013-06-07 03:49:10 -07:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
yinkaile 6a6245eefd Standardize code 2013-06-07 18:29:47 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
yinkaile 850ea39107 Standardize code 2013-06-07 17:10:53 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
yinkaile e1e41f7124 move const value to CCDataReaderHelper.cpp 2013-06-07 14:47:08 +08:00
yinkaile d4116f8478 1.remove #pragma endregion 
2.change str.compare("")==0 to str.length()==0
 2013-06-07 14:01:03 +08:00
James Chen ec8ab8bd8b Updating multi-platform-xxx template for win32. 2013-06-07 12:57:28 +08:00
samuele3hu f58d0a04aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 12:57:04 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
samuele3hu 5986d3904d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 10:14:12 +08:00
samuele3hu 66d4acc31a issue #2103 add webSocket lua test sample 2013-06-07 10:12:01 +08:00
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +08:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
Rene Klacan 8b16178f9f Merge pull request from cocos2d/develop 2013-06-06 09:42:18 +02:00
James Chen a539f69d63 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 15:02:57 +08:00
James Chen 9a26376b1f Adding libwebsockets license in WebSocket.h/.cpp. 2013-06-06 15:02:57 +08:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
James Chen 93597a5858 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 14:22:51 +08:00
James Chen f056757a9f Adding libwebsockets license in WebSocket.h/.cpp. 2013-06-06 14:16:57 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
 2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
minggo 3713ff5b71 Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder 
add cocosbuilder lua test sample
 2013-06-05 01:38:57 -07:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const". 
2.  dolete license.
 2013-06-05 15:05:49 +08:00
James Chen 47c8205e39 issue #2143: Adding CCEditBox::getDelegate. 2013-06-05 14:55:13 +08:00
James Chen 57fee8dc98 issue #2143: Adding CCEditBox::getDelegate. 2013-06-05 14:30:14 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
sunxiaoyu d41a78453a Update CCEditBoxImplIOS.mm 
02c6647306
 2013-06-04 17:16:45 +08:00
James Chen 7b98808aa7 Merge pull request #2640 from sunxiaoyu/patch-1 
fixed #2253: Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
 2013-06-04 02:08:42 -07:00
James Chen 1e04c4e743 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:09:20 +08:00
James Chen 37df435089 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:05:27 +08:00
flaming0 1d3516da44 Update for spine runtime. 2013-06-04 14:47:19 +08:00
flamingo a81f2b1303 Update Android.mk 2013-06-04 14:47:10 +08:00
flamingo 66943ee667 Update Makefile 
For nacl (spine runtime)
 2013-06-04 14:47:02 +08:00
flamingo b806376671 Update Android.mk 2013-06-04 14:46:55 +08:00
flaming0 39ce9b4813 Update spine runtime 2013-06-04 14:46:46 +08:00
flaming0 3daf21996c Update for spine runtime 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 14:46:31 +08:00
James Chen 5d89a0cd0c Merge branch 'develop' into update-spine-runtime-develop 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 13:46:05 +08:00
flaming0 92b1da1fce Merge remote-tracking branch 'refs/remotes/origin/patch-spine' into patch-spine 2013-06-03 20:53:17 +04:00
flaming0 a6c2ad0666 Update for spine runtime. 2013-06-03 20:52:32 +04:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
James Chen f2f0f031c7 fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 09:55:43 +08:00
flamingo 6f0f53cf84 Update Android.mk 2013-06-02 20:42:48 +04:00
flamingo 6d7e4f5229 Update Makefile 
For nacl (spine runtime)
 2013-06-02 20:19:12 +04:00
flamingo f6495a64fb Update Android.mk 2013-06-02 20:18:27 +04:00
flaming0 b87a89eaa4 Update spine runtime 2013-06-02 19:59:13 +04:00
flaming0 5f1a4a4be7 Update for spine runtime 2013-06-02 18:26:46 +04:00
James Chen 4b8f76c903 WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-02 18:56:49 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-02 18:55:57 +08:00
Sergey Shambir 984ed75b9a Linux: added project part for QtCreator. 
Allows easily setup cocos2d on Linux in QtCreator IDE.
 2013-06-02 10:15:14 +04:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
minggo 1ff88de561 Merge pull request #2666 from jotel/ccdata-in-userdefault 
Ability to save/retrieve CCData into/from CCUserDefault
 2013-05-29 19:40:23 -07:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
Lee, Jae-Hong c20e4f3700 Keep a previous text on Tizen CCEditBox. 2013-05-28 20:43:47 +09:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
sunxiaoyu cc7e858fe1 Update CCEditBoxImplIOS.mm 
02c6647306
 2013-05-24 18:10:04 +08:00
samuele3hu 8b5450ef4a issue #2103 modify some build script 2013-05-24 13:55:05 +08:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
James Chen acef98a350 Merge pull request #2572 from pyrasis/tizen 
fixed #2185: Cocos2d-x Tizen support.
 2013-05-20 20:08:28 -07:00
Lee, Jae-Hong f4340475a1 Insert spine directory. 2013-05-21 10:33:08 +09:00
Lee, Jae-Hong 73590e57f6 Set relative include path. 2013-05-21 09:55:33 +09:00
James Chen 9e9b9ca831 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest 2013-05-20 20:55:29 +08:00
James Chen ad340f0a32 fixed #2092: Make some function static. 2013-05-20 18:11:55 +08:00
James Chen af655ce965 fixed #2092: #define httpresponse_selector(_SELECTOR) (SEL_HttpResponse)(&_SELECTOR) --> #define httpresponse_selector(_SELECTOR) (cocos2d::extension::SEL_HttpResponse)(&_SELECTOR). 2013-05-20 17:48:21 +08:00
minggo 59a6635c7b issue #1859:fix compiling error of AssetsManager.cpp 2013-05-17 09:47:31 +08:00
Lee, Jae-Hong b6d52a133f Update extensions project. 2013-05-16 20:24:54 +09:00
Lee, Jae-Hong 55808e22c0 Remove include path in libcurl. 
Replace \ to / in include path.
 2013-05-16 20:15:36 +09:00
Lee, Jae-Hong 09a0eec90a Enable chipmunk. 2013-05-16 20:14:03 +09:00
Lee, Jae-Hong 1419df3d14 Enable Box2D. 2013-05-16 20:13:27 +09:00
Lee, Jae-Hong 67c898d308 Set output filename. 2013-05-16 20:12:53 +09:00
Lee, Jae-Hong 38ce48be0b Adding placeholder.txt for extensions/proj.tizen/src 2013-05-16 20:12:07 +09:00
Lee, Jae-Hong 8ed243463e Adding CCEditBoxImplTizen.h and cpp. 2013-05-16 20:05:46 +09:00
Lee, Jae-Hong 579fd4dd2b Adding extensions project for tizen. 2013-05-16 20:03:31 +09:00
Carsten Sandtner 2b2d7cb665 Merge branch 'master' into XMLHttpRequest_Demo 
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
  Update AUTHORS
  Update AUTHORS
  fixed #2155 : Resolve the bug of callback methods in plugin.
  Update AUTHORS
  fix a warning caused by member variables initialization order in constructor
  it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
  initWithStringShadowStroke() renamed to initWithString()
  comment fixed
  fix alignent problem when rendering text with shadow
  fix a problem with float stroke size
  Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
  CCLabelTTF C++ test fixed
  new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
  initWithStringAndTextDefinition() changed method's signature
  no more bingins for ccTextDefinition
  class renamed and moved to ccTypes.h
  CCTextDefinition is passed now by pointers
  bindings for CCTextDefinition
  ccTextDefinition becomes CCTextDefinition
  changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
  ...
 2013-05-16 10:12:19 +02:00
minggo 5f57ec2d1b Merge pull request #2207 from csy1988525/master 
fixed a bug when button's parent is hided, the button still can responce to clicked event
 2013-05-15 23:44:25 -07:00
minggo 1a947ce1cd Merge pull request #2567 from minggo/AssetsManager-asynchronization 
Make AssetsManager download resources in a new thread
 2013-05-15 20:24:05 -07:00
minggo 7bccb8b62a issue #1859:remove unneeded code 2013-05-15 17:14:51 +08:00
minggo d8a0b0c130 issue #1859:download resources in a new thread 2013-05-15 17:09:28 +08:00
Carsten Sandtner b74f1fb161 Merge branch 'master' into XMLHttpRequest_cchttpclient 
# By James Chen (23) and others
# Via James Chen (19) and others
* master: (57 commits)
  Update AUTHORS [ci skip]
  fixed #2151: Commenting a log in CCFileUtils::fullPathForFilename.
  Update AUTHORS [ci skip].
  fixed #2105: Refactoring travis build script.
  Assert statement modifies 'mType'.
  fixed #2151: Custom font can't be loaded correctly if using full path of filename.
  fixed #2150: Updating AUTHORS.
  fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite.
  fixed #2150: Updating ccb and ccbi files.
  Update AUTHORS
  fixed #2105: Updating the URL of 'Building Status' for travis.
  fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'.
  fixed #2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
  Update AUTHORS
  Update AUTHORS
  Update AUTHORS
  issue #2103 Add more lua test case(Replace encoding error)
  Added const to CCNode::getChildrenCount()
  Fix for wrong alignment using texture format sizes other than 4 bytes. For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
  issue #2103 Add more lua test case(Add  PerformanceSpriteTest of PerformanceTest)
  ...
 2013-05-13 17:02:17 +02:00
Carsten Sandtner 354a8408f6 Added getter and setter for raw header data 2013-05-13 16:57:07 +02:00
Alexander Markevich b7f4eea207 Assert statement modifies 'mType'. 2013-05-13 14:26:56 +03:00
James Chen dea45e8e79 fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite. 2013-05-13 17:57:30 +08:00
James Chen a8c95bc6f3 Merge branch 'fix_ccscale9sprite' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton 2013-05-13 16:24:59 +08:00
James Chen 68aa5318de Merge branch 'fix_cccontrolbutton' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton 2013-05-13 16:24:41 +08:00
James Chen c0a6f0c74f fixed #2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const". 2013-05-13 15:07:47 +08:00
dpull cec80e62ef fix Null pointer access 2013-05-08 15:53:54 +08:00
James Chen 7a472f7f5d Moving CC_DEPRECATED_ATTRIBUTE to the front of functions in HttpRequest.h 2013-05-08 11:32:09 +08:00
Rohan Kuruvilla b7aa71dcfc Fixing crash while trying to load sprite frame when the file is missing. Reports error instead 2013-05-07 14:53:41 -07:00
Rohan Kuruvilla 3d356d0a8f Removing setting ignoreAnchorPoint for child CCB files. Was causing a bug with positioning 2013-05-07 14:53:41 -07:00
Michael Fox d735835753 Fixing coloring in CCControlButtons by overriding the set/get color functions 2013-05-07 13:48:58 -07:00
Michael Fox f51506eed2 Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity 2013-05-07 12:02:32 -07:00
James Chen 912905054e fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods. 
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii

Conflicts:
	extensions/network/HttpClient.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
 2013-05-07 15:37:25 +08:00
minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate 
fix conflict of #2050
 2013-05-06 23:51:38 -07:00
James Chen a9aafdafac Merge pull request #2490 from coolengineer/pull-request-httpclient 
fixed #2119: Introduce HttpResponse callback selector type to resolve #2365, fixed version ;-)
 2013-05-06 23:44:20 -07:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
James Chen eaad4f52af Merge pull request #2495 from ptekchand/master 
fixed #2116: Support negative node scales of CCScrollView.
 2013-05-06 23:06:54 -07:00
James Gregory d529287cfa Remove LOG prefixes from emscripten makefiles 2013-05-06 21:00:38 -07:00
James Gregory 19f6c7978b More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
minggo 6f1eefea31 Merge pull request #2483 from Weeds/fix-HttpClient 
Fixed crash in HttpClient request on 64Bit
 2013-05-05 23:44:34 -07:00
Pranav Tekchand 0a996804fa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-30 21:06:18 +05:30
Pranav Tekchand 4360c3bff8 Support negative scaling of CCScrollView. 
Not checking for it in CCScrollView::getViewRect causes intersectsRect calls (eg: to check if the touch was within the bounds) to return false.
 2013-04-30 20:47:38 +05:30
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
minggo bb632f874b Merge pull request #2455 from FlowerpotGames/CCScrollView-TouchPriorityFix 
CCScrollView TouchPriority Fix
 2013-04-29 08:25:10 -07:00
minggo 489e684a0e Merge pull request #2443 from rodrigogolive/spine-fix 
Fixing broke linux build
 2013-04-29 08:01:39 -07:00
Hojin Choi a9ace2505e Introduce HttpResponse callback selector type. to resolve #2365 2013-04-28 03:55:58 +09:00
Andre Rudlaff 3bd67a47fa Fixed crash in HttpClient request on 64Bit 
According to the cURL documentation the pointer that should be passed
to curl_easy_getinfo with CURLINFO_RESPONSE_CODE must be a long
pointer,

On platforms where long is 64Bit this will cause a stack corruption
destroying the pointer to the original resonse as the current response
code variable was a 32 Bit int value.

See: http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html
 2013-04-27 17:55:07 +02:00
minggo cb8f069ae6 Merge pull request #2466 from Weeds/fix-loadAsyncImage 
don't use named semaphore for syncing image loading thread
 2013-04-27 08:47:48 -07:00
Andre Rudlaff 43615fe0a7 don't use named semaphore in HttpClient 
this patch removes using named semaphores for Http requests.
This also destroys the mutexes from CCTextureCache when the thread is
destroyed
 2013-04-27 17:44:33 +02:00
James Chen 9739477881 A fix of include file. 2013-04-27 14:41:58 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
Rodrigo Goncalves de Oliveira 6f994b16cf Fixing broke linux build 
The spine code building on Linux stops when checking that some variables
can be used when not initialized. This commit fixes it.

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
 2013-04-25 09:36:23 -04:00
Ed Bartley c7222c2b14 CCScrollView should set the TouchPriority from the CCLayer, thus allowing the developer to set a custom TouchPriority with a call to setTouchPriority(…); 2013-04-25 09:30:24 -04:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support 
fixed #2075: Adding spine editor support.
 2013-04-24 01:12:23 -07:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 6b4420e7ec issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
James Chen 7755b025ee Adding spine/spine-cocos2dx.h to cocos-ext.h. 2013-04-24 14:36:11 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
James Chen 685fe16e10 fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually 2013-04-23 10:39:59 +08:00
Sergey Shambir 8507f7a386 network: Added PUT and DELETE request types 2013-04-21 20:54:52 +04:00
Sergey Shambir 270eeb4d9a Refactored and fixed almost impossible memory leak. 
Previously curl_slist_free_all(cHeaders) called in loop after
many break statements, so there was no garantue that it will be called
in all cases.

This change also simplifies code to make implementing PUT/DELETE methods
easier.
 2013-04-21 18:58:35 +04:00
Andrew Goulding 98a7b9636d Added CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK 
We've found it useful to use CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK in
situations where we don't want CCObject derived pointers retained. It's
also useful if you want to assign a pointer dynamically cast to an
abstract base class such as CCLabelProtocol.
 2013-04-19 08:06:25 +10:00
minggo 18a345071a Merge pull request #2375 from billy1380/master 
fix for issue #2366
 2013-04-17 01:48:34 -07:00
James Chen 1eb79530c6 fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, 
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
 2013-04-17 12:49:25 +08:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
billy1380 16b9506690 fixed a bug that was causing http client to fail on mac os x with 
semaphore error
 2013-04-15 22:49:29 +01:00
Sam Clegg ffb7360e46 Enable easy swithing between Box2D and chipmunk in linux and nacl 
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
 2013-04-15 07:35:50 -07:00
Sam Clegg 87f57d6ca6 Fix CCPhysicsSprite getPosition variants 
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.
 2013-04-15 07:35:49 -07:00
James Chen 5b2196075a fixed #1876: CCScale9Sprite::setColor(...), setOpacity(...) are broken. 2013-04-15 16:37:35 +08:00
James Chen b7e16e9895 Fixed #2054: AnchorPoint property of CCScale9Sprite doesn't work in CCBReader. 
Invoking init method in CCScale9Sprite::create().
 2013-04-15 11:51:26 +08:00
James Chen b228a13218 Merge branch 'patch-1' of https://github.com/zhanghaojie/cocos2d-x into iss2054-s9sp-anchorpoint-ccb 2013-04-15 11:45:59 +08:00
James Chen a5d78830db fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile. 2013-04-15 10:39:44 +08:00
James Chen a1568d1f74 fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'. 2013-04-15 10:18:35 +08:00
James Chen 6c15c75c78 fixed #1862: CCScrollView::setContainer may cause dangling pointer when NULL is passed into. 2013-04-15 09:52:46 +08:00
James Chen 17599174ad Fixing an issue of out of bound in CCTableView.cpp. 2013-04-14 11:05:03 +08:00
James Chen fb0794bef6 fixed #2048: Fixing compilation errors on linux. 2013-04-10 17:13:19 +08:00
James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master 2013-04-10 16:07:54 +08:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog 
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
 2013-04-10 14:17:23 +08:00
James Chen 9c563a883f Fixing a typo. 2013-04-09 18:08:43 +08:00
harikrishnar 24c9668a1b Added a getter to get the size of the data 
Added a getter to get the size of the data
 2013-04-09 00:28:50 +05:30
harikrishnar cd37569729 CCControlButton responds even if its parent is invisible 
The Buttons should not respond if its invisble or if its made invisible
by any of its parent in the hierarchi
 2013-04-09 00:27:53 +05:30
James Chen d3eed7fd1f Merge pull request #2279 from sjchao/master 
fixed #2030: Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
 2013-04-07 23:55:55 -07:00
zhanghaojie 4c67fd979e fix property anchorPoint of CCScale9Sprite 
fix property anchorPoint of CCScale9Sprite doesn't work in ccb. Because initSpriteFrame method reset anchor point
 2013-04-05 23:58:23 +08:00
Sergej Tatarincev 1510354568 Support variable cell sizes in CCTableView 2013-04-04 17:57:43 +03:00
Sergej Tatarincev 17caacbeb5 Resize CCEditBox subviews when contentSize changes 
1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
 2013-04-02 16:34:33 +03:00
Sergej Tatarincev 380ec78fcd Allow to set EditBox font name and size separately 2013-04-02 16:31:30 +03:00
sjchao 4690a45f3e change a method name 
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
 2013-03-29 17:19:47 +08:00
tianTian 053efa0537 m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default. 2013-03-29 16:19:34 +08:00
sjchao f1f31deb98 Fix the display bug when a scrollView nested in another scrollView 2013-03-29 16:05:28 +08:00
tianTian 9144946176 Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used; 2013-03-23 12:18:00 +08:00
James Chen e2e9bc8ce0 Fixing memoryleaks. 2013-03-21 09:00:55 +08:00
James Chen 33fc16261b Updating blackberry project settings. 2013-03-20 18:34:28 +08:00
Rohan Kuruvilla 19b66049b3 Fixing issues with rotationX, rotationY in CCBuilderReader 2013-03-19 23:43:00 -07:00
Rohan Kuruvilla 54bb643ad3 Adding support for RotationX and RotationY to CCBReader 2013-03-19 23:42:59 -07:00
James Chen 37acbbe4fb Adding a space for target variable. 2013-03-20 10:44:21 +08:00
James Chen e5ef579cb3 Fixing compilation errors for linux. 2013-03-20 10:41:20 +08:00
whitegfx 6cb3f6bcc0 IOS, Added CCEditBoxImplIOS kEditBoxInputFlagSensitive settings. 
Added case to hide IOS autocorrection in kEditBoxInputFlagSensitive
mode.
 2013-03-19 20:00:35 +01:00
csy1988525 6b92c16bb0 Update CCControlButton.cpp 
fixed a bug when button's parent is hided, the button still can responce to clicked event
 2013-03-19 20:56:38 +08:00
James Chen a09d94fb6b Merge branch 'master' of https://github.com/dumganhar/cocos2d-x 2013-03-19 17:47:09 +08:00
James Chen aa5f7ffb6a Updating project setting of testcpp for Marmalade. 2013-03-19 17:46:49 +08:00
James Chen 4a9b07e0c4 Updating libExtensions.vcxproj. 2013-03-19 17:27:39 +08:00
James Chen 8b466f12a2 fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder. 2013-03-19 16:33:23 +08:00
Rohan Kuruvilla 80a268baf6 Fixing couple of bugs in reader that was checked into different branch 2013-03-18 23:20:14 -07:00
James Chen deb739f13b Merge pull request #2194 from rohankuruvilla/ccbreader 
fixed #1838: Latest CCBReader changes.
 2013-03-18 21:56:13 -07:00
minggo d9f47d2066 Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug 
fix cc scale9 sprite bug
 2013-03-18 18:37:17 -07:00
Rohan Kuruvilla c86e8376dc Adding dependency on CocosDenshion for CocosBuilderReader in Android makefile 2013-03-18 16:06:47 -07:00
Rohan Kuruvilla 8680d4dbfc Adding animation callback support for native classes 2013-03-18 16:06:47 -07:00
Rohan Kuruvilla 035c0d7eee Modifyign CCBSequence to do proper copy of objects 2013-03-18 16:06:47 -07:00
Rohan Kuruvilla 9acaaa289a Making the changes to support Sound, Callbacks and skew property in CCBReader 2013-03-18 16:06:46 -07:00
James Chen 1cbc796805 Fixing wrong display of CCEditbox on retina iOS device. 2013-03-18 23:14:20 +08:00
fins 3b6c46b478 fix crash in CCBReader::readFloat() 2013-03-16 23:47:58 +01:00
Sam Clegg 04c1a863a0 Remove tailing newlines from CCLog messaages. 
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
 2013-03-16 09:01:21 -07:00
James Chen 3e33868a63 fixed #1824: Exposed cc.EditBox to js. 2013-03-14 18:14:16 +08:00
James Chen 0a0796b572 fixed #1825: Fixing compilation errors for CCEditBox of win32 port. 2013-03-14 14:39:59 +08:00
James Chen edc02b5777 fixed #1825: The default color of text on CCEditBox is WHITE now. Fixed issues for CCEditBox of MAC port. 2013-03-14 14:29:22 +08:00
Neo Kim b2a78d9264 Comment out 'setVisible()' 2013-03-12 18:53:43 +09:00
Neo Kim ec8241058c Workaround for some problems due to UITextField of CCEditBoxImplIOS is attached as a view above OpenGL view. It has a topmost touch priority higher than any other CCNode objects, and also cannot be veiled by any other CCNode objects. 
In this change, UITextField is visible only when the CCEditBox is in edit mode. And in non-edit mode, UITextField is hidden and CCLabelTTF is shown instead with all same attributes at the same place.
 2013-03-12 18:23:12 +09:00
James Chen ca15cfb2b3 Merge pull request #2108 from csy1988525/master 
fixed #1821: The display result is wrong when invoking CCControlButton:: setHighlighted.
 2013-03-10 20:18:08 -07:00
Bite d7c7846274 fix CCScale9Sprite bugs when parsing rotated spriteframe from plist file that texture packer generate. 2013-03-09 16:23:24 +08:00
minggo d730c9749d Merge pull request #2117 from vipsbpig/master 
fixed CCControl::registerWithTouchDispatcher()
 2013-03-07 18:56:01 -08:00
vipsbpig ce14169f4d Update CCControl.cpp 2013-03-08 10:26:16 +08:00
vipsbpig 76e247fb9a fix CCControl::registerWithTouchDispatcher() 2013-03-08 10:25:09 +08:00
minggo b06380432b Merge pull request #2109 from youknowone/include 
Add missing <UIKit/UIKit.h> for UITextField
 2013-03-06 22:35:38 -08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds. 
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
 2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux. 
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
 2013-03-06 13:02:55 -08:00
Jeong YunWon bd9656bb08 Add missing <UIKit/UIKit.h> for UITextField 2013-03-06 21:22:43 +09:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
csy1988525 68c2219d33 Update CCControlButton.cpp 
fixed a bug that users can't set a button highlighted in the upper logic. also modify some coding format.
 2013-03-05 16:26:37 +08:00
James Chen 52feaad12f Merge pull request #2084 from young40/master 
fixed #1761: Implementing setVisible() for CCEditBox.
 2013-03-03 19:10:20 -08:00
young40 43e7917463 add setVisible() to CCEditBox [Win32] 2013-03-03 20:13:22 +08:00
young40 882a6761b6 add setVisible() to CCEditBox [Android] 2013-03-03 20:08:50 +08:00
young40 933d316dc4 add setVisible() to CCEditBox [ios & mac] 2013-03-03 18:58:51 +08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
 2013-02-28 13:01:45 +08:00
minggo 63e4091bfa fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
James Chen b17b1109a0 Merge pull request #2055 from dumganhar/iss1753-spidermonkey-19 
fixed #1753: Upgrading SpiderMonkey to Firefox19.0.
 2013-02-27 17:47:50 -08:00
James Chen 89398f9acf fixed #1754: Wrong offset of the container in CCTableView. 2013-02-27 17:52:50 +08:00
minggo 510c54ffb0 issue #1686:synchronize CCPhysicsSprite.cpp 2013-02-27 16:12:28 +08:00
minggo d4abc272c0 issue #1686:synchronize CCPhysicsSprite.cpp 2013-02-27 16:04:03 +08:00
James Chen 473e8e6139 issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok. 2013-02-27 15:16:49 +08:00
James Chen d572a53a1d Merge pull request #2050 from dumganhar/tableview-touch-fix 
fixed #1751: Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
 2013-02-26 06:56:08 -08:00
James Chen 87935ac436 tableview touch area fix. 2013-02-26 19:59:14 +08:00
minggo 5a1e16f105 Merge pull request #2048 from minggo/iss1489-AssetsManager 
add namespace to AssetsManager
 2013-02-26 00:45:06 -08:00
minggo e0991fbd67 fixed #1489:add namespace to AssetsManager 2013-02-26 16:43:46 +08:00
minggo a07f2b1e03 Merge pull request #2047 from minggo/iss1489-AssetsManager 
assets manager works ok
 2013-02-26 00:32:01 -08:00
minggo d35af7b6fe fixed #1489:sample works ok 2013-02-26 16:29:52 +08:00
James Chen efdb9180e4 fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode. 2013-02-26 11:16:26 +08:00
minggo 8713072c40 Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager 2013-02-26 10:29:37 +08:00
minggo eb79135aab issue #1489:clear version code before getting it 2013-02-26 10:29:31 +08:00
James Chen 0ece3056ee fixed #1749: Fixed compilation errors for win32. 2013-02-25 22:50:15 +08:00
James Chen 56797db85c fixed #1749: Mac platform works ok. 2013-02-25 22:33:16 +08:00
James Chen 5fafaa8b67 Merge branch 'master' of https://github.com/neokim/cocos2d-x 
Conflicts:
	scripting/javascript/bindings/generated
 2013-02-25 22:18:57 +08:00
minggo 6102e97fed Merge pull request #6 from dumganhar/iss1489-AssetsManager 
Adds AssetsManager support for win32.
 2013-02-25 02:38:41 -08:00
James Chen 2eab8f75d4 Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager 2013-02-25 18:09:05 +08:00
James Chen 17d9837b45 Adds AssetsManager support for win32. 2013-02-25 18:03:38 +08:00
minggo 24584f04fb issue #1489:add some log 2013-02-25 17:50:32 +08:00
minggo 9b7712295b issue #1489:rename AssetsManagerProtocol to AssetsManagerDelegate 2013-02-25 15:02:21 +08:00
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
Neo Kim d42d847fb3 Added 'setPlaceholderFont()' to CCEditBox 2013-02-25 15:05:38 +09:00
minggo 32fbced31f issue #1489:modify sample code and add readme 2013-02-22 16:02:53 +08:00
minggo 91f5972b42 issue 1489:add AssetsManager 2013-02-22 11:04:09 +08:00
James Chen cf33a4538d fixed #1730: Binds CCScrollView and CCTableView to js. 2013-02-21 10:06:22 +08:00
Neo Kim 7da2dc953d Move height adjustment code from 'getRect' to 'keyboardWillShow' 2013-02-20 22:52:49 +09:00
Neo Kim a7c87f3b38 Add 'setFont' and 'setAnchorPoint' to CCEditBox 2013-02-20 22:41:08 +09:00
James Chen 60ab4c4886 issue #1733: Updated linux makefile. 2013-02-19 18:06:30 +08:00
James Chen a94aa15031 issue #1733: Adding extension project for linux. 2013-02-19 17:28:49 +08:00
hailong 2f0e10cd74 CCBReader error with generated animations 
synchronous with cocos2d-iPhone
 2013-02-19 12:27:39 +08:00
James Chen 9c906bbe30 fixed #1712: fix an issue of lacking table view cells after touch ended. 2013-02-18 09:45:01 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
James Chen 0a9a952edc fixed #1711: Wrong clipping rectangle of CCScrollView when the scale of its ancestors isn't equal to 1. 2013-02-16 14:18:13 +08:00
James Chen 36e5da29b0 Merge branch 'master' of https://github.com/ztoky/cocos2d-x into ztoky-master 2013-02-16 13:48:35 +08:00
Heewon Song 10375ae660 Fix for CCScrollView clipping bug 
fix : wrong cliping rect when ancestors scale is not 1
 2013-02-14 18:43:27 +09:00
folecr b204e97ad2 Simpler, correct handling of spritesheet sources 
* bounds of insets are calculated relative to sprite
 * transformations are then applied to get the texture coordinates
 * handle sprites stored rotated in a spritesheet correctly
 2013-02-11 13:26:40 -08:00
James Chen 7e136b67a6 Merge pull request #1966 from fape/marmalade_cosmetics 
Marmalade cosmetics
 2013-02-06 19:21:46 -08:00
Darragh Coy 5902de93ce Committing a fix for a potential unaligned memory access crash in CCBReader::readFloat(), 
caused by incorrect compiler optimisations/assumptions surrounding the use of memcpy().
 2013-02-06 14:44:15 -08:00
fape 2f5db30332 add missing defines doc file to marmalade project file 2013-02-06 14:51:10 +01:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
xyhl515 3316f8c961 Update extensions/GUI/CCControlExtension/CCControlSwitch.cpp 
implement setOn(isOn,false)
 2013-01-31 22:12:37 +08:00
James Chen 157e229f8c fixed #1634: Added the very first implementation of CCEditBox for Win32. 2013-01-31 14:04:49 +08:00
James Chen 3bdfb82e9c Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox 
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
 2013-01-30 22:31:19 +08:00
James Chen ef131beed1 Merge pull request #1885 from dumganhar/refactor-ccfileutils 
issue #1683 :Refactoring CCFileUtils.TO BE DONE: 
Making the api of CCFileUtils more c++ friendly.
 2013-01-25 05:55:10 -08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
minggo f8c4a5638d Merge pull request #1888 from folecr/s9sprite 
Fix some bugs in CCScale9Sprite
 2013-01-25 02:14:59 -08:00
James Chen 6a31f4edaf Fixed a logical error in CCNodeLoader.cpp. 2013-01-25 11:04:41 +08:00
folecr dcda7ad240 Use instances only if valid 2013-01-24 15:43:59 -08:00
folecr 3f41b361d3 CCScale9Sprite : handles default modes correctly. Bugs when the source is a sprite that is stored rotated in a spritesheet. 2013-01-23 16:42:14 -08:00
Ed Bartley 39a39fb9f4 CCTableView: Added a delegate method to inform the implementor that a cell as about to be recycled. CCTableView no longer crashes if a CCTableViewDelegate is not provided. 2013-01-23 14:04:49 -05:00
James Chen 9042e814ff Merge pull request #1883 from dumganhar/iss-ccb-leak 
fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode.
 2013-01-22 23:23:55 -08:00
James Chen 37f91c5c1d Comment the unneeded codes. 2013-01-23 15:18:13 +08:00
James Chen 83ea9e5e2c fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode. 2013-01-23 15:14:40 +08:00
James Chen 1eecf7fbb6 Merge pull request #1874 from MarcelBloemendaal/master 
fixed #1674: Calling wrong initializer in CCScale9Sprite.
 2013-01-22 00:01:54 -08:00
James Chen c5214dd485 Updated the comments for CCBMemberVariableAssigner. 2013-01-22 15:10:30 +08:00
James Chen 0187bb6504 Merge pull request #1876 from dumganhar/iss1639-custom-property 
fixed #1639: Added custom property support for CCBReader.
 2013-01-21 23:03:53 -08:00
Marcel Bloemendaal 696ea07495 Fixed CCScale9Sprite::create(caInsets, file); 
Fixed calling of wrong initializer in CCScale9Sprite, the create(CCRect
capInsets, const char* file). It used to call initWithFile(file,
capInsets), but this is the initializer for a file and a frame rect.
The initializer with capInsets has the capInsets rect as the first
argument. This caused unexpected behaviour.
 2013-01-21 14:55:45 +01:00
James Chen a470489f7c fixed #1639: The target of Custom property needs to be self. 2013-01-21 21:09:03 +08:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
James Chen 4a68e4ab89 fixed #1670: Fixed memory leak in CCBReader. 2013-01-21 14:40:29 +08:00
James Chen 0c10eff039 Merge branch 'gles20' of https://github.com/tiantian20007/cocos2d-x into pr1757 2013-01-21 11:33:47 +08:00
minggo 4baf92760b fixed #1639:add CCBEaseInstant 2013-01-21 11:18:06 +08:00
James Chen 571d86d51d fixed #1553: fixed a memory leak in CCControlButton. 2013-01-21 10:16:07 +08:00
James Chen e761856b4d Added restriction marco `CC_TARGET_PLATFORM == CC_PLATFORM_MAC` for CCEditBox of MAC port. 
This can avoid compilation errors if other platforms include these files.
 2013-01-15 15:11:20 +08:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
Jozef Prídavok 9889b4f9fd Added the very first implementation of CCEditBox for Win32. 2013-01-10 23:59:21 +01:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +01:00
Jozef Prídavok 4f2f5a3c8f Added EditBox implementation for Mac OSX. 2013-01-09 15:09:57 +01:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen 774e9dcc23 Merge pull request #1823 from dumganhar/iss1620-sys-localstorage 
fixed #1620: Using sqlite3 to implement sys.LocalStorage.
 2013-01-07 02:30:26 -08:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 43b95f2a9a fixed #1620: Check return value. 2013-01-07 17:38:52 +08:00
James Chen 1d59a36ee9 fixed #1620: Invoking localStorageFree in the destructor of ScriptingCore. Added header file to cocos-ext.h 2013-01-07 17:34:22 +08:00
James Chen 3fa771f0c4 fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
minggo ba896f7588 Merge pull request #1821 from minggo/iss1639_CCBReader 
issue #1639:set visible to correct value
 2013-01-05 23:05:02 -08:00
James Chen 1882ca30f5 issue #1620: Binding sqlite3 to sys.localStorage. And updated win32 project configuration. 2013-01-06 14:42:24 +08:00
James Chen 3822ceee8c issue #1620: Renamed LocalStorage.c to LocalStorage.cpp 2013-01-06 14:40:54 +08:00
James Chen dc1490c8ae issue #1620: Added LocalStorage support to extensions. 2013-01-06 11:57:10 +08:00
minggo 7a1f445bff issue #1639:set visible to correct value 2013-01-05 18:35:11 +08:00
James Chen 421cf31b34 issue #1640: Updated jsbinding for CCPhysicsSprite . 2013-01-05 15:09:19 +08:00
James Chen 9ef74bef80 fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. 
Added platform macro for CCEditBoxImpl* files.
 2013-01-05 11:10:24 +08:00
James Chen 7bcbcfa187 fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp. 2013-01-05 10:56:57 +08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
tiantian dc49561357 Fix crash for call runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed; Set mRunningSequence to NULL before any runAnimation() call; 2012-12-13 13:21:58 +08:00
minggo d5533fcf15 fix a type information in CCBAnimationManager 2012-12-10 11:30:07 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
James Chen c1eded787a Merge pull request #1724 from FlowerpotGames/gles20 
fixed #1599: CCScrollView and CCTableView updates.
 2012-12-05 18:28:30 -08:00
Ed Bartley 73239a07e0 * Fixed improper behavior of horizontally scrolling ScrollView 2012-12-05 09:55:06 -05:00
Ed Bartley 3ed97165a5 * Add documentation to CCTableViewDelegate methods. 2012-12-04 15:46:27 -05:00
Ed Bartley 9f04817235 * CCScrollView did not scroll correctly if the container items do not fill the ScrollView. The issue can be observed by modifying TableViewTestLayer::numberOfCellsInTableView(…) in the ExtensionsTest/TableViewTest project from 20 cells to 2 cells. 2012-12-04 15:32:13 -05:00
minggo 58a187f774 do some bug fixes 2012-12-04 18:44:32 +08:00
James Chen 478791a472 Added CCBReader::setCCBRootPath. 2012-12-03 18:27:50 +08:00
James Chen 0333981c94 Suffix check. 2012-11-30 14:16:38 +08:00
James Chen 23629b8187 Made all projects compiled ok on Blackberry port. 2012-11-30 12:40:47 +08:00
James Chen d27ab38be9 fixed some warning and make win32 release version compiled ok. 2012-11-29 18:04:33 +08:00
James Chen 10195d0215 fixed #1582: A logic bug in CCBAnimationManager::setAnimatedProperty. 2012-11-29 11:07:06 +08:00
James Chen 95ccf17739 Bind some functions for js: 
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
    void runAnimationsForSequenceNamed(const char *pName);
    void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
 2012-11-28 11:49:20 +08:00
James Chen 342c7bc724 Merge pull request #1657 from fape/cocos_extensions_marmalade 
fixed #1578: Create cocos2dx-ext marmalade project.
 2012-11-26 19:15:06 -08:00
James Chen de8be8561e minor fix for a comment. 2012-11-27 11:05:52 +08:00
James Chen 8d55abd432 fix touch event lost on Win32, the reason is that: 
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
 2012-11-27 11:03:12 +08:00
James Chen 9bd3014137 Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp. 2012-11-27 10:26:40 +08:00
fape 1843d576d8 create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
James Chen e0948a4817 fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes. 2012-11-26 21:51:05 +08:00
minggo 69f6b3970a Merge pull request #1647 from guanqun/fix-doxygen 
Fix doxygen related errors and warnings
 2012-11-25 23:26:48 -08:00
minggo 832f9180b6 Merge pull request #1651 from minggo/gles20 
issue #1564:work ok on linux
 2012-11-25 19:50:36 -08:00
minggo 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
Lu Guanqun 0f2d8f8c6b fix the doxygen warnings 
cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
  parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
  parameter 'value'
 2012-11-25 23:27:29 +08:00
James Chen 7c1e860d78 issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32. 2012-11-23 15:09:03 +08:00
Rohan Kuruvilla 36bbd80b68 Adding changes to CCBreader 2012-11-23 15:08:55 +08:00
James Chen b66bc98a46 issue #1564: Made ChipmunkTest of TestJavascript works 2012-11-22 15:19:16 +08:00
James Chen 89a51433b8 issue #1564: Make TestJavascript works on windows. 2012-11-22 10:24:26 +08:00
James Chen add23eecda issue #1564: Adding missing setter and getter function. 2012-11-22 09:55:43 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
James Chen e8cf71407d issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:27:47 +08:00
James Chen 0d0234de2a issue #1564: Updated Project configurations for android and win32 since physics_nodes was moved to Extension folder. 2012-11-20 16:22:14 +08:00
James Chen 8a21d4e824 issue #1564: Moved physics_node to extension. 2012-11-20 16:17:20 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo cb2bc37513 issue #1555: make tests work 2012-11-15 18:34:23 +08:00
Ed Bartley 63b20ae7ea Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-11-14 11:06:18 -05:00
minggo 4efdbca23b fixed #1545:remove the usage of CREATE_FUNC 2012-11-08 10:41:14 +08:00
Ed Bartley 079ab91ca5 Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-11-02 20:45:46 -04:00
Ed Bartley 4ec9793769 TableView updates to provide more touch input to CCTableViewDelegate 2012-11-02 20:26:43 -04:00
Rohan Kuruvilla 09248f3667 Updating CCBReader to latest version from cocos2d-iphone. Includes support for script callbacks 2012-11-01 17:52:07 -07:00
Rohan Kuruvilla 89e40a2c98 Adding support for animationCompletedJSCallback in CCBReader 2012-11-01 00:08:00 -07:00
Rohan Kuruvilla a9473f1e8a Changing mAnimationManagers and bringing CCBReader implementation closer to cocos2d-iphone CCBReader 2012-11-01 00:07:34 -07:00
Rohan Kuruvilla dc51a78981 Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings 2012-11-01 00:06:24 -07:00
James Chen 1a512488fa fixed #1538: Logic error in CCControlHuePicker::checkSliderPosition. 
The distance between current location and center should compare with radius rather than dimension.
 2012-10-31 14:32:24 +08:00
James Chen 6f2364b769 Merge pull request #1520 from FlowerpotGames/gles20 
fixed #1536: CCControl* should not respond to touches if the control is not visible.
 2012-10-30 18:54:05 -07:00
Ed Bartley f424da2a7e * CCControl* should not respond to touches if the control is not visible. 2012-10-30 11:10:05 -04:00
minggo a09367ca7e Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix 
Fix for correct unscheduling and instance destruction
 2012-10-25 02:05:34 -07:00
Sergey Buravtsov 0b381357b0 Fix for correct unscheduling and instance destruction 2012-10-24 03:33:17 +04:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
James Chen fb657f674d fixed #1510: Application will freeze when 'numberOfCellsInTableView' returns zero. 2012-10-16 11:31:04 +08:00
James Chen a65f13defe issue #1486: Fix bugs for CCEditBox iOS port. 2012-10-15 13:01:36 +08:00
James Chen 0e76827b7e issue #1486: Commenting one line to avoid something like mosaic in 'CCControlExtensionTest', especially the display of 'huePickerBackground.png' when in 800*480 window size with 480*320 design resolution and hd(960*640) resources. 2012-10-14 22:03:23 +08:00
johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
Walzer f1d9629404 Merge pull request #1361 from ncrothe/gles20 
add the capability to set custom http header to HttpClient
 2012-10-08 01:06:39 -07:00
James Chen cb2f3efc2c fixed #1495: CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world. 2012-10-08 14:12:34 +08:00
Donald Alan Morrison f6b51c0a5f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-25 10:20:18 -07:00
Donald Alan Morrison a245199075 Jianhua Chen pointed out a semantic error in my "fix". Thanks James! 
The Static Analyzer doesn't search for this semantic error, even though it is common.
 2012-09-25 10:13:49 -07:00
James Chen d91d7c8317 issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
James Chen 83fe21b4f4 issue #1483: Removed a comment. 2012-09-25 17:03:29 +08:00
James Chen f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
Donald Alan Morrison 8693c54997 Minor memory-logic error. textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it. Also, an init method called release outside the proper scope (the do{}while(0); block). 
If you don't like the autorelease pool, it's easy enough to change this fix.

Aside: someone pulled tools/cxx-generator again, not me(!) :-)
 2012-09-24 14:55:40 -07:00
minggo f17545a1ae fix a compile error 2012-09-24 15:26:18 +08:00
minggo 88952396e4 Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int 2012-09-24 15:16:30 +08:00
James Chen e4cee68688 Added libExtensions.lib for TestJavascript vs2010 project. 
Removed some calling of 'USING_NS_CC;' in extensions.
 2012-09-24 11:47:33 +08:00
James Chen a413496a1a Delete 'cocos2d::' since extension is the sub-namespace of cocos2d. 2012-09-24 11:08:10 +08:00
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
ncrothe b3f5a04ad4 Update extensions/network/HttpClient.cpp 
Added custom header capability to http wrapper (using curl features). This allows setting non-default content-type for POSTs.
 2012-09-22 17:52:04 +03:00
ncrothe 7b9c15176e Update extensions/network/HttpRequest.h 2012-09-22 17:45:02 +03:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
minggo 32de12e479 Merge pull request #1339 from rohankuruvilla/merge2 
JS Bindings improvements
 2012-09-20 19:38:49 -07:00
Walzer befaf686bb Merge pull request #1352 from sburavtsov/HttpClientFix-FOLLOW_LOCATION 
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
 2012-09-20 18:20:46 -07:00
Rohan Kuruvilla 100a7a1883 Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla 0fc7feb3f0 Updating CCBReader to support Scripting Owners 2012-09-20 14:45:34 -07:00
Sergey Buravtsov 5128f0e1a8 To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION 2012-09-20 19:51:04 +04:00
M.W. Park d042e8557d fixed CCSpriteLoader's flipX bug. 2012-09-20 12:47:45 +09:00
M.W. Park b4b9a1be2b fixed log output. 2012-09-20 12:32:37 +09:00
James Chen 9fabf3a45b fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0. 2012-09-19 18:41:50 +08:00
minggo 8cdf73640b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder 2012-09-19 18:08:17 +08:00
minggo 4bff6927b8 issue #1470:re-publish ccb 2012-09-19 17:43:11 +08:00
Ed Bartley 925c21cdde Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-09-18 18:42:41 -04:00
minggo 4bc5e9e415 issue #1470:fix more logical errors 2012-09-18 17:55:03 +08:00
minggo a0feb5f289 issue #1470:fix some logical errors 2012-09-18 17:04:10 +08:00
minggo 4b969e35c8 issue #1470:implement animation 2012-09-17 18:49:05 +08:00
minggo 0845e08fd3 issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0 2012-09-17 14:27:17 +08:00
johnangel fdec1ba4b9 Fixing include paths to be able to compile cocos2d-x using 
external Visual Studio solution, without copying all files
 2012-09-15 16:34:31 +02:00
Walzer 0cd3552ef7 fixed #1475, use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data 2012-09-10 23:17:16 +08:00
Ed Bartley c67412618d Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 
Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
 2012-09-10 10:50:30 -04:00
James Chen a6acd90c29 fixed #1458: Updated copyright information for some files which are relative to CCTableView. 2012-09-10 14:13:55 +08:00
James Chen 6f3ee0299a issue #1458: Updated vs2010 project configuration. 2012-09-10 14:05:44 +08:00
James Chen 1460f4e42f issue #1458: Updated project configuration for all platforms. 
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
 2012-09-10 13:39:12 +08:00
James Chen 554b1709c3 issue #1458: Adding CCScrollView::updateInset. 2012-09-09 22:46:31 +08:00
James Chen bf45edeed5 Reverted one line code. 2012-09-09 22:37:32 +08:00
James Chen 6719841b13 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into tableview-gles20 2012-09-09 22:34:53 +08:00
James Chen d9cc8fa346 issue #1458: Adding CCTableView support. Updated win32 project configuration. 2012-09-09 22:34:32 +08:00
Walzer 7c4ad685e5 add comment for a potential bug in HttpClient.cpp 2012-09-09 18:25:02 +08:00
ebartley 5deeb3f8fa Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors. 2012-09-07 15:00:21 -04:00
Ed Bartley 591d15c2a1 CCscrollView screenPos also needs to be adjusted by the scale in order to be used with Retina display. 2012-09-05 15:12:03 -04:00
ThePickleMan 0a96915da2 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:34 -05:00
ThePickleMan 423abc6f10 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Removed meaningless setter...the macro already makes one...
 2012-09-04 20:54:17 -05:00
ThePickleMan f6f370ffea Update extensions/GUI/CCControlExtension/CCControlSlider.h 
changed CC_SYNTHESIZE_READONLY to CC_SYNTHESIZE
 2012-09-04 20:48:04 -05:00
ThePickleMan a4d2d317b5 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 2012-09-03 09:46:55 -05:00
ThePickleMan da819e1109 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added default values for max/min allowed values
 2012-09-02 16:31:12 -05:00
ThePickleMan e07320f6a8 Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 
Added minimum/maximum allowed values
 2012-09-02 16:10:25 -05:00
ThePickleMan 82ea6fbb99 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Added fields and methods for setting the maximum allowed value.
 2012-09-02 16:08:13 -05:00
fish 847ccaff7d CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite. 2012-08-30 10:39:36 -04:00
minggo 0e81fd0568 fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/kazmath/src/ray2.c
 2012-08-25 00:00:27 -07:00
Donald Alan Morrison ee9f3d09a8 Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly 
converted to 64 bits.
 2012-08-24 09:22:02 -07:00
James Chen ee3e68014b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox 2012-08-24 00:16:11 +08:00
James Chen 1685e5c497 issue #1429: Used java code to implement keyboard layout. 2012-08-24 00:15:15 +08:00
James Chen a437099779 issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox. 2012-08-23 09:42:28 +08:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer 2012-08-21 16:57:41 +08:00
James Chen d918c8186f Update extensions/GUI/CCEditBox/CCEditBox.cpp 
Revert this file, uncomment some codes in 'initWithXXX'.
 2012-08-21 16:03:36 +08:00
minggo cfdc50fb60 issue #1437:make CCEGLView::sharedOpenGLView() return pointer 2012-08-21 14:58:31 +08:00
minggo 0231f65716 Merge pull request #1208 from minggo/iss1382_ccb_reader 
fixed #1382:safe retain mOwner to avoid crash caused by null pointer
 2012-08-20 20:23:03 -07:00
minggo 4db53b2f91 fixed #1382:safe return mOwner to avoid crash caused by null pointer 2012-08-20 15:54:53 +08:00
James Chen 6c9b4d3357 fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
James Chen f7fd4fc2bf issue #1429: Fixed a bug in EAGLView.mm. 2012-08-17 15:24:33 +08:00
James Chen d3338a70e5 issue #1429: Updated EditBoxTest and fix a bug about callback function. 2012-08-17 14:29:07 +08:00
James Chen 0fce637ec7 issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest. 2012-08-15 14:33:56 +08:00
James Chen 3ff21fe275 fixed #1424: http wrapper compiled ok on win32. 2012-08-09 17:04:55 +08:00
Walzer 9d6e37cf73 issue #1424, rename "Network" to "network" 2012-08-09 11:44:24 +08:00
Walzer d2cfdf1d2f change Network to Network-rename 2012-08-09 11:43:08 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
Walzer 9ee50bb59a issue #1424, add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website. 2012-08-08 12:05:02 +08:00
Walzer b094f70ab3 issue #1424, http-get works ok. Tomorrow I will focus on post. 2012-08-07 18:28:07 +08:00
qingyun b3206737e3 add group for CCHttpRequest.h 2012-08-04 18:30:05 +08:00
qingyun 24136dc575 add CCHttpRequest and related tests to repository 2012-08-04 18:27:27 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 0431cb455b fixed #1413, add CCTouch::getLocation(), getDelta() method 
return OpenGL coordinates directly, to make the usage more convenient.
 2012-07-31 17:41:53 +08:00
Walzer b8fa32dbc0 use extensions/GUI instead of extensions/UI 2012-07-30 22:57:59 +08:00
Walzer dfea09819f fixed #1409, sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton 
The cub & ccbi files in current test suit use "3" to stand for DISABLED state in CCControlButton, while CocosBuilder v2.0 generate "4" for it.
 2012-07-29 22:13:20 +08:00
Walzer 1411705de4 fixed #1408, CCBReader, CCMenuItemImage should be loaded when the target and selector are empty 2012-07-29 21:17:35 +08:00
mustime 1a55b7c5ba Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381 2012-07-27 18:29:57 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
James Chen 9a6729551c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399 2012-07-23 11:59:47 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08:00
minggo 5163b17a8a make CCBReaderTest work ok 2012-07-23 11:33:11 +08:00
James Chen acd4a5dc9d issue #1399: Updated build-win32.bat and libExtensions.vcproj. 2012-07-23 10:55:24 +08:00
James Chen b2b0a0c3d5 Updated ios project settings and updated some files in CCBReader folder. 2012-07-20 18:02:18 +08:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
Walzer 8bab593246 move extensions/NDControls to cocos2d-x-extensions repository 2011-06-22 14:54:45 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00