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

15701 Commits

Author SHA1 Message Date
Ricardo Quesada 7249d3ca76 Unified CCEAGLView on Linux and Mac 2014-01-22 13:05:37 -08:00
Ricardo Quesada 83f16e25e3 merge from develop 2014-01-22 11:44:48 -08: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 45bbbca8c6 Merge pull request #5164 from Dhilan007/develop_label 
close #3642:fix bounding box of new label is incorrect.
 2014-01-22 06:23:39 -08:00
James Chen c984416d3e Merge pull request #5165 from CocosRobot/updategeneratedsubmodule_1390384981 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 02:04:00 -08:00
CocosRobot e900504e8b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 10:03:04 +00:00
Dhilan007 ec297a2c31 close #3642:fix bounding box of new label is incorrect. 2014-01-22 18:01:37 +08:00
Dhilan007 a2f5146731 close #3642:fix bounding box of the new label is a bit off. 2014-01-22 17:45:56 +08:00
James Chen 351814c0be Merge pull request #5158 from Dhilan007/develop_label 
Label:remove unused code and optimization performance.
 2014-01-22 01:24:48 -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
James Chen 49481172e9 Update AUTHORS [ci skip] 2014-01-22 17:18:36 +08:00
James Chen 292c5a17c6 Merge pull request #5161 from pyrasis/develop 
[Win32] fix localStorageGetItem crash when column text is NULL.
 2014-01-22 01:17:32 -08:00
samuele3hu e1476c8d60 fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache() 2014-01-22 17:09:33 +08:00
James Chen 573bab945d Merge pull request #5162 from CocosRobot/updategeneratedsubmodule_1390381054 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-22 01:02:22 -08:00
CocosRobot f9615d891e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 08:57:36 +00:00
minggo 9c6a65baba Merge pull request #5156 from minggo/deprecate-function 
deprecated some functions in Object
 2014-01-22 00:51:50 -08:00
Lee, Jae-Hong e5d45583b7 [Win32] fix localStorageGetItem crash when column text is NULL. 2014-01-22 17:37:29 +09: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
Dhilan007 4095ab36b6 update xcode project. 2014-01-22 15:22:46 +08:00
samuele3hu 0d8d517c2b fix:Update the TestLua/TouchesTest by using the new event-dispatcher 2014-01-22 15:18:47 +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
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