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

2051 Commits

Author SHA1 Message Date
2youyou2 db4813f161 1.remove CC from class name 
2.fix async loading
 2013-09-15 19:08:45 +08:00
James Chen e3cce1fd0b [dispatcher] 100 times for Touch event dispatch test. 2013-09-15 18:26:17 +08:00
James Chen 62a0dc41c3 [dispatcher] Adding TouchEvent dispatch test. 2013-09-15 17:49:36 +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
samuele3hu 1e093868c8 issue #2768:Modify testlua and hellolua sample's linux mayflies. 2013-09-15 09:53:08 +08:00
2youyou2 2213e8118d fix armature hd crash 2013-09-14 23:31:33 +08:00
zhangcheng 841ea4cfdd 1. change 480*320 to 960*640. 2013-09-14 20:52:35 +08:00
zhangcheng 95236e86d9 1. update scenetest version. 2013-09-14 20:49:02 +08:00
samuele3hu 95831eb70f issue #2768:Add a newline 2013-09-14 20:00:26 +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
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
samuele3hu aa4c90e97a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	extensions/cocos-ext.h
 2013-09-14 19:29:36 +08:00
zhangcheng acf9754814 1. add supported for 480*320 on scenetest. 2013-09-14 19:03:15 +08:00
zhangcheng 0121943c11 1. Adds SceneEditorTest hd version 2013-09-14 16:34:26 +08:00
James Chen 1ed980d27c [dispatcher] Updating win32 TestCpp.vcxproj. 2013-09-14 10:32:37 +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
James Chen dd55822465 [dispatcher] Updating NewEventDispatcherTest.cpp. 2013-09-13 18:51:00 +08:00
James Chen ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
yinkaile 74bd8b09d6 update armature 2013-09-13 18:07:37 +08:00
James Chen cf66992b51 [dispatcher] Updating HelloWorldScene.cpp, if you wish to using the same listener for different target, please invoke clone to create a new one. 2013-09-13 18:02:26 +08:00
James Chen 7729756d04 [dispatcher] Updating EventDispatcherTest.cpp. 2013-09-13 18:01:32 +08:00
minggo 9c259823e1 Merge pull request #3590 from Dhilan007/develop 
issue #2800:Can not hide status bar on iOS 7
 2013-09-13 02:12:30 -07:00
James Chen 51548b9542 Adding NewEventDispatcher Test. 2013-09-13 16:38:21 +08:00
Dhilan007 18f2f831b4 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 16:07:02 +08:00
Dhilan007 5350b1ad06 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 15:54:58 +08:00
minggo c4cb2582cc fixed #2793:best practice of New Label 2013-09-13 11:46:46 +08:00
James Chen c948a67243 [dispatcher] Updating SimpleGame. 2013-09-12 22:12:58 +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 6623879f6d [EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved. 2013-09-12 14:26:39 +08:00
Huabing.Xu b1b192ce70 closed #2782: shadertestSprite remove blank line 2013-09-12 10:31:14 +08:00
Huabing.Xu 53ffedc558 issue #2782: shadertestSprite add lensFlare Sprite Test Case 2013-09-12 10:25:55 +08:00
James Chen da1101beeb [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
samuele3hu 7c62509b02 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-11 09:50:31 +08:00
samuele3hu 29f0909714 issue #2768:Add LuaObjectBridge and LuaJavaBridge 2013-09-11 09:48:24 +08:00
boyu0 d161c6a576 issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest() 2013-09-10 17:41:06 +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
minggo 31ce15ea46 Merge pull request #3571 from dabingnn/new_shader_test 
issue #2782 shader test sprite
 2013-09-09 22:55:53 -07:00
chengstory e04a47b807 1. update mkfile. 2013-09-10 13:08:05 +08:00
Huabing.Xu 8e35e7cc27 issue #2782: shadertestSprite change test case textures and add normal sprite for comparison 2013-09-10 11:45:38 +08:00
chengstory 669de88e73 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
Huabing.Xu 2912260b3a issue #2782: shadertestSprite linux and windows version 2013-09-10 11:00:57 +08:00
zhangcheng 98fce2fa84 1. update Samples on develop branch. 2013-09-10 09:53:15 +08:00
Huabing.Xu 5801e9118c issue #2782: remove a blank test case 2013-09-10 09:38:12 +08:00
Huabing.Xu f2fc710f86 issue #2782: shadertestSprite android make file 2013-09-10 09:32:03 +08:00
Nako Sung 31e3faaa4f Update AppDelegate.cpp 2013-09-09 22:38:37 +09:00
Huabing.Xu 8a86a883d0 issue #2782: update mac version, update test case title 2013-09-09 21:33:01 +08:00
zhangcheng 99f32077d2 1. upload SceneTest Resources. 2013-09-09 19:52:07 +08:00
Huabing.Xu d7d914feb1 Merge branch 'develop' into new_shader_test 2013-09-09 18:18:31 +08:00
Huabing.Xu d763de3d3c new shader test code 2013-09-09 17:49:13 +08:00
성낙호 bf4eaa7e7c merged 2013-09-09 18:20:16 +09:00
성낙호 3a4c9f9fb0 men leak fixed (life-cycle management was hand downed to scene-graph) 2013-09-09 17:07:32 +09:00
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements 
Fileutils perf improvements
 2013-09-08 19:50:12 -07:00
boyu0 1d47737f45 issue #2771: add physics files and entries. 2013-09-09 10:29:02 +08:00
samuele3hu 357466bab2 issue #2768:Add Armature lua binding and releated test samples 2013-09-09 10:20:32 +08:00
James Chen ba9fdc5774 Reverts samples/Cpp/HelloCpp/proj.win32/main.cpp 2013-09-08 11:30:50 +08:00
James Chen b8c82ae5a9 [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
Ricardo Quesada 8078a574c2 snapshopTextures are no longer supported 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:55:36 -07:00
Ricardo Quesada b2a81b5b86 Removes some Hungarion notation... 
...and improves performance in FileUtils: String is not created
 2013-09-06 18:46:33 -07:00
Ricardo Quesada b78382d5e5 Performance improvements in FileUtils / TextureCache 
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
 2013-09-06 15:33:28 -07:00
minggo 76a1b36191 Merge pull request #3546 from minggo/alloc_perf_test 
Alloc perf test
 2013-09-05 23:30:15 -07:00
minggo 8e0bce344c Merge branch 'alloc_perf_test' of https://github.com/minggo/cocos2d-x into alloc_perf_test 2013-09-06 13:45:59 +08:00
minggo d723c4ef3f Merge branch 'alloc_perf_test' of https://github.com/ricardoquesada/cocos2d-x into alloc_perf_test 2013-09-06 13:45:23 +08:00
minggo 1664d3503d add PerformanceAllocTest.cpp/h to vs project and fix some compiling errors 2013-09-06 12:51:37 +08:00
Ricardo Quesada 1071ab9d37 Adds a new test: sprite with image 2013-09-05 21:35:15 -07:00
minggo 0131ecf705 add PerformanceAllocTest.cpp/h to Android.mk and linux project setting 2013-09-06 11:44:10 +08:00
Ricardo Quesada 02500372ed Adds new perf test: alloc / dealloc 2013-09-05 20:02:04 -07:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
samuele3hu 32d056df18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 14:03:21 +08:00
samuele3hu 6815e01f84 issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
minggo 9dedb072e6 Merge pull request #3528 from natural-law/ForPlugin 
Modify the method cocos_android_app_init()
 2013-09-03 22:50:40 -07:00
Ricardo Quesada befcf722b6 compiles Linux / Windows 2013-09-03 10:17:25 -07:00
Ricardo Quesada 088a11ad0d Little performance improvements in SpriteBatchNode 
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
 2013-09-02 16:44:25 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
Ricardo Quesada be0c8cb1e8 adds two more perf tests 
Node::addChild and Node::removeChild
 2013-08-31 17:08:51 -07:00
Ricardo Quesada 0d96a0ce40 resets random seed before each test 2013-08-31 15:49:25 -07:00
Ricardo Quesada a5e0febc3e Adds better names to test 
And new values for get(),add(),remove(),sort(),reorder()
 2013-08-31 07:27:56 -07:00
Ricardo Quesada 5abb57e5f2 AddChild test fix 
`sortAllChildren` should not be part of the test.
It is tested separatedly on another test
 2013-08-31 06:59:44 -07:00
samuele3hu 5ee2a7e58e issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator 2013-08-30 17:15:16 +08:00
samuele3hu 8f338cc209 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-08-30 15:21:59 +08:00
samuele3hu f184d7cd8f issue #2433:Replace ccDraw** in DrawPrimitives with draw** 2013-08-30 15:06:00 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
Huabing.Xu 99f88df8d2 issue #2460: optimize EGLView interface 2013-08-29 11:36:16 +08:00
Ricardo Quesada c04409b6d5 More accurate test 
Name is recalculated. No time is "wasted" in calculating it.

And `Visit` test uses `Node` objects instead of `Sprite`s. So `draw` is not taken into account, just the visit.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 18:32:45 -07:00
Ricardo Quesada eff8f4307f Project is Xcode 5 friendly 
Adds defaults for provisioning profile. Needed for iOS on Xcode 5

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:43:50 -07:00
Ricardo Quesada 7fb56bd123 Adds "Visit Scene Graph" tests 
A new tests to measure the performance of visit

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-28 12:39:57 -07:00
samuele3hu 1dabab2ca5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
 2013-08-28 15:35:33 +08:00
James Chen a8140dd31b Adding test for issue http://www.cocos2d-x.org/issues/2401 . 2013-08-28 15:12:41 +08:00
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
James Chen b235bf07b7 [Mac] Adding WebsocketTest and SocketIOTest. 2013-08-28 15:02:57 +08:00
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 2013-08-28 13:42:22 +08:00
Huabing.Xu 29746d513a issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 
Conflicts:
	scripting/auto-generated
 2013-08-27 16:59:59 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes 
Remove unneeded codes
 2013-08-26 23:23:41 -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
James Chen 213b7aea21 Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator 
issue #2433: Add lua bindings generator and modify releated test samples
 2013-08-26 23:09:56 -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
James Chen 6501c9bffd Merge pull request #3479 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-26 03:23:14 -07:00
minggo e567b6c54b fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
James Chen c9ffc44bc4 [Android] Removing x86 from APP_ABI. Otherwise the time of compiling will be very long. 2013-08-26 16:52:20 +08:00
Ricardo Quesada ea8eb601af Uses std::sort() 
Uses std::sort() for inserting the nodes.

This code is not final, but preliminary results show that std::sort() is 60% faster

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-24 10:56:07 -07:00
Lee, Jae-Hong bbf9053788 [Tizen] Update project files. 
- Update file list.
- change order of link files.
 2013-08-25 02:22:50 +09:00
Ricardo Quesada 364288cf66 Adds "Sort all Children" perf test 
Adds a new perf tests: "sortAllChildren"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-23 13:14:57 -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
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00
James Chen 2a147ec34a Adding a new search path 'res' to TestJavascript since some resources are defined as hard code in ControlColourPicker::init(). 
bool ControlColourPicker::init()
{
    if (Control::init())
    {
        setTouchEnabled(true);
        // Cache the sprites
        SpriteFrameCache::getInstance()->addSpriteFramesWithFile("extensions/CCControlColourPickerSpriteSheet.plist");  // Hard code here

        // Create the sprite batch node
        SpriteBatchNode *spriteSheet  = SpriteBatchNode::create("extensions/CCControlColourPickerSpriteSheet.png"); // Hard code here
        addChild(spriteSheet);
 2013-08-23 15:55:25 +08:00
James Chen 7882ea7fbc Merge pull request #3465 from dumganhar/develop 
issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib).
 2013-08-22 20:28:57 -07:00
James Chen 6ed43811fe issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib). 2013-08-23 11:26:16 +08:00
Ricardo Quesada 055c566bc9 Adds missing #include 2013-08-22 19:30:20 -07:00
Ricardo Quesada 38bfadf7f3 Adds 2 new performance tests 
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-22 18:21:52 -07: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 9e34aae075 closed #2434: Use the origin android.mk files instead use templates 2013-08-22 16:45:40 +08:00
samuele3hu 5f6d9815ca issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
boyu0 83f7835708 issue #2434: Delete unused method dirs and find_files in Android.mk template 2013-08-22 14:03:25 +08:00
boyu0 ad23ec4a0f #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +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
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 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 f0a2f6cbf8 purge profiler data one + or - is pressed 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:02:50 -07: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
samuele3hu bea62800b4 issue #2433:Modify TestLua samples and add some manual binding code 2013-08-22 10:16:57 +08:00
Huabing.Xu 3bc5f1ed8a issue #2460: glfw win32 project file 2013-08-21 12:02:21 +08:00
Huabing.Xu b2e167c6ea issue #2460: glfw mac version 2013-08-21 12:01:56 +08:00
Ricardo Quesada cf02cb4581 Fixes names in Performance Node tests 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 18:05:35 -07:00
Ricardo Quesada e5551b2872 Compiles both with std::vector and ccCArray 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 16:06:51 -07:00
Ricardo Quesada 20167e2a12 removes unneeded spaces 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:18:45 -07:00
Ricardo Quesada c9b250d4a4 Adds new tests to tests 
and enables profiling

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-20 14:18:32 -07:00
Huabing.Xu 2e21e18b70 issue #2460: rename EGLView::Create to EGLView->create 2013-08-20 16:23:46 +08:00
Huabing.Xu dd538a28a7 issue #2460: glfw window version 2013-08-20 13:57:15 +08: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
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray 
Compiles both with std::vector or ccCArray
 2013-08-19 17:09:28 -07:00
minggo 3ca26e1aa6 Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto 
closed #2517: Update all test cases use auto for local variables
 2013-08-17 01:12:48 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array 
add iterator for Array and make Array can be used in range-based loop
 2013-08-17 00:42:42 -07:00
folecr aff86b1b52 Keep TravisCI happy : build Android TestCpp for ARM architecture only. 2013-08-16 16:19:34 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
성낙호 200a1ec831 style edited 2013-08-16 19:03:27 +09:00
boyu0 6779f494f3 issue #2517: Restore TestCpp proj.android that edited by mistake. 2013-08-16 16:09:46 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support 
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
 2013-08-16 11:02:44 +08: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 de3335a4a9 issue #2433:Update lua manual binding and modify some samples 2013-08-16 10:12:46 +08:00
James Chen 9ab671fb03 Merge pull request #3425 from dumganhar/iss2488-new-label-sample 
Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422
 2013-08-15 07:16:48 -07:00
James Chen 4b0d0225b7 issue #2488: Updating makefile for linux and emscripten. 2013-08-15 21:44:51 +08:00
James Chen 409e345522 issue #2488: Updating VS project configuration. 2013-08-15 21:40:11 +08:00
James Chen 56cd039b32 issue #2488: Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'"; 2013-08-15 21:39:47 +08:00
James Chen 9dbd74d2a8 Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner 
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
 2013-08-15 04:19:17 -07:00
James Chen 21134cc48f Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean 2013-08-15 17:02:51 +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 f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
folecr b4edb14d33 Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging. 2013-08-13 15:50:58 -07:00
folecr 4d34cfc28f Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore 2013-08-13 11:29:53 -07:00
folecr 84054a237c Android platform version used matches all other sample projects 2013-08-13 11:28:56 -07:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-08-13 11:28:54 -07:00
carlo morgantini 15ec303278 more clean ups on tests for label 2013-08-13 10:12:02 -07:00
folecr b61ce3c79d ndkgdb.sh for TestCpp 2013-08-13 08:47:48 -07:00
folecr 17c7b7cbcf APP_OPTIM is debug 2013-08-13 08:47:48 -07:00
folecr 652920eaac set android:debuggable property to true 2013-08-13 08:47:48 -07:00
folecr 75f7af00a6 TestCpp builds both ARM and x86 versions 2013-08-13 08:47:48 -07:00
folecr cd0f1beaf4 fix evaluation of properties array read from local.properties 2013-08-13 08:47:48 -07:00
folecr ef7c3b2b09 Remove unused option in build script 2013-08-13 08:47:48 -07:00
carlo morgantini 35b5e30190 alignment added to new label creation 2013-08-12 15:41:29 -07:00
carlo morgantini d15d84c05f samples cleaned up 2013-08-12 15:09:28 -07:00
carlo morgantini 097a5c488a New Label tests plus bug fixing 2013-08-12 13:29:54 -07:00
James Chen 9cf3bf64d5 issue #2521: Updating JS-Test. 2013-08-12 11:31:54 +08:00
James Chen 12ffdfc4fd issue #2521: TestJavascript needs ccbreader support. 2013-08-12 11:21:31 +08:00
Lee, Jae-Hong 66593ae4bf [Tizen] Update project files 
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
 2013-08-10 23:11:31 +09:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
samuele3hu 980bea8a97 issue #2433:lua binding generator add hello.lua 2013-08-09 10:07:10 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
James Chen 7910581654 Merge pull request #3388 from dumganhar/iss2483-sp-v23 
closed 2483: Upgrading spidermonkey library to v23.
 2013-08-07 18:39:40 -07:00
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -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
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
James Chen 39084750db [Android] Updating launch activity name. ".TestJavascipt" --> "android.app.NativeActitiy" for TestJavascript project. 2013-08-07 13:46:09 +08:00
godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 09:32:42 +08:00
James Chen 989f350e39 Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357. 2013-08-06 16:27:40 +08:00
godyZ 02419ccb00 update s3tc #3 ,android test 2013-08-06 15:33:38 +08: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
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
godyZ 195536097f update s3tc #2 2013-08-06 11:52:48 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
godyZ fd7b00681f update s3tc#1 2013-08-06 11:19:45 +08:00
folecr 1721e90e3d Update TestLua 2013-08-05 16:41:34 -07:00
folecr 07917429a0 Update HelloLua 2013-08-05 16:41:30 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
folecr bf6b57fe19 Changes to match reverting of namespace simplegame for this sample 2013-08-05 02:05:48 -07:00
folecr fe01166e92 Revert "namespace simplegame for game code" 
This reverts commit f35ebf6c494b68e6b3938a8ad1781d0d0684bb45.
 2013-08-05 02:05:47 -07:00
folecr 7510a55c6a Update TestJavaScript 2013-08-05 02:05:47 -07:00
folecr 5531272979 Update a bunch of JS projects for android 2013-08-05 02:05:47 -07:00
folecr 23061fb312 AssetsManagerTest 2013-08-05 02:05:47 -07:00
folecr ff079791e5 TestCpp 2013-08-05 02:05:47 -07:00
folecr d3476bec17 HelloCpp 2013-08-05 02:05:46 -07:00
folecr 81318d72ed Update target sdk version to 13 so that the game can handle all configuration changes 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla 388edc144b Adding additional android:configChanges parameters to AndroidManifest 2013-08-05 02:05:46 -07:00
folecr 325892eb82 Remove dependency on cocos extensions 2013-08-05 02:05:43 -07:00
folecr 9da4b9798f Use android.appNativeActivity directly 2013-08-05 02:05:40 -07:00
folecr 1deb291026 Helper script to run the app 2013-08-05 02:05:40 -07:00
folecr d271d02004 namespace simplegame for game code 2013-08-05 02:05:39 -07:00
folecr ebd68c8feb Force enable debug 
* APP_OPTIM in Application.mk
 * android:debuggable="true" in AndroidManifest.xml
 * NDK_DEBUG=1 in build_native.sh
 2013-08-05 02:05:39 -07:00
folecr b87c29d50b simplegame : logging of entry points into app 2013-08-05 02:05:39 -07:00
folecr 21165cd285 simplegame : provide cocos_android_app_init() to initialize the Application. 2013-08-05 02:05:39 -07:00
folecr a5f9b19c30 simplegame : add option to build script to build in debug mode 2013-08-05 02:05:38 -07:00
folecr 2e81871497 simplegame : Fix build script to process input elements as an array 2013-08-05 02:05:38 -07:00
folecr c91d004fdc simplegame : NDK GDB debugging script 2013-08-05 02:05:38 -07:00
folecr e5377e2ddc simplegame : Use Cocos2dxActivity (which is also a NativeActivity.) 2013-08-05 02:05:38 -07:00
folecr fc3cd0c68c simplegame : Use cocos2dxandroid static library 2013-08-05 02:05:37 -07:00
folecr ccfdbe42bc simplegame : Use nativeactivity 2013-08-05 02:05:37 -07:00
folecr 816b77e7c0 simplegame : enable building native library for x86 2013-08-05 02:05:37 -07:00
folecr 26c5e1e180 simplegame : no java, Create empty src/ directory with a nojava.txt file 2013-08-05 02:05:37 -07:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02: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 456b5af872 closed #2434:fixed path 2013-08-03 23:12:10 +08:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
carlo morgantini 4904e0f31f Clean up (as requested by code review) 2013-08-01 17:08:57 -07:00
carlo morgantini 2fb2916bae some more cleanup 2013-08-01 14:36:34 -07:00
boyu0 93aa3c7ada issue #2345: refract CCImage and CCTexture2D. 2013-08-01 15:53:52 +08:00
Huabing.Xu 9a9d0b9def closed #2423: add ActionTargetedReverse test case 2013-08-01 10:28:18 +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
minggo d887008bb8 Merge pull request #3336 from minggo/simplify-sample-code 
Simplify sample code
 2013-07-31 00:41:20 -07:00
minggo e412fe5a31 use Point::+ to simplify HelloWorld sample 2013-07-31 14:38:50 +08:00
minggo 0241470ff9 Merge pull request #3330 from dabingnn/Iss2447-ClippingNodeTestCrash-bug 
closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug
 2013-07-30 18:42:46 -07:00
minggo a8f10c480d Merge pull request #3332 from azmeuk/clang 
Clang support for Linux
 2013-07-30 18:26:12 -07:00
carlo morgantini ff56ad5435 fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
carlo morgantini 9de1ef3f97 New label TTF. New text alignment sample. 2013-07-30 10:27:22 -07:00
minggo 1d2b1c79c2 closed #2438:remove mac 32-bit support 2013-07-30 18:02:35 +08:00
Huabing.Xu 6a1938056c closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug 2013-07-30 16:27:13 +08:00
Éloi Rivard 14e200e61a Added debugging information in emscripten DEBUG mode 2013-07-30 10:11:30 +02: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
carlo morgantini 023b46154f Fix problems with missing glyphs in .ttf file 2013-07-29 13:43:23 -07:00
boyu0 894584e5a0 Add texture2D convert test and fix the convert bugs 2013-07-29 17:34:33 +08:00
minggo 0b0c223d33 Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug 
Iss2437 render texture stencil test bug
 2013-07-29 01:25:14 -07:00
James Chen 4c32303b2e Merge pull request #3317 from dumganhar/member-var-init 
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
 2013-07-29 00:29:08 -07:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
Huabing.Xu 0dcf9e88c3 close #2437: replace stencil mechanism with a new approach by removing glColorMask call 2013-07-29 14:13:36 +08:00
Huabing.Xu 4ebfc1c6e4 issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil 2013-07-29 14:11:21 +08:00
James Chen b1a0393191 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into member-var-init 2013-07-29 14:11:13 +08:00