minggo
109adaf337
Merge pull request #4103 from luisparravicini/issue-2882
...
[ci skip]added | operator for Control::EventType
2013-11-07 18:59:33 -08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
Luis Parravicini
8b1d3af720
added | operator for Control::EventType
2013-11-05 23:55:24 -03:00
Victor Buldakov
bebd8c63ab
Merge branch 'develop' into fix-extensions-slider
2013-11-04 20:32:15 +04:00
Victor Buldakov
67cbd929e4
Merge branch 'develop' into fix-button-scale-to
2013-11-04 20:30:14 +04:00
Victor Buldakov
07215f1184
Add scale ratio to button touchdown
2013-11-04 17:17:01 +04:00
James Chen
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
James Chen
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
samuele3
790be0decc
issue #3037:Modify vs2012 config
2013-11-04 14:43:22 +08:00
Victor Buldakov
5213aa7bc9
fix cc
2013-11-04 01:27:16 +04:00
Victor Buldakov
20cb7a6cbc
Merge branch 'develop' into fix-extensions-slider
2013-11-04 01:23:36 +04:00
Victor Buldakov
550245c6dc
Add selected image to slider
2013-11-04 01:17:32 +04:00
James Chen
50c4261092
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 20:53:51 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
262b54eef2
issue #3069 : Updating ScrollView.
2013-10-25 16:06:52 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
James Chen
d8683ef705
Merge pull request #3988 from lite3/develop
...
closed #3060 : The Node's anchor point was changed after being added to ScrollView.
2013-10-24 03:01:49 -07:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
lite3
c6f9f0e406
do not change anchor point of child.
2013-10-22 11:30:53 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
Dhilan007
8fb0327597
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 14:57:33 +08:00
minggo
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
f3f24e3bbd
issue #2905:use - to connect multiple words
2013-10-12 13:54:16 +08:00
minggo
ad6325b0dd
fix conflicts
2013-10-12 11:31:32 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
James Chen
edcf9fecb4
[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.
2013-10-11 21:52:28 +08:00
James Chen
f05225ae4c
Merge pull request #3888 from ktaobo/avoid-copy
...
Avoid unnecessary object duplication using passing arguments by reference
2013-10-11 00:09:28 -07:00
Keita Obo
43c2001d71
Avoid unnecessary object duplication using passing arguments by reference
2013-10-10 22:06:10 +09:00
minggo
6e62be5443
issue #2905 : modify makefile to include correct header files
2013-10-10 17:39:53 +08:00
minggo
866906fd58
issue #2905:modify project settings to include correct audio path
2013-10-10 15:40:06 +08:00
rablwupei
5ea249a265
fix memory leak
2013-10-08 20:03:10 +08:00
Dhilan007
cafe930026
issues #2774:AssetsManager Test downloading progress label not sync with actual download.
2013-09-29 09:48:55 +08:00
CaiWenzhi
72f02f47a0
Modify version
2013-09-26 14:16:22 +08:00
CaiWenzhi
8a2cdf5a48
Modify wrong codes.
2013-09-25 19:04:37 +08:00
James Chen
3ffad35f0e
Merge pull request #3741 from signmotion/develop
...
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
CaiWenzhi
f4471ae93c
Modify layout enum
2013-09-23 21:26:44 +08:00
CaiWenzhi
be7c7a5f0b
Modify windows project.
2013-09-23 19:54:43 +08:00
CaiWenzhi
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
Michael Contento
f6dcf88685
Prevent nullptr access in AssetsManager
2013-09-23 12:05:22 +02:00
Liam
c4dfdbcb14
change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
2013-09-23 14:44:55 +08:00
Liam
082e28b631
fixed action node crash
2013-09-23 14:34:50 +08:00
signmotion
7d139a3bc3
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
2013-09-22 23:50:54 +03:00
Liam
e8cf0a1485
add judgment for retaining _actionSpawn
2013-09-22 23:55:12 +08:00
Liam
0840baa1ab
retan ActionNode _actionSpawn while create
2013-09-22 22:49:25 +08:00
minggo
261f0e4f05
rename some files
2013-09-21 14:40:54 +08:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
minggo
4c9771ba3c
rename some class names to obey cocos2d-x coding style
2013-09-20 19:19:31 +08:00
James Chen
c38dfb6a17
issue #2087 : Setting default touch priority to -1 for CCInputDelegate
2013-09-19 09:24:11 +08:00
James Chen
d7274b9475
issue #2087 : Should not use fixed priority with 0 value, it's for scene graph based priority.
2013-09-19 09:19:03 +08:00
James Chen
db98d662af
issue #2087 : Fixing crash of ComponentTest.
2013-09-19 09:15:56 +08:00
James Chen
3fbf61ad52
issue #2087 : Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes.
2013-09-19 09:14:51 +08:00
Liam
3515a4f286
limited action frame index
2013-09-18 16:36:16 +08:00
minggo
801b7831df
Merge pull request #3671 from chengstory/#4684
...
Remove unused files from mk files.
2013-09-17 22:08:38 -07:00
zhangcheng
820b8630dc
1. fixes failed to build linux.
2013-09-18 11:51:14 +08:00
zhangcheng
529d43544f
1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp.
2013-09-18 11:22:30 +08:00
zhangcheng
0708edb762
1. remove CocoStudio/GUI/Action *.cpp *.h
2013-09-17 23:45:53 +08:00
James Chen
f403f7d683
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-09-17 23:24:14 +08:00
James Chen
513237d5f6
Fixing armature test crash.
2013-09-17 23:03:33 +08:00
zhangcheng
c065dd2920
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 22:41:42 +08:00
zhangcheng
a1d2045793
1.rename cocoaction system files
2013-09-17 22:39:42 +08:00
CaiWenzhi
1f45bad5e7
Modify guy example
2013-09-17 21:19:04 +08:00
zhangcheng
ec401d1148
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 21:15:36 +08:00
zhangcheng
b86a8271d9
1. Upload Cocostudio Action.
2013-09-17 21:14:45 +08:00
CaiWenzhi
d9721a41dd
Merge branch 'develop' into Merge_GUI_to_Develop
2013-09-17 21:01:50 +08:00
James Chen
e3a34bd5c5
Merge pull request #3657 from 2youyouo2/develop
...
update armature[ci skip]
2013-09-17 05:45:17 -07:00
CaiWenzhi
f42797bc0d
Merge branch 'develop' into Merge_GUI_to_Develop
2013-09-17 20:43:16 +08:00
CaiWenzhi
841408d1bc
Modify events methods
2013-09-17 20:34:26 +08:00
2youyou2
57ec881727
support set tween key
2013-09-17 20:14:08 +08:00
CaiWenzhi
9d07b2c1d2
Temp commit
2013-09-17 20:13:23 +08:00
James Chen
1896305fcb
closed #2450 : Fixing HttpClientTest crashes on 64bit system.
2013-09-17 18:21:20 +08:00
CaiWenzhi
9d6d9dcd19
Add getDescription method
2013-09-17 17:59:20 +08:00
2youyou2
07f72ac1b4
Change rotation range from(-180 -- 180) to (-infinity -- infinity)
2013-09-17 16:40:47 +08:00
zhangcheng
a25c2cabf8
1. Fixes failed to build windows.
...
2. Upload CocoGUI Resources.
2013-09-17 13:25:15 +08:00
James Chen
28b266bc5e
[Android] Android.mk fixes after adding GUI test.
2013-09-17 10:49:59 +08:00
James Chen
157ffa9299
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
...
Merge gui to develop 3.0 branch
2013-09-16 07:45:23 -07:00
CaiWenzhi
0b48552f04
Modify scene reader
2013-09-16 21:07:11 +08:00
James Chen
b128018f76
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
...
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-09-16 20:58:26 +08:00
CaiWenzhi
759fcc147b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
2013-09-16 20:55:55 +08:00
CaiWenzhi
ca599b4852
Merge guy to 3.0 branch
2013-09-16 20:54:13 +08:00
signmotion
5dffb1b44e
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
2013-09-16 15:38:03 +03:00
James Chen
72c2d4ca35
Merge branch 'develop' into 2youyouo2-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:12:03 +08:00
James Chen
c12a655fdf
[GUI] Fix compilation error on win32.
2013-09-16 20:05:25 +08:00
James Chen
621e682e6e
[GUI] Fixing compilation errors for win32.
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:00:48 +08:00
James Chen
dba7f3eae6
[GUI] Fixing compilation errors for win32.
2013-09-16 19:53:59 +08:00
James Chen
208f705845
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-09-16 18:18:23 +08:00
James Chen
cc41377591
[CocoGUI] Updating linux makefile.
2013-09-16 17:24:25 +08:00
James Chen
3e7708dcd1
Updating Android.mk
2013-09-16 17:12:15 +08:00
James Chen
5ee8ad8c4f
Fix compilation errors for CocoGUI.
2013-09-16 17:12:15 +08:00
CaiWenzhi
210af21615
Modify member names
2013-09-16 17:12:15 +08:00
CaiWenzhi
a6428824d5
Modify makefiles
2013-09-16 17:12:15 +08:00
CaiWenzhi
cf4b8c0163
Add guy loading of scene
2013-09-16 17:12:15 +08:00
CaiWenzhi
4843046d17
Merge GUI to develop step 1;
2013-09-16 17:12:15 +08:00
2youyou2
a08ce3df73
change singleton class get method to getInstance
2013-09-16 15:16:05 +08:00
2youyou2
16c70363dd
standardizate code
2013-09-16 14:56:59 +08:00
2youyou2
302555e711
standardizate code
2013-09-16 14:13:55 +08:00
2youyou2
d8b64b8645
standardize code
2013-09-16 12:21:18 +08:00
zhangcheng
d4496ac02d
1. replace "CCFileUtils" to "FileUtils".
2013-09-16 12:16:11 +08:00
2youyou2
b7b079c1c6
standardize code
2013-09-16 12:02:57 +08:00
2youyou2
c767ff355c
delete extensions/CCArmature
2013-09-16 11:46:08 +08:00
James Chen
e31c4f008d
Merge pull request #3597 from chengstory/#4560
...
SceneEditorTest He version
2013-09-15 20:23:05 -07:00
2youyou2
ac8261bcd5
update Android.mk
2013-09-16 09:56:25 +08:00
2youyou2
77db15bd0d
change variables name
2013-09-15 20:24:25 +08:00
2youyou2
db4813f161
1.remove CC from class name
...
2.fix async loading
2013-09-15 19:08:45 +08:00
2youyou2
9fd89dbfc2
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CCArmature/CCArmature.cpp
extensions/CCArmature/CCArmature.h
extensions/CCArmature/CCBone.cpp
extensions/CCArmature/CCBone.h
extensions/CCArmature/animation/CCArmatureAnimation.cpp
extensions/CCArmature/animation/CCTween.cpp
extensions/CCArmature/animation/CCTween.h
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/datas/CCDatas.h
extensions/CCArmature/display/CCDecorativeDisplay.cpp
extensions/CCArmature/display/CCDecorativeDisplay.h
extensions/CCArmature/display/CCDisplayFactory.cpp
extensions/CCArmature/display/CCDisplayFactory.h
extensions/CCArmature/display/CCDisplayManager.cpp
extensions/CCArmature/display/CCDisplayManager.h
extensions/CCArmature/display/CCSkin.cpp
extensions/CCArmature/display/CCSkin.h
extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
extensions/CCArmature/external_tool/Json/lib_json/value.h
extensions/CCArmature/physics/CCColliderDetector.cpp
extensions/CCArmature/physics/CCColliderDetector.h
extensions/CCArmature/utils/CCArmatureDataManager.cpp
extensions/CCArmature/utils/CCArmatureDefine.h
extensions/CCArmature/utils/CCDataReaderHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
extensions/CCArmature/utils/CCUtilMath.cpp
extensions/cocos-ext.h
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
2013-09-15 15:19:13 +08:00
2youyou2
b329eb3854
update linux Makefile
2013-09-14 23:47:15 +08:00
yinkaile
5e1f91d396
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
2013-09-14 19:54:49 +08:00
zhangcheng
0121943c11
1. Adds SceneEditorTest hd version
2013-09-14 16:34:26 +08:00
James Chen
997a5a36c1
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
2013-09-14 09:02:49 +08:00
James Chen
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
yinkaile
74bd8b09d6
update armature
2013-09-13 18:07:37 +08:00
samuele3hu
d8bd65b2e8
issue #2784:Add class constructor js-binding document
2013-09-13 16:46:31 +08:00
samuele3hu
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
James Chen
c90291e01d
ScrollView::_touches is std::vector now, so it should not be inited by NULL pointer.
2013-09-12 21:02:30 +08:00
James Chen
6f37529236
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
2013-09-12 20:47:15 +08:00
James Chen
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
James Chen
6a2536b5bd
[Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher.
2013-09-12 16:03:03 +08:00
James Chen
5d95711865
[EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object).
2013-09-12 14:42:56 +08:00
James Chen
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
chengstory
bdfde89ef8
Merge branch '#develop' into #4551
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08:00
chengstory
e04a47b807
1. update mkfile.
2013-09-10 13:08:05 +08:00
chengstory
9bf6ab1e16
1. fixes error of 34 line in android.mk.
2013-09-10 11:50:08 +08:00
chengstory
8b509c456f
1. add shadernode.cpp to linux, nacl mk files.
2013-09-10 11:47:02 +08:00
chengstory
100228b4ae
1. fixes failed to build on linux.
2013-09-10 11:21:18 +08:00
chengstory
669de88e73
1. remove any unused functions.
2013-09-10 11:02:50 +08:00
zhangcheng
1115d0d3f9
1. merge scenereader Armature merge to cocos2dx 3.0.
2013-09-09 19:51:26 +08:00
성낙호
bf4eaa7e7c
merged
2013-09-09 18:20:16 +09:00
James Chen
b8c82ae5a9
[develop] Warning fixes.
2013-09-08 11:26:38 +08:00
성낙호
95c6c66d58
* obey naming convention
...
* hide unnecessary methods from public.
2013-09-06 16:10:11 +09:00
Ricardo Quesada
530a0119ae
`getNodeToParent()` returns a `const &`
...
This gives a little performance improvement.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 18:31:32 -07:00
minggo
c4a97cdfa1
Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes
...
Perf and bug fixes
2013-08-26 23:22:33 -07:00
Ricardo Quesada
0093263c18
Little performance improvements
...
Uses `AffineTransform::IDENTITY`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
samuele3hu
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
minggo
ddb4219d24
Merge pull request #3457 from boyu0/iss2434_gen_android_mk
...
closed #2434 : Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
samuele3hu
3b90d0b5b6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 13:40:35 +08:00
Ricardo Quesada
d7590affda
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/cocoa/CCArray.cpp
cocos2dx/cocoa/CCArray.h
cocos2dx/label_nodes/CCLabel.cpp
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
minggo
d9da52ce86
Merge pull request #3454 from minggo/array-support-sort
...
Array can be use in stl::sort() when not using vector inside
2013-08-21 20:50:03 -07:00
boyu0
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
Ricardo Quesada
a3eb0a058e
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/platform/mac/CCFileUtilsMac.mm
extensions/CCBReader/CCBAnimationManager.cpp
extensions/CCBReader/CCBReader.cpp
extensions/CCBReader/CCBSequenceProperty.cpp
extensions/GUI/CCScrollView/CCScrollView.cpp
2013-08-21 20:27:19 -07:00
Ricardo Quesada
2e221ee6cc
Array & Dictionary fixes
...
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.
This patch fixes all those issues.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
Ricardo Quesada
4104cdc20e
Better destructors logs
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:08:51 -07:00
samuele3hu
27c59a799d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 11:01:38 +08:00
minggo
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
samuele3hu
3cb095f48a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 10:17:59 +08:00
James Chen
1ee7790f0e
Initializing Array after it was constructed.
2013-08-22 10:15:47 +08:00
xbruce
d2684338a5
Update CCScrollView.cpp
...
change release mode
2013-08-20 14:58:26 +08:00
minggo
f97f7edeb6
Merge pull request #3440 from ricardoquesada/better_array
...
Better array
2013-08-19 23:39:36 -07:00
samuele3hu
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
James Chen
7e3d3b3d3e
Merge pull request #2950 from zcgit/develop
...
a potential bug in Layer.
2013-08-19 19:02:53 -07:00
Ricardo Quesada
511ec1cc5d
Compiles with improved CCArray
...
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
James Chen
175316f2c6
Merge pull request #3404 from timothyqiu/docfix
...
Documentation fix: broken links and wrong encoding in the doc...
2013-08-18 19:35:47 -07:00
성낙호
200a1ec831
style edited
2013-08-16 19:03:27 +09:00
samuele3hu
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
samuele3hu
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
samuele3hu
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
James Chen
86fef75963
issue #2521 : Removing an unused method ControlStepper::setValue(double value, bool send); since it's not implemented and there is an similar method 'setValueWithSendingEvent' could replace it.
2013-08-12 11:20:48 +08:00
James Chen
a34c70d253
issue #2521 : Fixing a logical error in CCBReader::addOwnerOutletNode. 'NULL != node' --> 'NULL == node'.
2013-08-12 11:19:21 +08:00
James Chen
331f0ef7b0
issue #2521 : Capture event of ControlButton in CCB for JSB.
2013-08-12 11:18:07 +08:00
James Chen
fb6f97de95
closed #2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set.
2013-08-10 14:43:55 +08:00
성낙호
d202a6fa24
applied cocos2d-x coding style
2013-08-09 14:39:40 +09:00
James Chen
fc437c5ef4
(Array*) --> static_cast<Array*>() for CCControl.cpp.
2013-08-09 10:56:39 +08:00
Timothy Qiu
3c394da6a4
Changed two 'XXX class for cocos2d for iphone'.
2013-08-09 02:31:51 +08:00
Timothy Qiu
3d8d0e40ee
Fixed broken links and wrong encoding in the doc.
...
Fixed Obj-C names when referening functions.
Changed some GB2312 encoded characters to UTF-8.
2013-08-09 02:31:51 +08:00
성낙호
eda9846e6f
DelegateProtocol is weak-referenced again
2013-08-08 18:36:56 +09:00
성낙호
31a3fd65c1
key with hash to support multiple assetsManager
2013-08-08 17:29:29 +09:00
James Chen
8024e95fa4
Merge pull request #3363 from tiantian20007/localDev
...
closed 2501: make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
2013-08-07 19:55:31 -07:00
James Chen
87736683c0
Merge pull request #3387 from pyrasis/tizen_2.2
...
[Tizen] Enable LocalStorage
2013-08-07 03:08:38 -07:00
Lee, Jae-Hong
5a8ec8ca5e
[Tizen] Enable LocalStorage
...
- add sqlite3 headers and libraries.
- use sqlite3 library.
2013-08-07 19:01:41 +09:00
성낙호
3fc48ecf15
purgeStoragePath added
2013-08-07 14:36:26 +09:00
성낙호
1c91e73a8c
added jsb support for AssetsMAnager
2013-08-07 14:07:01 +09:00
James Chen
a5067f63dd
Merge pull request #3372 from pyrasis/tizen_2.2
...
[Tizen] Fix Debug Settings
2013-08-05 22:51:06 -07:00
Lee, Jae-Hong
1acfca45b2
[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1
2013-08-06 14:42:53 +09:00
Lee, Jae-Hong
3db495ab0e
[Tizen] Fix Debug Settings.
...
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
tianTian
77d6692fed
make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
2013-08-05 10:23:41 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
minggo
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
James Chen
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
성낙호
c9077961e8
fix for undefined protocol
2013-08-02 10:35:45 +09:00
Timothy Qiu
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
Timothy Qiu
bc10c2a01f
Change some doc due to the change of source code.
...
Fixed some incorrect use of doxygen command.
2013-08-01 17:47:37 +08:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
minggo
f7fd7a8af5
fixed warnings on Android and windows
2013-07-28 21:43:20 +08:00
samuele3hu
cc95fcaa69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-28 14:35:38 +08:00
samuele3hu
3aeefb51b3
Modify deprecated CCPhysicsDebugNode typedef and some test bug
2013-07-28 14:33:02 +08:00
minggo
4f6e1fb944
set _isDownloading to false before return
2013-07-28 09:53:59 +08:00
James Chen
d67ab3e4cc
Untabify for CCBValue.cpp.
2013-07-28 00:31:09 +08:00
James Chen
ab84dacf8f
issue #2430 : CCBValue::Type is strong enum type now.
2013-07-28 00:26:24 +08:00
James Chen
584402984b
Adding deprecated constants for CCBReader.
2013-07-27 23:04:14 +08:00
James Chen
fa5c26c5e2
member variables renaming according cocos2d-x style.
2013-07-27 22:31:57 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
James Chen
feadd2b2dd
issue #2430 : Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
...
Also added more deprecated constants.
2013-07-27 00:55:41 +08:00
James Chen
387ae822b1
issue #2430 : Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
2013-07-26 22:57:15 +08:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
James Chen
2bfccb4a43
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
2013-07-26 21:36:32 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen
6c2e6e8cb0
Merge pull request #3253 from metalbass/patch-3
...
Added virtual destructors to some interfaces to fix issue 3095
2013-07-26 05:47:35 -07:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
minggo
859da78499
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-26 17:47:52 +08:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
Thomas Perl
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
minggo
0b3ed85914
issue #2430:fix some compiling error
2013-07-26 16:43:40 +08:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +08:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
James Chen
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
minggo
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08:00
minggo
f94a02ac01
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-26 11:25:18 +08:00
James Chen
d882fc3ef0
Merge pull request #3263 from 2youyouo2/Fix_3.0
...
Fix armature supper fast
2013-07-25 19:58:22 -07:00
2youyou2
7c4460f9e0
Fix armature supper fast
2013-07-26 10:19:19 +08:00
Ricardo Quesada
8bf24f0475
ccGLXXX -> GL::xxx
...
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`
Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
Ricardo Quesada
191aaebe2a
More const fixes
...
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
2013-07-25 17:47:42 -07:00
Ricardo Quesada
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
Ricardo Quesada
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
minggo
323af3c889
issue #2430:use upper letters for enum item in AssetsManager and WebSocket
2013-07-25 22:29:12 +08:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
metalbass
2982a42fbf
Fixed typo. virutal -> virtual
2013-07-25 13:03:40 +02:00
metalbass
c7329e9301
Added virtual destructors to some interfaces to fix issue 3095
2013-07-25 12:54:51 +02:00
minggo
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
minggo
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
minggo
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
minggo
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +08:00
James Chen
477dd6c3c7
issue #2404 : cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now.
2013-07-25 10:33:19 +08:00
Thomas Perl
8044c52d6d
Qt 5: Add support for building libextension
2013-07-24 20:23:07 +02:00
James Chen
762b987ae7
issue #2404 : [Extensions] Updating the file for deprecated methods.
2013-07-24 18:00:40 +08:00
James Chen
fb1b510557
issue #2404 : Deprecated some methods in NodeLoaderLibrary.h/.cpp.
2013-07-24 18:00:02 +08:00
James Chen
00999b464e
issue #2404 : Reverting callback interface for CCBReader.
2013-07-24 17:59:21 +08:00
James Chen
debd1965c9
Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated
...
Conflicts:
cocos2dx/include/CCDeprecated.h
2013-07-24 16:53:14 +08:00
Ricardo Quesada
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
Éloi Rivard
2875284882
emscripten bugfix
2013-07-23 08:58:43 +02:00
Éloi Rivard
36065400bc
Created CCDeprecated-ext
2013-07-23 08:58:43 +02:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
James Chen
b58d18e20a
More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.
2013-07-22 14:28:19 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
James Chen
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
yinkaile
0470ce936b
1.Fix release CCTexture2DMutable.cpp crash
...
2.Change frame tween method
2013-07-19 19:02:26 +08:00
Lee, Jae-Hong
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
Ricardo Quesada
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
boyu0
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
Ricardo Quesada
5d499d351d
Some more changes to make the code more c++ friendly:
...
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
- Deprecates the old methods
- adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
- the new one is const
- Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
2013-07-16 18:16:04 -07:00
James Chen
80590dcfc1
Merge pull request #3132 from samuele3hu/ScriptHandler
...
issue 2377:Add scriptHandlerMgr to manager lua script handler
2013-07-16 02:40:50 -07:00
James Chen
b71e9d83e1
Merge pull request #3165 from sunzhuoshi/master
...
Fixed bad js constant names and added config macro for "spine" extension
2013-07-16 02:36:49 -07:00
sunzhuoshi
ec7456a43c
Removed config macro for "spine" extension
2013-07-16 16:19:20 +08:00
sunzhuoshi
6d0f7dfe88
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
2013-07-16 15:04:51 +08:00
samuele3hu
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +08:00
James Chen
13e939b55e
Merge pull request #3157 from ricardoquesada/override_love
...
closed 2407: Adds more readability to the class internals.
2013-07-15 22:05:33 -07:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
yinkaile
f6c59928b2
Merge branch 'master' into develop
2013-07-16 09:37:56 +08:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
pktangyue
652f679d50
override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class
2013-07-15 20:13:30 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
James Chen
93bb7bcb31
friend SIOClientImpl --> friend class SIOClientImpl, that will be clearer.
2013-07-13 19:26:46 +08:00
James Chen
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
James Chen
8409e2942f
Fixing warning in SocketIO.cpp
2013-07-13 19:20:11 +08:00
yinkaile
619a8810fe
Change Physics detector
2013-07-13 19:14:30 +08:00
Chris Hannon
8791c8119e
task: hiding non-interface methods in the SsocketIO and SIOClient classes, adding SIOClientImpl as friend to access
2013-07-12 13:05:15 -04:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
minggo
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
Chris Hannon
126ebb888c
Implements a socket.io client extension, adds a test case and updates the android makefiles.
...
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
James Chen
093d9a507c
closed #2396 : indentation fix.
2013-07-11 17:07:41 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
pktangyue
8f7d9093c9
Merge remote-tracking branch 'origin/develop' into patch1
2013-07-11 16:08:46 +08:00
James Chen
5727d7099b
issue #2395 : Scale9Sprite's default anchor point is center now.
2013-07-11 13:59:57 +08:00
James Chen
b2c0d17aeb
Merge pull request #3122 from dumganhar/iss2389-http-cookie
...
closed 2389: Adding cookie support for HttpClient
2013-07-10 18:37:29 -07:00
James Chen
3af6f6fe58
enableCookies is static method now
2013-07-10 15:46:01 +08:00
Lee, Jae-Hong
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
James Chen
3f57275848
issue #2389 : Adding cookie support for HttpClient
2013-07-10 11:37:39 +08:00
yinkaile
24daabe469
Merge branch 'master' into develop
2013-07-10 10:01:41 +08:00
yinkaile
54e5fca2aa
Bone can add a particle display as a CCNode
2013-07-10 10:00:51 +08:00
yinkaile
ac6d4e5cbb
remove CCShaderNode
2013-07-09 22:07:56 +08:00
Éloi Rivard
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
James Chen
5eb849a789
closed #2381 : ControlSwitch was displayed ugly when adding more than one switch.
2013-07-09 17:23:13 +08:00
James Chen
596c4c3cf2
issue #2387 : Using static_cast instead of C style cast while iterating CCDictionary.
2013-07-09 14:40:43 +08:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
James Chen
976d4ad11e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
Ricardo Quesada
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
yinkaile
4a8cde4dad
Change Tween Type to Frame Index
2013-07-08 23:25:11 +08:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
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