Commit Graph

437 Commits

Author SHA1 Message Date
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
Lee, Jae-Hong 690e383950 Adding HelloCpp sample for Tizen. 2013-05-16 19:52:59 +09:00
minggo 1a947ce1cd Merge pull request #2567 from minggo/AssetsManager-asynchronization
Make AssetsManager download resources in a new thread
2013-05-15 20:24:05 -07:00
carlo morgantini 36b88039a1 CCLabelTTF C++ test fixed 2013-05-15 16:37:08 -07:00
carlo morgantini cab90dd276 CCTextDefinition is passed now by pointers 2013-05-15 16:35:24 -07:00
carlo morgantini 2430d79642 changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF 2013-05-15 16:29:33 -07:00
carlo morgantini c727fa33c0 CCLabelTTF have now a tint, plus bug fixing and code clean up 2013-05-15 16:29:33 -07:00
carlo morgantini 221884f6d4 better CCTexture2D API for init texture with shadow and stroke 2013-05-15 16:29:32 -07:00
carlo morgantini dd9b4a8932 new shadow and stroke for CCLabelTTF 2013-05-15 16:12:43 -07:00
minggo d8a0b0c130 issue #1859:download resources in a new thread 2013-05-15 17:09:28 +08:00
James Chen dea45e8e79 fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite. 2013-05-13 17:57:30 +08:00
James Chen 8ebde4df7f Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor 2013-05-10 15:54:47 +08:00
James Chen db464530fb fixed #2142: updating win32. 2013-05-10 15:46:24 +08:00
James Chen 42427634f2 fixed #2142: Adding datavisitor support for other platforms except win32. 2013-05-10 15:37:40 +08:00
James Chen cbafaf67a6 fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok. 2013-05-10 15:07:05 +08:00
minggo ee8ec25f6a Merge pull request #2541 from j4m3z0r/emscriptenate
Compile for Emscripten in asm.js mode
2013-05-08 18:53:35 -07:00
Ed Bartley 2e8abad402 Merge pull request #1 from minggo/TexturePacker-SpriteSheetProtection
Add TexturePackerEncryptionTest for other platforms
2013-05-08 07:25:09 -07:00
Ed Bartley 3216995d4a Merge branch 'master' into TexturePacker-SpriteSheetProtection 2013-05-08 10:22:14 -04:00
minggo 5e660e9c71 add TexturePackerEncryptionTest into vs2010 project 2013-05-08 11:32:59 +08:00
James Chen 3c39cb336c Don't use "recursive" property to search header file in "cocos2d-x/external" folder for TestCpp project. 2013-05-08 11:23:05 +08:00
minggo 806c728a2d add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project 2013-05-08 10:53:24 +08:00
minggo 8e78f8a7eb Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection 2013-05-08 10:32:26 +08:00
James Gregory 25bded7faf Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten. 2013-05-07 17:25:39 -07:00
Ed Bartley 3ff7e5871c Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call.
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
2013-05-07 10:14:38 -04:00
James Chen 912905054e fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods.
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii

Conflicts:
	extensions/network/HttpClient.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
2013-05-07 15:37:25 +08:00
James Chen 140927494a Updating http test url, removing www prefix. 2013-05-07 15:13:55 +08:00
minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate
fix conflict of #2050
2013-05-06 23:51:38 -07:00
James Chen a9aafdafac Merge pull request #2490 from coolengineer/pull-request-httpclient
fixed #2119: Introduce HttpResponse callback selector type to resolve #2365, fixed version ;-)
2013-05-06 23:44:20 -07:00
James Chen 2418e72a0e Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff
Implement CCDictionary::writeToFile();
2013-05-06 23:17:11 -07:00
James Gregory 5be2da896a Add resources to TestCpp makefile 2013-05-06 21:29:43 -07:00
James Gregory 568562fac9 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 21:29:43 -07:00
James Gregory cd166c789f Add missing files to testcpp makefile 2013-05-06 21:17:22 -07:00
James Gregory 4581fa7309 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 21:06:07 -07:00
James Gregory 6bbd6ddf6c Add missing fonts to TestCpp makefile, fixing layertest. 2013-05-06 21:00:39 -07:00
James Gregory 83612c98f9 Add missing assets from TestCpp's Makefile 2013-05-06 21:00:39 -07:00
James Gregory 7cb51f4eb4 Add missing assets from "Extentions" to TestCpp. 2013-05-06 21:00:39 -07:00
James Gregory 5bd1ea9d41 Delete tmp directory after generating data file. 2013-05-06 20:59:50 -07:00
James Gregory 6994d451fe Correct the resolution in main.cpp for TestCpp for Emscripten 2013-05-06 20:59:49 -07:00
James Gregory ac2986139a Copy resources in HelloCpp makefile 2013-05-06 20:59:47 -07:00
James Gregory 749c92a572 Basis of Makefile for SimpleGame sample. 2013-05-06 20:59:47 -07:00
James Gregory 297f0fb0ac Add resources to TestCpp makefile 2013-05-06 20:59:47 -07:00
James Gregory 130ab4b584 Disable libcurl tests for Emscripten. 2013-05-06 20:59:47 -07:00
James Gregory 51d42d7392 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-06 20:59:47 -07:00
James Gregory aa2739a109 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 20:58:45 -07:00
James Gregory 9d6db6953e Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 20:58:45 -07:00
James Gregory 5a23190672 Add main.cpp files for app samples 2013-05-06 20:58:43 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
minggo 923234a095 Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl
Fixing linking errors for TestCPP with libcurl
2013-05-06 20:52:58 -07:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format
Added __attribute__(__format__()) for CCLog and CCString
2013-05-06 20:06:52 -07:00
Ed Bartley 040e6fc5b9 Promote global functions and variables for PVR decryption to ZipUtils class.
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
2013-05-06 10:04:45 -04:00
minggo 73dba9ef2c Merge pull request #2514 from savdalion/extend-tests
Added example for russian language in TestCpp / LabelTest / BMFontUnicode
2013-05-05 23:52:30 -07:00
James Chen f12d118cb9 Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis 2013-05-06 10:24:28 +08:00
savdalion bade1f086d Added example for russian language in TestCpp / LabelTest / BMFontUnicode. 2013-05-04 15:28:24 +03:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level)
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
2013-04-30 23:33:22 +01:00
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
Hojin Choi 8b9644150d Changes samples' function prototypes to apply newly introduced callback type. 2013-04-28 23:42:31 +09:00
minggo 55e4de40f6 make AssetsManagerTest and TestLua run on iOS device 2013-04-28 11:19:03 +08:00
tiantian 2ba5035e5a Make sure XMLDocument is deleted; Code clean up; Add test; 2013-04-28 00:36:37 +08:00
minggo cd0cf6eee9 Merge https://github.com/cocos2d/cocos2d-x 2013-04-27 18:30:41 +08:00
minggo afb91e752d include cocos2d.h to make android template work 2013-04-27 17:16:27 +08:00
James Chen 7f70a4c6e8 Merge pull request #2474 from dumganhar/bb-fixes
Some fixes for Blackberry port.
2013-04-26 23:48:12 -07:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +08:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
Ed Bartley f89d39953e Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection
Add sample to TestCPP.
2013-04-25 13:40:49 -04:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support
fixed #2075: Adding spine editor support.
2013-04-24 01:12:23 -07:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00