Commit Graph

607 Commits

Author SHA1 Message Date
Ricardo Quesada 398c6593f0 JS Tests: Almost working on Mac 2013-06-26 23:45:08 -07: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 86646bb820 issue #2329:fixed a compiling error of AssetsManager on Android 2013-06-25 17:09:10 +08: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
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 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 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +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 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
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
James Chen e3ed28a8fb issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*. 2013-06-20 14:02:14 +08:00
James Chen b55a0dee2b issue #2129: using cocos2d::extension::armature namespace for Armature extension. 2013-06-20 13:48:43 +08:00
James Chen 7ce6ef04f8 issue #2129: [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest. 2013-06-20 13:43:40 +08:00
samuele3hu b818001007 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-19 16:43:15 +08:00
samuele3hu b48cf5997d issue #2277: Add OpenGL lua test samples 2013-06-19 16:40:02 +08:00
James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate
Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
2013-06-19 13:03:51 +08:00
Ricardo Quesada a90f6c9b41 config resources are part of TestCpp for iOS 2013-06-18 16:52:52 -07:00
Ricardo Quesada 3d2862f8f7 Converts copy->autorelease() to clone()
... in the samples
2013-06-18 16:12:28 -07:00
James Gregory 88648aafc4 Update to testcpp makefile to include all assets, rather than cherrypicking. 2013-06-18 16:12:05 -07:00
Ricardo Quesada 159ef1ec68 clone() doesn't use copy constructor
... and other bug fixes
2013-06-18 15:06:53 -07:00
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
2013-06-18 09:59:34 -07:00
James Chen 3cd82c8bf3 Merge pull request #2917 from pyrasis/tizen_2.1
[Tizen] Enable Hardware Acceleration.
2013-06-18 04:32:18 -07:00
Lee, Jae-Hong 4b828cfff2 Enable Hardware Acceleration. 2013-06-18 19:17:49 +09:00
James Gregory ad90fe88a8 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-06-17 20:30:36 -07:00
James Gregory 84cf597738 Simple logging controls in testcpp index.html 2013-06-17 20:29:57 -07:00
James Chen 2c0cc603d1 Merge branch 'master' into develop
Conflicts:
	extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes
issue #2129: New naming of member varibles, renaming m_iVar to _var.
2013-06-17 03:27:01 -07:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
James Chen 8b298fab0e issue #2284: fixing windows build. 2013-06-16 11:19:47 +08:00
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet.
Many methods not implemented yet.
2013-06-15 18:54:34 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
Ricardo Quesada 8a6d33a212 Adds CC prefix to CALLBACK()
Now it is called: CC_CALLBACK()
2013-06-13 20:36:43 -07:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1
Support Tizen device
2013-06-12 22:56:23 -07:00
minggo 5996e99b74 Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
2013-06-12 22:51:21 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada 83b43ab93e Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
Handy macros for callbacks.
Instead of:
	std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
	CALLBACK_1(func_ptr, instance)

And also removes more warnings from the tests
2013-06-11 16:30:05 -07:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
James Chen 4948de6462 [VS2012] Warning fixes. 2013-06-10 11:44:16 +08:00
James Chen a14df8d28d issue #2271: Fixing some memory leaks. 2013-06-10 11:43:43 +08:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen 3632693cd9 Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value. 2013-06-09 16:09:56 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
James Chen 132fd591c1 [TestCpp] Commenting the line of loading configuration file in TestCpp. 2013-06-09 15:29:51 +08:00
James Chen fd37cdf8df SimpleGame doesn't depend on extension now. 2013-06-09 14:02:49 +08:00
James Chen 44c6043a3f Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-master 2013-06-09 10:40:44 +08:00
yinkaile af819c6db5 Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x 2013-06-08 22:09:34 +08:00
yinkaile d29931dc4f 1.add hd resource
2.remove zobie resource
3.support frame event
2013-06-08 22:08:22 +08:00
chengstory 86f4b96f05 Merge branch 'master111'
Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
2013-06-08 20:01:25 +08:00
chengstory c2e85c1ae4 1. adds support for iOS and Mac.
2.  Modify position of some examples.
2013-06-08 17:11:11 +08:00
James Chen bb8a0d2859 Updating iOS Project after adding Armature support. 2013-06-08 16:08:05 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
yinkaile 8ff088da53 Standardize code 2013-06-08 12:14:43 +08:00
yinkaile cba46082ce Standardize code 2013-06-08 11:48:45 +08:00
carlo morgantini 494ec43fe8 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-08 10:59:07 +08:00
James Chen ba5972ef79 [C++ 11] Bug fix for the usage of lambda in testBasic.cpp while using GCC compiler. 2013-06-08 10:25:53 +08:00
Ricardo Quesada 022dfc0acc CPP Tests migrated to the new C++11 API
Many tests were converted to the C++11 API
and some tests were also simplified by using the "CL" macro
instead of the "CF" macro.
2013-06-07 17:21:11 -07:00
carlo morgantini b7ffb5b810 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-07 16:33:01 -07:00
yinkaile 7c924c714f Standardize code 2013-06-07 22:56:54 +08:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
James Chen 7c650d7f28 [BB] Updating project configuration. 2013-06-07 18:45:58 +08:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
James Chen 942c797749 Removing unused codes. 2013-06-07 15:39:18 +08:00
James Chen 522a091d72 Adding BaseTest in TestCpp for Android, emscripten, linux, nacl and marmalade. 2013-06-07 14:37:06 +08:00
James Chen 8cfe969137 Fixing compilation errors for win32. 2013-06-07 14:31:15 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
Ricardo Quesada 80117afc82 Adds Base class to tests
Base class displays the Menu( <- O -> )
Improved in some tests the way to create entries.
Instead of defining the tests twice: the "create" method, and the entry
   in the array, it is only needed in the array (ActionsTest, SpriteTest
   and Texture2DTest)
2013-06-06 17:12:28 -07:00
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
2013-06-06 12:23:44 -07:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
James Chen 5832934e41 Reverting target to android-8. 2013-06-06 16:20:22 +08:00
James Chen deceba3fd2 Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes 2013-06-06 15:52:33 +08:00
Rene Klacan 8b16178f9f Merge pull request from cocos2d/develop 2013-06-06 09:42:18 +02:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
James Chen f22d320797 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 2013-06-06 14:24:58 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x.
Also adds %p where it was missing.
And make a few fixes on the iOS project
2013-06-05 18:21:05 -07:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
2013-06-05 17:51:40 -07:00
James Chen 1bb73e50df Fixing a warning in Bug-458.cpp 2013-06-05 18:18:59 +08:00
James Chen dc8cfeb648 Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback 2013-06-05 16:40:25 +08:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2
1.  change “bool isEnabled()”  to "bool isEnabled() const".
2013-06-05 00:52:32 -07:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const".
2.  dolete license.
2013-06-05 15:05:49 +08:00
James Chen 993070b27e Minor fix in CCConfiguration. 2013-06-05 09:47:29 +08:00
Ricardo Quesada d27da88c06 Adds setObject to CCConfiguration
also adds the test

Conflicts:
	scripting/javascript/bindings/generated
2013-06-05 09:46:56 +08:00
James Chen 26219d4a14 Minor fix in CCConfiguration. 2013-06-05 09:41:03 +08:00
James Chen 2a16a6b17f Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value 2013-06-05 09:36:53 +08:00
Ricardo Quesada 4b37ec252a Adds C++11 std::function<> support to MenuItem
Updates some of the tests
2013-06-04 18:29:26 -07:00
Ricardo Quesada 337f966d0f It was using an clang extension for tuples<>
Instead of converting it to pairs<>, which is compatible with gcc,
I converted it to C structs.
2013-06-04 10:03:32 -07:00
Ricardo Quesada f22092c7fc Merge branch 'develop' into testmenu_sorted 2013-06-04 09:53:49 -07:00
chengstory a5f8e2c27e no message 2013-06-04 17:54:05 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
René Klačan f66e12f414 Merge pull request #4 from cocos2d/develop
pull request from main repo
2013-06-04 02:05:36 -07:00
James Chen 1610854902 fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:09:19 +08:00
James Chen 988269f9fa fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:03:10 +08:00
flaming0 39ce9b4813 Update spine runtime 2013-06-04 14:46:46 +08:00
Ricardo Quesada dccc4a3814 adds mising tests + cosmetic changes 2013-06-03 22:47:28 -07:00
James Chen 5d89a0cd0c Merge branch 'develop' into update-spine-runtime-develop
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-04 13:46:05 +08:00
Ricardo Quesada cc771da2c2 Merge branch 'develop' into testmenu_sorted 2013-06-03 22:35:55 -07:00
Ricardo Quesada cd52912f66 Main menu from test is sorted alphabetically
Code was refactored. Now it is super easy to add a new test.
No need to add it in 3 different places
2013-06-03 22:33:52 -07:00
Ricardo Quesada 69e8628626 Adds setObject to CCConfiguration
also adds the test
2013-06-03 13:49:06 -07:00
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc
And fixes some minor issues on the iOS and OS X projects
2013-06-03 12:13:24 -07:00
René Klačan 9e4c5bbca3 Merge pull request #3 from cocos2d/develop
pull request from main repo
2013-06-03 04:07:43 -07:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 236286829b enable c++11 2013-06-03 11:02:35 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
James Chen 2fdeab46b1 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:12:55 +08:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
James Chen d0680258c6 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:03:38 +08:00
James Chen f2f0f031c7 fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 09:55:43 +08:00
flaming0 b87a89eaa4 Update spine runtime 2013-06-02 19:59:13 +04:00
James Chen 4b8f76c903 WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-02 18:56:49 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB.
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
Rene Klacan 7c9a765e64 TestCpp sample respects keyboard support directive 2013-06-02 04:28:46 +02:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
Rene Klacan a6f229a376 assert for fwrite return value 2013-06-01 02:06:11 +02:00
Rene 61ec83b742 Merge pull request #1 from cocos2d/develop
Develop
2013-05-31 16:27:23 -07:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
Rene Klacan 07d6fefd8a fixed typo that return value was ignored 2013-05-31 14:31:26 +02:00
Rene Klacan 50ad3e1c80 KeyboardDispatcher + tests for it on linux 2013-05-31 14:29:32 +02:00
minggo 57600783c4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-05-31 10:29:39 +08:00
Ricardo Quesada 3383fc5f04 CCConfiguration supports default values in the query
Adds tests for the new API as well
2013-05-31 10:25:34 +08:00
Ricardo Quesada f6665d492b CCConfiguration supports default values in the query
Adds tests for the new API as well
2013-05-30 16:10:31 -07:00
minggo 1ff88de561 Merge pull request #2666 from jotel/ccdata-in-userdefault
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 19:40:23 -07:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master
adding norwegian language
2013-05-29 02:10:37 -07:00
Ricardo Quesada a219f9c520 CCConfiguration has format
CCconfiguration has a file format.
It has a data and metadata
2013-05-29 17:09:04 +08:00
franck 81a0fed3e2 adding norwegian language... 2013-05-29 10:31:46 +02:00
Ricardo Quesada ebb392ca8e CCConfiguration has format
CCconfiguration has a file format.
It has a data and metadata
2013-05-28 18:15:16 -07:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
James Chen 731b3c2324 fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest. 2013-05-23 10:09:35 +08:00
Ricardo Quesada 207fc4be9c Adds ConfigurationTest to the suite 2013-05-22 17:56:05 -07:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1
Update projects to Tizen 2.1 SDK.
2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
James Chen 5c506e2edc Merge pull request #2607 from pyrasis/background_foreground_tizen
Implementing foreground and background status for Tizen port.
2013-05-21 21:43:51 -07:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate
Add Audio Support for Emscripten
2013-05-21 18:32:12 -07:00
Lee, Jae-Hong d83ed86739 Implementing foreground and background status and modify CocosDenshion comment. 2013-05-21 22:48:51 +09:00
Lee, Jae-Hong 6f34c7cb46 Support Tizen 2.1 SDK. 2013-05-21 21:22:31 +09:00
minggo cc2b00e9fe Merge pull request #2573 from j4m3z0r/emscriptenate
Use browser font rendering instead of FreeType
2013-05-20 22:50:28 -07:00
James Gregory da7113a04f Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them. 2013-05-20 20:09:56 -07:00
James Chen acef98a350 Merge pull request #2572 from pyrasis/tizen
fixed #2185: Cocos2d-x Tizen support.
2013-05-20 20:08:28 -07:00
Lee, Jae-Hong e1a947637f Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame. 2013-05-21 10:43:24 +09:00
James Gregory a1ff189854 Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768). 2013-05-17 12:39:18 -07:00
minggo 59a6635c7b issue #1859:fix compiling error of AssetsManager.cpp 2013-05-17 09:47:31 +08:00
Lee, Jae-Hong 20dffcd179 Adding SampleGame project. for Tizen. 2013-05-16 21:20:49 +09:00
Lee, Jae-Hong 1c170aedd3 Adding README.mdown for TestCpp 2013-05-16 20:52:19 +09:00
Lee, Jae-Hong 65373f828c Adding README.mdown for HelloCpp 2013-05-16 20:52:00 +09:00
Lee, Jae-Hong bef09d51f9 Adding placeholder.txt for samples/Cpp/HelloCpp/proj.tizen/res directory. 2013-05-16 20:49:13 +09:00
Lee, Jae-Hong 6b990209a2 Set the static libarary pathes. 2013-05-16 20:25:12 +09:00
Lee, Jae-Hong 6289a20fcb Adding design size for Tizen. 2013-05-16 20:23:21 +09:00
Lee, Jae-Hong fc28943b3f set screen orientation landscape. TestCpp project. 2013-05-16 20:17:41 +09:00
Lee, Jae-Hong 2a332a5862 Replace \ to / in include and library pathes. 2013-05-16 20:16:27 +09:00
Lee, Jae-Hong c426370f63 Replace tab to spaces. 2013-05-16 20:14:40 +09:00
Lee, Jae-Hong bd71c8775d Modify library link order. 2013-05-16 20:14:16 +09:00
Lee, Jae-Hong 09a0eec90a Enable chipmunk. 2013-05-16 20:14:03 +09:00
Lee, Jae-Hong 34599daf9d Enable Box2D. 2013-05-16 20:13:36 +09:00
Lee, Jae-Hong 9bbfdf2adb Adding placeholder.txt files. 2013-05-16 20:12:31 +09:00
Lee, Jae-Hong ca69bf39c8 Modify the output filename. 2013-05-16 20:11:33 +09:00
Lee, Jae-Hong e445af65ad Adding license. 2013-05-16 20:11:14 +09:00
Lee, Jae-Hong 9db7b7f3a3 Adding TestCpp project for Tizen. 2013-05-16 20:10:53 +09:00
Lee, Jae-Hong e459129fac Move to rootstraps directory. 2013-05-16 20:06:25 +09:00
Lee, Jae-Hong 7e1be64f28 Allocate memory for AppDelegate. 2013-05-16 19:59:59 +09:00
Lee, Jae-Hong ab8ede5ff8 Adding Osp Application, Osp Form Layer and implementing CCEGLView. 2013-05-16 19:55:26 +09:00
Lee, Jae-Hong 112ff3c820 Adding manifest.xml. 2013-05-16 19:55:00 +09:00
Lee, Jae-Hong e286759965 Adding placeholder.txt 2013-05-16 19:54:38 +09:00