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

66 Commits

Author SHA1 Message Date
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
James Chen 4302f3886d issue #2789: Adds performance test for Vector and CCArray. 2014-01-17 10:02:12 +08:00
Huabing.Xu 19705fcf37 issue #3640: add performance test->renderer LargeTileMap test 2014-01-15 11:27:57 +08:00
James Chen 052f24cceb [ci skip] Updates TestLua project for iOS and Mac. 2014-01-04 17:33:21 +08:00
James Chen 4c3fa3da49 Merge pull request #4865 from dumganhar/testjs-bugfix 
Some fixes for TestJavascript
 2014-01-03 23:34:08 -08:00
James Chen 046384ca1f Uses blue folder for iOS & Mac resources to prevent adding new resources. 2014-01-04 14:22:57 +08:00
James Chen 9bb558ad46 Removes wrong resource in TestJavascript project. 2014-01-04 13:54:25 +08:00
James Chen e65c6b8e53 Merge pull request #4841 from dumganhar/template-container-unit-test 
Template container unit test
 2014-01-03 20:01:25 -08:00
James Chen 5072e63f89 issue #3577: Updates project file for mac and ios. 2014-01-04 11:41:06 +08:00
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 2014-01-03 19:36:22 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
chengstory 77dca5958f issue #3480 upload Samples resources. 2014-01-03 02:03:05 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
James Chen 444389e92d [GUI] Updates Mac project. 2013-12-26 10:44:41 +08:00
chengstory 8afdf88d25 Test triiger 3.0 2013-12-26 01:17:04 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
James Chen 8c0f6ba80e Adds `SpineTest` to iOS, Mac projects. 2013-12-23 21:13:23 +08:00
CaiWenzhi a19000b49f Add samples 2013-12-23 15:35:35 +08:00
James Chen d3a4dbab08 iOS & Mac project fix. 2013-12-17 16:34:05 +08:00
Ricardo Quesada f68dcd9969 Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/tests.h
 2013-12-05 11:47:46 -08:00
James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-05 12:48:32 +08:00
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
Ricardo Quesada a34352cef7 Console is working! 2013-12-03 18:46:54 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-02 10:55:31 -08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
Nite Luo 19b8ba89e2 Merge branch 'develop' into newRenderer 2013-11-25 10:21:02 -08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
samuele3 3a69ee301b issue #3228: Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform 2013-11-22 14:06:48 +08:00
Nite Luo e5ebcb2845 Merge branch 'develop' into newRenderer 2013-11-18 10:22:16 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
Nite Luo c5f9434331 Merge branch 'develop' into newRenderer 2013-11-15 11:33:38 -08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
Nite Luo a70cad8c97 Merge branch 'develop' into newRenderer 2013-11-14 10:36:43 -08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
Nite Luo be71eb8626 Merge branch 'develop' into newRenderer 
Conflicts:
	.gitignore
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/2d/CCDirector.cpp
 2013-11-07 17:24:57 -08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
Ricardo Quesada 2f0a19c7a3 Enables more warnings in Xcode project 2013-11-04 16:30:00 -08:00
Ricardo Quesada ab6d620b3d Disables arm64 for the moment 2013-11-04 15:11:20 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00