James Chen
|
425db1af6b
|
Merge pull request #2982 from ricardoquesada/ios_project_fixes
[iOS] TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
|
2013-06-24 22:02:53 -07:00 |
James Chen
|
cfcc39d924
|
Merge pull request #2987 from dumganhar/iss2305-std-thread
issue #2305: Using c++11 thread instead of pthread for WebSocket.
|
2013-06-24 21:54:09 -07:00 |
James Chen
|
3b9fa904ba
|
issue #2305:use c++11 thread instead of pthread for WebSocket.
|
2013-06-25 12:51:44 +08:00 |
Ricardo Quesada
|
436c7e9391
|
removes Xcode's autogenerated library paths
|
2013-06-24 21:30:04 -07:00 |
James Chen
|
38d597b308
|
Merge pull request #2985 from ricardoquesada/mac_workspace
issue #2325: Adds mac workspace. Not finished.
|
2013-06-24 19:56:25 -07:00 |
Ricardo Quesada
|
f6dfefe50f
|
oops
adds missing file
|
2013-06-24 19:37:07 -07:00 |
Ricardo Quesada
|
e1d65e149b
|
some fixes
removes deprecated functions from AsssetManager
AssetManager: updated project
HelloCpp: does not depent on box2d, chipmunk, etc.
|
2013-06-24 18:20:07 -07:00 |
Ricardo Quesada
|
ef6f67902f
|
Adds mac workspace
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
|
2013-06-24 18:04:05 -07:00 |
James Chen
|
d2ff2d8679
|
Merge pull request #2984 from folecr/quickfix_include_path
Fix include path
|
2013-06-24 17:49:35 -07:00 |
folecr
|
ee5f319a77
|
Fix include path
|
2013-06-24 17:29:24 -07:00 |
Ricardo Quesada
|
4204e8243c
|
TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...as dependencies, and other minor fixes
|
2013-06-24 16:59:00 -07:00 |
James Chen
|
d9985d07ce
|
Merge pull request #2981 from dumganhar/iss2325-ios-workspace
issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
|
2013-06-24 03:33:36 -07:00 |
James Chen
|
8dc8fec180
|
issue #2325: Updating project configuration, tested on iPad 3.
|
2013-06-24 18:32:06 +08:00 |
minggo
|
c04911d0ee
|
Merge pull request #2980 from natural-law/develop
Rename the class ProtocolSocial to ProtocolShare.
|
2013-06-24 02:37:57 -07:00 |
minggo
|
cf2638b8c6
|
Merge pull request #2979 from minggo/iss2305-replace-pthread
use c++11 thread instead of pthread in AssetsManager
|
2013-06-24 02:36:10 -07:00 |
James Chen
|
7da2018128
|
issue #2325: Adding armv7s architecture.
|
2013-06-24 17:06:25 +08:00 |
zhangbin
|
c72cdcb88e
|
Update the JS binding for plugin.
|
2013-06-24 17:00:02 +08:00 |
James Chen
|
b8ce865d74
|
issue #2325: [iOS] Adding missing workspace file.
|
2013-06-24 15:45:26 +08:00 |
James Chen
|
b870488aad
|
issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
|
2013-06-24 15:31:18 +08:00 |
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 |
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 |