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