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

11813 Commits

Author SHA1 Message Date
minggo 5c0b53e77b Merge pull request #3475 from ricardoquesada/perf_fixes 
Adds "Sort all Children" perf test
 2013-08-25 18:32:14 -07:00
Ricardo Quesada b6a90b81aa Adds missing include 2013-08-25 10:50:29 -07: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
xbruce cfc5a7f669 Update cocos2d_specifics.cpp 
add need unroot
 2013-08-23 18:22:58 +08:00
xbruce 8076d568ba Update cocos2d_specifics.hpp 
add need unroot
 2013-08-23 18:20:31 +08: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 daa0095989 Merge pull request #3473 from CocosRobot/updategeneratedsubmodule_1377245073 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-23 01:07:03 -07:00
CocosRobot 8345d4849d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 08:04:38 +00:00
James Chen f654012308 Merge pull request #3472 from dumganhar/develop 
Adding a new search path 'res' for TestJavascript project and updating bindings-generator to the latest version.
 2013-08-23 00:57:24 -07:00
James Chen 699c7d1077 Updating bindings-generator, it supports CCString. Some APIs, for example ControlButton::setTitleForState are using String as argument. 2013-08-23 15:56:38 +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
boyu0 9a3a03d6ef closed #2494: Fix some typo 2013-08-23 14:41:49 +08:00
boyu0 3f23a4a661 closed #2494: Fix bug when two line is incident, the Point::isSegmentIntersect() may return wrong result 2013-08-23 14:37:56 +08:00
James Chen 5897be62cf Merge pull request #3468 from CocosRobot/updategeneratedsubmodule_1377229215 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-22 20:57:01 -07:00
CocosRobot 4658674175 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 03:40:19 +00: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
minggo bbbfc82541 Merge pull request #3463 from ricardoquesada/perf_test_invocation 
Adds 2 new performance tests
 2013-08-22 20:26:54 -07:00
minggo b746bda738 Merge pull request #3461 from dumganhar/iss2650-remove-typeinfo 
closed #2650: Remove ccTypeInfo since we could get the hash value from typeid(T).hash_code() if using c++11.
 2013-08-22 20:26:25 -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
minggo 3c137d97ab Merge pull request #3462 from ricardoquesada/color_constants 
Adds more constants to Color
 2013-08-22 19:26:53 -07:00
minggo dde0bc0bbc Merge pull request #3464 from boyu0/iss2434_gen_android_mk 
closed #2434: Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file
 2013-08-22 19:24:47 -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
Ricardo Quesada c4735af1ef Adds more constants to Color 
Adds more constants for Colors, in particular to `Color4B` and `Color4F`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-22 17:19:07 -07:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +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 02649a1329 closed #2434: Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file 2013-08-22 17:47:49 +08:00
boyu0 9e34aae075 closed #2434: Use the origin android.mk files instead use templates 2013-08-22 16:45:40 +08:00
James Chen f02f72d980 Merge pull request #3456 from sbc100/fix_build 
[NaCL] Add missing include of <sys/mount.h> [ci skip]
 2013-08-22 00:39:16 -07: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 de68d35f4b closed #2434: change name "android_generator" to "android_mk_generator 2013-08-22 13:49:22 +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
samuele3hu 0e3d0febc7 issue #2433:Modify platform config 2013-08-22 13:39:05 +08:00
minggo edc2bf14c7 Merge pull request #3455 from ricardoquesada/dictionary_array_fixes 
Dictionary array fixes
 2013-08-21 21:52:00 -07: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
Ricardo Quesada 29d0bab0d3 fixes memory leak! 
and double-autorelease on Dicts (on mac)
 2013-08-21 21:12:32 -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
Sam Clegg 7bd5025064 [NaCL] Add missing include of <sys/mount.h> 
This was previously included by nacl_io.h but
upstrean changes in NaCl removed this.
 2013-08-21 20:27:34 -07: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
Ricardo Quesada 967eb4b08f Adds more asserts 
The instance methods cannot be used if the instance was not `init()`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:04:30 -07:00
Ricardo Quesada 4dc18029b7 Removed Iterator class 
There is no need to implement `Array::Iterator`.
It is replaced by returning `end()` and `begin()`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-21 20:03:45 -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