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

2773 Commits

Author SHA1 Message Date
minggo a1729fa1b4 Merge pull request #5159 from natural-law/develop 
Add test case for issue 2572
 2014-01-22 17:49:56 -08:00
Ricardo Quesada 7421310072 Merge pull request #5168 from ricardoquesada/cceglview_in_desktop 
Cceglview in desktop
 2014-01-22 14:19:53 -08:00
Ricardo Quesada 6b8781241c code is cleaner 2014-01-22 13:51:01 -08:00
martell 50176a038f Fixed x64 builds of testcpp with long to size_t changes 2014-01-22 19:21:25 +00:00
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-01-22 11:21:16 -08:00
James Chen 1b89a058fa Merge pull request #5160 from samuele3hu/developBugFix 
fix:Update the some test cases for lua
 2014-01-22 01:21:50 -08:00
samuele3hu e1476c8d60 fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache() 2014-01-22 17:09:33 +08:00
zhangbin 462b9a7ace issue #2572, Optimize the code of test case for issue 2572. 2014-01-22 17:04:54 +08:00
minggo 9c6a65baba Merge pull request #5156 from minggo/deprecate-function 
deprecated some functions in Object
 2014-01-22 00:51:50 -08:00
samuele3hu e848167b25 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-22 15:44:33 +08:00
samuele3hu c4d2f1d83c fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case 2014-01-22 15:41:46 +08:00
zhangbin 3c2ef04f2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 15:39:28 +08:00
zhangbin 3007f34240 issue #2572, Add test case for issue 2572. 2014-01-22 15:38:59 +08:00
samuele3hu 0d8d517c2b fix:Update the TestLua/TouchesTest by using the new event-dispatcher 2014-01-22 15:18:47 +08:00
James Chen 444a30e226 issue #3677: Wrong include fix. 2014-01-22 14:12:25 +08:00
James Chen 32572e257e issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp. 2014-01-22 14:10:42 +08:00
James Chen e3e248c0f0 issue #3677: Updates Windows project to add PerformanceEventDispatcherTest. 2014-01-22 13:53:54 +08:00
minggo 4381685a9d deprecated some functions in Object 2014-01-22 13:47:29 +08:00
James Chen 43a10f951b issue #3677: Updates Android.mk and CMakeLists.txt. 2014-01-22 13:35:52 +08:00
James Chen cecb20f824 issue #3677: Adds EventDispatcher performance test. 2014-01-22 13:33:40 +08:00
minggo 63543b0f32 Merge pull request #5151 from minggo/iss3713-replace_CCObject 
fix memory leak of autorelease pool
 2014-01-21 19:52:47 -08:00
minggo 562d10c89f issue #3713: every autorelease will cause a release operation 2014-01-22 11:40:07 +08:00
minggo aae7a9a3cc Merge branch 'iss3713-replace_CCObject' of https://github.com/minggo/cocos2d-x into iss3713-replace_CCObject 2014-01-22 10:18:34 +08:00
minggo 9ffcef4982 issue #3713:fix memory leak of autoreleas pool 2014-01-22 10:17:42 +08:00
Ricardo Quesada 1113587f47 mac/CCEGLView moved to desktop/ 2014-01-21 17:52:30 -08:00
James Chen b189329d84 Merge pull request #5145 from samuele3hu/developBugFix 
Fix:e Add new test case for GlobalZOrder in the TestLua/NodeTest
 2014-01-21 17:44:26 -08:00
Ricardo Quesada b51b04f315 ActionsProgress test include fixes 2014-01-21 16:28:52 -08:00
Ricardo Quesada 7a8707cb08 Merge branch 'develop' into local_z_Order_fixes 
Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/CCNode.h
 2014-01-21 10:10:50 -08:00
Ricardo Quesada f1444a26a1 Improves documentation with local z order 2014-01-21 09:26:58 -08:00
samuele3hu dbeac80cae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-21 23:10:36 +08:00
samuele3hu 564ba84e11 Fix:e Add new test case for GlobalZOrder in the TestLua/NodeTest 2014-01-21 23:08:18 +08:00
James Chen 2343d0f9cb Merge pull request #5141 from samuele3hu/developBugFix 
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
 2014-01-21 06:40:18 -08:00
minggo 4833810c6e Merge pull request #5132 from minggo/iss3713-replace_CCObject 
remove Object::_autoReleaseCount
 2014-01-21 02:26:40 -08:00
minggo b0163b503e closed #3713:add test case in vs project 2014-01-21 18:00:34 +08:00
samuele3hu 77b5d4c772 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-21 17:52:13 +08:00
samuele3hu 2338d773dc fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases 2014-01-21 17:51:49 +08:00
minggo 6378d10d5d issue #3713:add test case for autorelease pool 2014-01-21 17:47:59 +08:00
samuele3hu 88be8606b9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf 2014-01-21 16:46:28 +08:00
samuele3hu da8e208f47 close #3802: Add some manual lua-binding functions for the Lable and update the related test cases 2014-01-21 16:36:29 +08:00
minggo 5fd35c3bab Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject 2014-01-21 13:46:40 +08:00
minggo 386ba88974 issue #3713: remove unneeded codes to fix compiling error 2014-01-21 10:33:45 +08:00
James Chen 0f9c3fa59c closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case. 2014-01-21 10:23:05 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
James Chen b116a11c3c issue #2789: Adds performance test for Map<K, V> and Dictionary. 2014-01-20 11:13:30 +08:00
James Chen b11ef3069f issue #2789: Adds Map, Dictionary perf test, not yet finished. 2014-01-20 11:13:29 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key 
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
 2014-01-17 16:08:29 -08:00
James Chen 8eca8e25cb Merge pull request #5099 from samuele3hu/test-rebase 
close #3626:Make lua bindings-generator support the namespace binding
 2014-01-17 06:07:45 -08:00
samuele3hu cf857aade2 issue #3626:Modify some files that skipped some modifications because of merge 2014-01-17 11:22:03 +08:00
James Chen 31199183b2 Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas 2014-01-17 11:10:04 +08:00