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

17165 Commits

Author SHA1 Message Date
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
James Chen 0b39829b36 Merge pull request #5114 from lmskater/develop 
[jenkins] decode 'payload' to utf-8 and ignore invalid bytes
 2014-01-17 02:18:58 -08:00
lm 38e7f01ee8 decode 'payload' to utf-8 and ignore invalid bytes 2014-01-17 17:13:33 +08:00
CaiWenzhi a33465638d Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-17 15:24:23 +08:00
CaiWenzhi f33064a2fc Fixed bug of label 2014-01-17 15:22:59 +08:00
James Chen 0a6316a2f3 Merge pull request #5105 from Dhilan007/develop_label 
close #3678:fix incorrect spacing between characters
 2014-01-16 23:18:44 -08:00
James Chen 805e2ad2ba Merge pull request #5107 from CocosRobot/updategeneratedsubmodule_1389939079 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-16 22:34:53 -08:00
Ricardo Quesada b948671905 Merge pull request #5109 from ricardoquesada/renderer_sane_checks 
Adds some Asserts in the renderer
 2014-01-16 22:31:03 -08:00
Ricardo Quesada feec6a1e8a Adds some Asserts in the renderer 
Linux still has a bug, but I can't reproduce it all the time.
Hoping that these asserts will help me find it
 2014-01-16 22:29:25 -08:00
CaiWenzhi 58ed383c01 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-17 14:12:19 +08:00
CocosRobot 0c777b0d85 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-17 06:11:22 +00:00
Dhilan007 db4dc28c1a close #3678:fix incorrect spacing between characters 2014-01-17 14:04:52 +08:00
Ricardo Quesada f4572e8cac Merge pull request #5104 from ricardoquesada/android_compile_fixes 
compiles on Android
 2014-01-16 21:59:09 -08:00
Ricardo Quesada 1b5b9da102 compiles on Android 
compiles on Android
 2014-01-16 21:58:14 -08:00
Ricardo Quesada 2b8107d817 Merge pull request #5102 from ricardoquesada/compile_fixes 
Fixes compilation issues on Linux
 2014-01-16 21:49:56 -08:00
Ricardo Quesada cfbceb0e22 Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
Ricardo Quesada d6719470ad Merge pull request #5101 from ricardoquesada/header_dependency_fixes 
Header dependency fixes
 2014-01-16 21:37:40 -08:00
Ricardo Quesada a74a524eaa Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes 2014-01-16 21:36:22 -08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CaiWenzhi 233faea690 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs 2014-01-17 13:11:29 +08:00
CaiWenzhi bea46fa290 Add clone method to LayoutParameter 2014-01-17 13:10:04 +08:00
James Chen 54d587153b Update CHANGELOG [ci skip] 2014-01-17 11:55:20 +08:00
James Chen 9413c6e042 Merge pull request #5086 from Dhilan007/develop_label 
closed #3628:Integrate LabelAtlas with new Label
 2014-01-16 19:52:05 -08:00
CaiWenzhi 602133a071 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs 2014-01-17 11:25:38 +08:00
samuele3hu cf857aade2 issue #3626:Modify some files that skipped some modifications because of merge 2014-01-17 11:22:03 +08:00
LinWenhai 484f6a8f36 Merge pull request #1 from dumganhar/new-label-atlas 
issue #3628: Adds missing files for iOS and Mac.
 2014-01-16 19:21:19 -08:00
James Chen d309ae76d0 issue #3628: Adds missing files for iOS and Mac. 2014-01-17 11:13:40 +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
James Chen 09f56f3a8b Merge pull request #5047 from btspoony/develop 
closed #3750: Fix long string will be cut off by function “cc_utf8_to_utf16”.
 2014-01-16 19:06:39 -08:00
James Chen 8667161a7d Merge pull request #5087 from dumganhar/iss2789-perf-container 
issue #2789:  Performance Test for Container (Vector<T>, Array were finished)
 2014-01-16 18:30:50 -08:00
James Chen f48f429825 issue #2789: Removes unused empty lines and renames some variables. 2014-01-17 10:29:21 +08:00
samuele3hu 508d786fa7 issue #3626:Update the submodule 2014-01-17 10:19:58 +08:00
samuele3hu d086f7a259 issue #3626:Add the deprecated support for the tolua.cast 2014-01-17 10:19:57 +08:00
samuele3hu 31339d10e5 issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script 2014-01-17 10:19:57 +08:00
samuele3hu d49e28610b issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times 2014-01-17 10:19:56 +08:00
samuele3hu 5859d3866a issue #3626:Update the lua test cases which used the “tolua.cast” function to add the module name for the second string param 2014-01-17 10:19:56 +08:00
samuele3hu 35d031ea06 issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module 2014-01-17 10:19:56 +08:00
samuele3hu de698aaea7 issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu 811aa69d39 issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu fdac224a7b issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace 2014-01-17 10:19:55 +08:00
samuele3hu 510fce7b12 issue #3626:Add namespace’s support for manual lua binding of functions about physics 2014-01-17 10:19:55 +08:00
samuele3hu b72f309076 issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases 2014-01-17 10:19:54 +08:00
James Chen 3af95f3e84 issue #2789: Updates windows projects. 2014-01-17 10:05:26 +08:00
James Chen b3e1319982 issue #2789: Updates Android.mk and CMakeLists.txt. 2014-01-17 10:03:10 +08:00
James Chen 83b459fcdb issue #2789: Adds loop test for Vector and Array. 2014-01-17 10:02:13 +08:00
James Chen 811f55bb8d issue #2789: Avoids compiler to do optimization. 2014-01-17 10:02:12 +08:00
James Chen 4302f3886d issue #2789: Adds performance test for Vector and CCArray. 2014-01-17 10:02:12 +08:00
Dhilan007 f5afa09de1 remove unneeded empty line. 2014-01-17 09:46:59 +08:00
Ricardo Quesada f2471b8caf Merge pull request #5068 from dabingnn/develop_renderer_tileMapTest 
add performance test for New renderer: LargeTileMap test for quadCommand
 2014-01-16 16:03:42 -08:00
Ricardo Quesada 218d9ceabc Merge pull request #5097 from ricardoquesada/render_vbo_fixes 
Renderer: When not using VAOs, call...
 2014-01-16 15:03:29 -08:00