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
cd166c789f
Add missing files to testcpp makefile
2013-05-06 21:17:22 -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
6994d451fe
Correct the resolution in main.cpp for TestCpp for Emscripten
2013-05-06 20:59:49 -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
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
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
Hojin Choi
8b9644150d
Changes samples' function prototypes to apply newly introduced callback type.
2013-04-28 23:42:31 +09:00
tiantian
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +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
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
minggo
c6dfee706c
fix memory leak in FontTest
2013-04-24 14:49:52 +08:00
James Chen
7b138c6be9
issue #2075 : Adding spinetest in TestCpp for win32.
2013-04-24 14:48:39 +08:00
James Chen
0c3cb27113
issue #2075 : Updating TestCpp for mac.
2013-04-24 14:34:41 +08:00
James Chen
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
Sergey Shambir
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
Dawid Drozd
a153fa1f94
Fixing linking errors for TestCPP with libcurl
2013-04-18 12:14:18 +02:00
minggo
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
Sam Clegg
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
James Chen
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
James Chen
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
Roger Zanoni
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
James Chen
6e9fcf8c05
fixed #2048 : Adding test case for variable cell sizes in CCTableView.
2013-04-10 16:38:00 +08:00
James Chen
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
James Chen
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08:00
James Chen
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
minggo
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07:00
Sergej Tatarincev
202edc1597
CCEditBox test for separate font name/size setters
2013-04-03 17:20:01 +03:00
waiter
c9e36438a8
Add ActionRemoveSelf in TestCpp/ActionTest
...
Add ActionRemoveSelf in TestCpp/ActionTest
2013-04-01 10:18:26 +08:00
Andre Rudlaff
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
Éloi Rivard
2664c5e4b9
Makefile
2013-03-29 09:41:15 +01:00