Commit Graph

1311 Commits

Author SHA1 Message Date
James Chen afc7e39d0f issue #2313: Opens stencil for TestJavascript. 2013-06-26 16:28:14 +08:00
James Chen 10f4446596 Merge pull request #2998 from sbc100/emscripten_linux
closed #2333: 1) Share top level Makefile between emscripten, linux and nacl.
2) Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 22:43:16 -07:00
Sam Clegg f9ae701a4b Fix emscripten build on linux
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
James Chen 4196f2036e Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix
issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 08:41:28 -07:00
James Chen 3e052d5525 issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library. 2013-06-25 23:21:06 +08:00
minggo 28c69b8b16 Merge pull request #2990 from minggo/ccx_filesystem
fixed a compiling error of AssetsManager on Android
2013-06-25 02:36:34 -07:00
minggo 6539fd52ba Merge pull request #2989 from samuele3hu/glMoudle
issue #2276: Add OpenGL lua module
2013-06-25 02:23:15 -07:00
minggo 86646bb820 issue #2329:fixed a compiling error of AssetsManager on Android 2013-06-25 17:09:10 +08:00
minggo 8d782133b8 Merge pull request #2983 from folecr/ccx_filesystem
Improve Android file system read performance
2013-06-25 02:05:37 -07:00
minggo d13597bcc3 Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem 2013-06-25 16:55:39 +08:00
samuele3hu 46bcf6ddba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle 2013-06-25 15:22:14 +08:00
samuele3hu 3b058fe019 issue #2276: Add OpenGL lua module 2013-06-25 14:55:57 +08:00
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
Ricardo Quesada 436c7e9391 removes Xcode's autogenerated library paths 2013-06-24 21:30:04 -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
Ricardo Quesada 4204e8243c TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...as dependencies, and other minor fixes
2013-06-24 16:59:00 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +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
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 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08: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 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 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
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +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
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
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 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
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
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 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 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
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
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00
James Chen 31cbc0cbf8 issue #2129: [TestCpp] A typo fix. 2013-06-20 14:08:22 +08:00
James Chen 74048d7eec issue #2129: [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix. 2013-06-20 14:04:44 +08:00