db464530fb
fixed #2142 : updating win32.
2013-05-10 15:46:24 +08:00
42427634f2
fixed #2142 : Adding datavisitor support for other platforms except win32.
2013-05-10 15:37:40 +08:00
cbafaf67a6
fixed #2142 : Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok.
2013-05-10 15:07:05 +08:00
ee8ec25f6a
Merge pull request #2541 from j4m3z0r/emscriptenate
...
Compile for Emscripten in asm.js mode
2013-05-08 18:53:35 -07:00
2e8abad402
Merge pull request #1 from minggo/TexturePacker-SpriteSheetProtection
...
Add TexturePackerEncryptionTest for other platforms
2013-05-08 07:25:09 -07:00
3216995d4a
Merge branch 'master' into TexturePacker-SpriteSheetProtection
2013-05-08 10:22:14 -04:00
5e660e9c71
add TexturePackerEncryptionTest into vs2010 project
2013-05-08 11:32:59 +08:00
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
806c728a2d
add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project
2013-05-08 10:53:24 +08:00
8e78f8a7eb
Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection
2013-05-08 10:32:26 +08:00
25bded7faf
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
2013-05-07 17:25:39 -07:00
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
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
140927494a
Updating http test url, removing www prefix.
2013-05-07 15:13:55 +08:00
d58f21dc76
Merge pull request #2521 from minggo/emscriptenate
...
fix conflict of #2050
2013-05-06 23:51:38 -07:00
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
2418e72a0e
Fix compilation errors for linux port.
2013-05-07 14:36:01 +08:00
1166a02e13
resolve conflict for #2505
2013-05-07 14:31:00 +08:00
ea5d7bc5ad
Merge pull request #2361 from tiantian20007/dictStuff
...
Implement CCDictionary::writeToFile();
2013-05-06 23:17:11 -07:00
5be2da896a
Add resources to TestCpp makefile
2013-05-06 21:29:43 -07:00
cd166c789f
Add missing files to testcpp makefile
2013-05-06 21:17:22 -07:00
6bbd6ddf6c
Add missing fonts to TestCpp makefile, fixing layertest.
2013-05-06 21:00:39 -07:00
83612c98f9
Add missing assets from TestCpp's Makefile
2013-05-06 21:00:39 -07:00
7cb51f4eb4
Add missing assets from "Extentions" to TestCpp.
2013-05-06 21:00:39 -07:00
6994d451fe
Correct the resolution in main.cpp for TestCpp for Emscripten
2013-05-06 20:59:49 -07:00
297f0fb0ac
Add resources to TestCpp makefile
2013-05-06 20:59:47 -07:00
130ab4b584
Disable libcurl tests for Emscripten.
2013-05-06 20:59:47 -07:00
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
5a23190672
Add main.cpp files for app samples
2013-05-06 20:58:43 -07:00
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
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
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
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
bade1f086d
Added example for russian language in TestCpp / LabelTest / BMFontUnicode.
2013-05-04 15:28:24 +03:00
212feb8d8c
Add CCDirector::popToSceneStackLevel(int level)
...
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bffhttp://github.com/cocos2d/cocos2d-x/pull/2210
2013-04-30 23:33:22 +01:00
8b9644150d
Changes samples' function prototypes to apply newly introduced callback type.
2013-04-28 23:42:31 +09:00
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +08:00
7f70a4c6e8
Merge pull request #2474 from dumganhar/bb-fixes
...
Some fixes for Blackberry port.
2013-04-26 23:48:12 -07:00
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
fa0370bba5
disable depth test for clipping test
2013-04-27 11:33:23 +08:00
d40fdd24b7
fixed #2075:add SpiteTest into Android.mk
2013-04-26 14:02:13 +08:00
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
93ed85903f
Merge pull request #2437 from dumganhar/iss2075-spine-support
...
fixed #2075 : Adding spine editor support.
2013-04-24 01:12:23 -07:00
abacdc9921
tabify for makefile.
2013-04-24 15:15:25 +08:00
8e5610fc58
issue #2075 : Updating Makefile of TestCpp for native client port.
2013-04-24 15:00:53 +08:00
6c1890f8ab
issue #2075 : Updating TestCpp project setting for marmalade and linux.
2013-04-24 14:58:11 +08:00
c6dfee706c
fix memory leak in FontTest
2013-04-24 14:49:52 +08:00
7b138c6be9
issue #2075 : Adding spinetest in TestCpp for win32.
2013-04-24 14:48:39 +08:00
0c3cb27113
issue #2075 : Updating TestCpp for mac.
2013-04-24 14:34:41 +08:00
2d1172814d
issue #2075 : Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.
2013-04-24 13:57:34 +08:00
8507f7a386
network: Added PUT and DELETE request types
2013-04-21 20:54:52 +04:00
e5b2f300f9
Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors
...
Uses printf format. Enabled for GCC and clang.
2013-04-19 11:54:08 +04:00
a153fa1f94
Fixing linking errors for TestCPP with libcurl
2013-04-18 12:14:18 +02:00
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
ffb7360e46
Enable easy swithing between Box2D and chipmunk in linux and nacl
...
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles. Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.
Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should
never be defined globally like this.
2013-04-15 07:35:50 -07:00
0c8e3e9129
Merge pull request #2349 from rogerzanoni/master
...
fixed #2052 : [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
2013-04-14 19:45:35 -07:00
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
05873ad7a0
Check array boundaries to avoid the "array-bounds" error on linux
...
Compiling on linux causes the error "array subscript is above array
bounds [-Werror=array-bounds]". This commit adds boundary checking
using the constant defining the maximum number of items in the "nuke" array.
Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>
2013-04-10 10:53:52 -04:00
6e9fcf8c05
fixed #2048 : Adding test case for variable cell sizes in CCTableView.
2013-04-10 16:38:00 +08:00
32406efec2
Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
...
Conflicts:
cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08:00
c3a177e5e6
Merge pull request #2268 from Weeds/ccscheduler-fix
...
fixed #2003 : Fixed potential crash in CCScheduler::removeHashElement.
2013-04-08 02:00:22 -07:00
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07:00
202edc1597
CCEditBox test for separate font name/size setters
2013-04-03 17:20:01 +03:00
c9e36438a8
Add ActionRemoveSelf in TestCpp/ActionTest
...
Add ActionRemoveSelf in TestCpp/ActionTest
2013-04-01 10:18:26 +08:00
bcab80a0f1
Added TestCase for crash in CCScheduler
...
The code seems to look wrong (and it sure is) however in real-world
applications it might not be that eays to tell who has ownership of the object,
especially if weak references are involved.
2013-03-29 14:48:35 +01:00
2664c5e4b9
Makefile
2013-03-29 09:41:15 +01:00
b9ec3ead65
* Fixed CocosDenshionTestBug
2013-03-29 09:32:50 +01:00
c9cdb81020
Removing unused codes.
2013-03-25 14:30:25 +08:00
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
e9343c2d8a
- update README files
...
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
7e1efa7c89
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
2013-03-20 14:14:01 +08:00
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
3ed479d7f4
Updating project configuration of TestCpp for win32.
2013-03-19 17:06:12 +08:00
ef98d95e75
Updating project configuration of TestCpp for Android, Linux, Mac and nacl.
2013-03-19 16:59:39 +08:00
6110d5df74
Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader
...
fixed #1838 : Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 01:35:26 -07:00
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
19cf6665c4
Merge pull request #2176 from folecr/easierandroidbuild
...
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
04c1a863a0
Remove tailing newlines from CCLog messaages.
...
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms. The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
2013-03-16 09:01:21 -07:00
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
59ca1e198a
README.md eclipse improvements
...
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
863286b0b9
Fix warning in linux build.
...
Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
2013-03-12 16:59:22 -07:00
ae1c64573e
Merge pull request #2046 from rohankuruvilla/eclipse
...
fixed #1827 : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
3f709c3edb
Merge pull request #2134 from AsadR/remove-all-notifications-for-target
...
fixed #1822 : Added CCNotificationCenter::removeAllObservers(CCObject *target).
2013-03-10 22:41:59 -07:00
c1a8059998
Added CCNotificationCenter::removeAllObservers
...
This is a helper method that removes all observers with a particular
target. It can be used in destuctors to ensure no observers trigger
callbacks on objects that no longer exist.
2013-03-10 19:34:01 +05:00
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
3ce5a99c8d
Merge pull request #2092 from sbc100/fix_all_warnings
...
Fix all compiler warnings produced by gcc.
2013-03-05 17:59:35 -08:00
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
James Chen