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

10036 Commits

Author SHA1 Message Date
zhangbin 622f1e7a4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-24 14:31:06 +08:00
zhangbin 79e2819107 Rename the class ProtocolSocial to ProtocolShare. 2013-06-24 14:30:38 +08:00
minggo 141105ac69 issue #2305:remove unneeded comment 2013-06-24 14:03:45 +08:00
minggo e5a122ea39 issue #2305:use c++11 thread instead of pthread in AssetsManager 2013-06-24 13:59:41 +08:00
zhangbin b9a1dd3d19 Add ProtocolUser for custom system plugins. 2013-06-24 11:31:10 +08:00
James Chen 38f89b7101 Merge pull request #2978 from dumganhar/minggo-iss2305-replace-pthread 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/2969
 2013-06-23 19:49:38 -07:00
James Chen af93901b60 Disabling travis-ci build for Native Client port since it doesn't supprt std::thread and std::mutex. 2013-06-24 10:22:21 +08:00
James Chen 62902ad212 Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen c39b2adfcc Merge pull request #2976 from dumganhar/iss2322-link-error 
closed #2322: [Win32] Linking error when using multiply inheritance.
 2013-06-23 18:57:59 -07:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen f1eaabb09f issue #2322: Fixing a warning in extensions/CCArmature/utils/CCDataReaderHelper.cpp. 2013-06-23 17:23:14 +08:00
James Chen 1b3d0c39ad issue #2322: Action now is inherited from Object and Clonable now. 2013-06-23 17:22:23 +08:00
James Chen 195605c85d issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
James Chen aaeb4e13b0 issue #2322: Adding Property Sheet cocos2dx.props for sharing project configuration. Now it's only for linking libraries. 2013-06-23 17:20:12 +08:00
minggo 5b6e2b2660 Merge pull request #2972 from ricardoquesada/actions_test_improvements 
Actions test improvements
 2013-06-21 20:40:48 -07:00
Ricardo Quesada 404193eb9f Uses C++11 iterator in samples 
or it just uses touches->anyObject() instead of creating an iterator
and removes more unneeded casts
 2013-06-21 20:02:43 -07:00
Ricardo Quesada 64d7cd404e Removes copy from Point. 
Adds clone instead
 2013-06-21 15:13:52 -07:00
Ricardo Quesada 6c0c48a3a9 Removes CallFuncO and CallFuncND 
...which can be simualted with CallFunc and CallFuncN.

Adds std::function() support to CallFuncN.
Adds more samples
 2013-06-21 14:58:52 -07:00
Ricardo Quesada 5e106f3c85 Uses C++11 code for the actions tests 
Removes all casting.
Uses auto for actions
uses for(:) (C++11) iterator
 2013-06-21 12:25:36 -07:00
James Chen 24d32010d6 Compilation errors in ScriptingCore.cpp fixes 2013-06-21 22:29:48 +08:00
James Chen e96c807087 clang+llvm-3.1 --> clang+llvm-3.3 2013-06-21 21:49:23 +08:00
James Chen e69838ff27 [Travis CI] Removing space for before-install.sh. 2013-06-21 21:40:21 +08:00
James Chen 88a0dbec5e Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 21:29:25 +08:00
James Chen 3cf482bebd Updating bindings-generator. 2013-06-21 21:27:59 +08:00
James Chen 992ea78f53 Using llvm 3.3 and android cxx-stl 4.7. 2013-06-21 21:27:45 +08:00
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +08:00
James Chen 4a8eabd97f Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 17:01:22 +08:00
James Chen 09f141f162 Merge pull request #2962 from samuele3hu/scrollview_develop 
issue #2276: Add ScrollView lua binding and test sample
 2013-06-21 01:57:41 -07:00
minggo b434190a70 issue #2305: tab -> 4 spaces 2013-06-21 15:49:45 +08:00
samuele3hu b9d79293cd issue #2276: Modify InitLuaScrollView to initLuaScrollView 2013-06-21 15:46:59 +08:00
minggo ef7fd16f76 issue #2305: tab -> 4 spaces 2013-06-21 15:43:17 +08:00
samuele3hu a6d072e679 issue #2276: Modify LuaScrollView create method 2013-06-21 15:42:39 +08:00
minggo 68559dfa00 issue #2305: use c++11 thread instead of pthread in CCTextureCache 2013-06-21 15:29:21 +08:00
samuele3hu 7d0c073215 issue #2276: Modify vs2012 solution config 2013-06-21 14:57:17 +08:00
James Chen 27a68c211d Merge pull request #2967 from dumganhar/develop 
Warning fixes for TestCpp and adding resource for ComponentTest.
 2013-06-20 23:22:50 -07:00
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