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

10102 Commits

Author SHA1 Message Date
samuele3hu 6d71b41101 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 14:18:26 +08:00
samuele3hu e36c6f544a issue #2276: Modify ScrollView and LuaScrollView class 2013-06-21 14:17:41 +08:00
James Chen 12549f72f9 Adding resource for ComponentTest. 2013-06-21 14:16:03 +08:00
James Chen dcaa55e622 Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern. 2013-06-21 14:15:20 +08:00
James Chen 06a9cf12ca Merge pull request #2966 from dumganhar/develop 
Typo fixes in CCNode.h.
 2013-06-20 22:49:19 -07:00
James Chen 56f8ab2675 Typo fixes in CCNode.h. 2013-06-21 13:47:29 +08:00
James Chen c14c1f1d27 Merge pull request #2965 from dumganhar/develop 
[Win32] Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblu...
 2013-06-20 21:08:36 -07:00
James Chen 9b00f507c1 Merge pull request #2964 from dumganhar/develop 
[Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox.
 2013-06-20 21:07:45 -07:00
James Chen 1608f4b286 Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblua project. 2013-06-21 12:07:31 +08:00
James Chen e7ee2f2151 [Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox. 2013-06-21 11:57:14 +08:00
samuele3hu 2bf4128fe8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 11:41:17 +08:00
James Chen eaaeb23572 Merge pull request #2961 from dumganhar/develop 
issue #2289: Don't make Action be inherited from Clonable.
 2013-06-20 20:21:46 -07:00
James Chen b74db627af Don't make Action be inherited from Clonable. Why?? Please refer to https://groups.google.com/forum/?hl=en#!topic/cocos2d-js-devel/dGJYz9wIb4Q , but we need to find out the real reason why VS compiler generate linking errors. 2013-06-21 11:19:17 +08:00
James Chen b3be87b436 Merge pull request #2960 from dumganhar/develop 
Removing unused files [tools/lua_project_generator]. [ci skip].
 2013-06-20 20:17:57 -07:00
James Chen 9a7bb8fa84 Removing unused files [tools/lua_project_generator]. [ci skip]. 2013-06-21 11:17:14 +08:00
samuele3hu 35f0b07aa6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 11:16:46 +08:00
James Chen 7d5aa5b76a Merge pull request #2959 from dumganhar/develop 
issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects...
 2013-06-20 20:16:20 -07:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
samuele3hu a862543a4c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 10:44:03 +08:00
samuele3hu c527fecfe3 issue #2276: Add scrollview sample test in cocosbuilder and modify some config 2013-06-21 10:43:02 +08:00
James Chen 2a715ec3cf Merge pull request #2956 from ricardoquesada/cc_namespace_obj 
issue #2129: Re-adds 'CC' prefix to objective-c classes.
 2013-06-20 19:10:01 -07:00
James Chen 40a0beb7e5 Merge pull request #2958 from natural-law/develop 
Update the JS binding of plugin.
 2013-06-20 19:01:38 -07:00
James Chen d1e26a46f0 Update AUTHORS [ci skip] 2013-06-21 11:00:14 +09:00
James Chen dc802ced1e Merge pull request #2955 from sbc100/nacl_develop_fixes 
closed #2318: Adding Native Client support for develop branch and some warnings fixes.
 2013-06-20 18:58:40 -07:00
zhangbin 4671e45ab7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-21 09:49:52 +08:00
zhangbin 5ad116328f Update the JS binding of plugin. 2013-06-21 09:43:28 +08:00
minggo 245dad8cd8 [ti ignore] 2013-06-21 09:25:14 +08:00
minggo dfe202d431 Merge pull request #2754 from longlene/develop 
smarter script for creating Android project
 2013-06-20 18:23:53 -07:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
loong0 1e6d5da5ac merge the conflict copy_files.sh 2013-06-21 07:24:01 +08:00
Sam Clegg 60bfca0e45 [NaCl] Remove missing functions from lua stdlib. 
NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
 2013-06-20 12:56:15 -07:00
Sam Clegg 2469045640 [NaCl] update build-nacl.sh 2013-06-20 12:56:15 -07:00
Sam Clegg 04d7d5a061 [NaCl] Add support for building using glibc toolchain. 
BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
 2013-06-20 12:56:14 -07:00
Sam Clegg f1048557bd [NaCl] Build for all nacl architectures 2013-06-20 12:56:14 -07:00
Sam Clegg b5a509e65e [NaCl] Don't cache font size 
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.

Review URL: https://codereview.chromium.org/14308007
 2013-06-20 12:56:13 -07:00
Sam Clegg 5c4545de3c [NaCl] Remove use of -lnosys 2013-06-20 12:56:13 -07:00
Sam Clegg d3110c0a45 [NaCl] Recreate webstore zip archive each build. 2013-06-20 12:56:13 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 203d2e4559 Fix compile warnings in LuaOpengl.cpp 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
Sam Clegg ab1243e8dd [NaCl] Disable http tests under NaCl 2013-06-20 10:56:26 -07:00
Sam Clegg 3686e8245f [NaCl] Fix sigslot.h compilation on NaCl ARM 2013-06-20 10:54:11 -07:00
James Chen 9ac7088664 Merge pull request #2954 from dumganhar/develop 
closed #2315: [JSB] Iterating through cc.Node children causes crash.
 2013-06-20 07:53:42 -07:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
samuele3hu 71fe43ee97 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-20 22:40:21 +08:00
samuele3hu 15c69563e2 issue #2276: Add ScrollView lua binding and test sample 2013-06-20 22:39:30 +08:00
James Chen 032c07b735 Merge pull request #2953 from dumganhar/develop 
issue #2129: Removing CC prefix for template.
 2013-06-20 07:22:04 -07:00
James Chen d1bd34fd08 issue #2129: Removing CC prefix for template. 2013-06-20 22:18:43 +08:00
James Chen de0e683014 Merge pull request #2949 from dumganhar/develop 
Bug fixes for the tool to generate luabindings.
 2013-06-20 05:56:50 -07:00
James Chen 2ceec2f65d Merge pull request #2947 from pyrasis/tizen_2.1 
[Tizen] Fix compile error
 2013-06-20 04:58:21 -07:00