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

15992 Commits

Author SHA1 Message Date
Huabing.Xu cf6785ffcf issue #3812: using std::vector<QuadCommand*> to hold current batched command 2014-01-22 15:18:27 +08:00
Dhilan007 65c2e03721 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-22 15:08:05 +08:00
James Chen 668a855484 Merge pull request #5157 from dumganhar/iss3677-eventdispatcher-perf 
issue #3677: Adds EventDispatcher performance test.
 2014-01-21 22:58:01 -08:00
Dhilan007 df21bbf7df 1.remove unused code 
2.reduce calculation amount.
3.reduces expenses of function calls
 2014-01-22 14:57:11 +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
Hanju Kim 64ab0c0e35 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontDefinition.cpp
 2014-01-22 14:15:21 +09:00
James Chen 0da326e07f Merge pull request #5155 from CocosRobot/updategeneratedsubmodule_1390364448 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-21 20:46:07 -08:00
CocosRobot 97b473731d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 04:20:57 +00:00
James Chen b4c2871496 Update CHANGELOG [ci skip] 2014-01-22 12:03:23 +08:00
James Chen f3233cba61 Merge pull request #5150 from lihex/issue#3781 
issue #3781: Update script for each platform bindings generating.
 2014-01-21 19:57:19 -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
James Chen 17daa2b877 Merge pull request #5153 from heliclei/develop 
[jenkins]do not mix github access token with jenkins job trigger token
 2014-01-21 19:49:19 -08:00
James Chen 4d8b263042 Merge pull request #5154 from CocosRobot/updategeneratedsubmodule_1390362077 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-21 19:48:09 -08:00
James Chen d87bbdd7bb Update CHANGELOG [ci skip] 2014-01-22 11:41:57 +08:00
CocosRobot 4efb5bd686 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 03:41:19 +00:00
minggo 562d10c89f issue #3713: every autorelease will cause a release operation 2014-01-22 11:40:07 +08:00
James Chen 3aac0b32a2 Merge pull request #5142 from Dhilan007/develop_label 
close #3805:fix wrap error and alignment error.
 2014-01-21 19:35:45 -08:00
heliclei d7f1dfbe14 do not mix github access token with jenkins job trigger token 2014-01-22 11:35:25 +08:00
lihex 3b9d4c7a39 issue #3781, Update travis-scripts, llvm-installing parts no need now. 2014-01-22 11:28:53 +08:00
James Chen 5b91b9ea2e Merge pull request #5152 from dumganhar/iss3808-glfw-remove-unused 
closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
 2014-01-21 19:06:57 -08:00
minggo c906075017 issue #3713: use reference in loop 2014-01-22 11:03:06 +08:00
lihex b2a1cd90eb issue #3781, Minor fix & update submodule. 2014-01-22 10:58:02 +08:00
James Chen a63f092d94 closed #3808: EditBox on Mac works again. 2014-01-22 10:53:43 +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
James Chen 0ab5ec742a closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context 2014-01-22 10:16:34 +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 c31a2afd68 Merge pull request #5148 from ricardoquesada/mac_platform_simplified 
Mac platform simplified + fixes in EventDispatcher
 2014-01-21 16:37:19 -08:00
Ricardo Quesada 94ea94a113 global Z order uses floats 2014-01-21 16:36:19 -08:00
Ricardo Quesada b51b04f315 ActionsProgress test include fixes 2014-01-21 16:28:52 -08:00
Ricardo Quesada 06be466f29 Removed unused code and files. 
Making the mac platform easier to mantain
 2014-01-21 16:25:29 -08:00
Ricardo Quesada 98d23d30a6 First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
Ricardo Quesada 8cb1205615 Merge pull request #5147 from ricardoquesada/batch_command_api_fixes 
BatchCommand API fixes
 2014-01-21 11:14:15 -08:00
Ricardo Quesada e402f35e7f BatchCommand API fixes 
don't pass Texture Id.
Instead fetch it from the `TextureAtlas`
 2014-01-21 11:13:21 -08:00
Ricardo Quesada eeeae56684 Merge pull request #5146 from ricardoquesada/local_z_Order_fixes 
Local z order fixes
 2014-01-21 10:12:24 -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
pandamicro 30f07ccdea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-21 18:40:10 +08:00
lihex 40f5c31a50 issue #3781, Undefine the __MINGW32__ macro to fix the script error on windows 2014-01-21 18:32:27 +08:00
minggo 4833810c6e Merge pull request #5132 from minggo/iss3713-replace_CCObject 
remove Object::_autoReleaseCount
 2014-01-21 02:26:40 -08:00
pandamicro 3de7ed93f9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
 2014-01-21 18:18:32 +08:00