samuele3
c47b104eca
issue #2103 Add more lua test case(Add PerformanceParticleTest of PerformanceTest)
2013-05-10 14:59:21 +08:00
samuele3
4e73425622
issue #2103 Add more lua test case(Add ToucheTest of PerformanceTest)
2013-05-09 16:59:39 +08:00
samuele3
e264582254
issue #2103 Add more lua test case(Add TextureTest of PerformanceTest)
2013-05-09 14:46:48 +08:00
samuele3
c39d6e2977
issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)
2013-05-09 11:31:40 +08:00
samuele3
c76a373c60
issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)
2013-05-09 09:57: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 Chen
cb6d274fd3
Removing CocosPlayer project since it was moved to https://github.com/cocos2d/cocos2d-player
2013-05-08 10:08:32 +08:00
minggo
b18ddf8b5a
Merge pull request #2524 from samuele3hu/FirstBranch
...
issue #2103 : Add more lua test case
2013-05-07 19:01:37 -07: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
samuele3
305c7d9deb
Add a newline
2013-05-07 16:14:23 +08: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
samuele3
20e802f1bc
issue #2103 : Add more lua test case
2013-05-06 16:05:20 +08: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
James Chen
52efa87b69
Updating JS-Test.
2013-04-27 17:59:22 +08:00
minggo
afb91e752d
include cocos2d.h to make android template work
2013-04-27 17:16:27 +08:00
James Chen
50255d772e
[CocoPlayer] Small fix for iOS project.
2013-04-27 17:15:57 +08:00
James Chen
8f6a271b54
Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer
2013-04-27 16:55:29 +08:00
minggo
651a42beaf
set design resolution for WatermelonWithme
2013-04-27 14:54:53 +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
0d18032f38
[Blackberry] Adding the resources of TestCpp for TestLua.
2013-04-27 14:41:30 +08:00
James Chen
6f5970491e
[Blackberry] Adding resources for TestLua.
2013-04-27 14:17:14 +08:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
minggo
de60057621
Merge pull request #2472 from minggo/master
...
disable depth test for clipping test
2013-04-26 20:34:38 -07:00
minggo
fa0370bba5
disable depth test for clipping test
2013-04-27 11:33:23 +08:00
minggo
9f7d091e95
Merge pull request #2470 from minggo/master
...
disable menutest in lua
2013-04-26 20:18:23 -07:00
minggo
ff207b68e0
disable menutest in lua
2013-04-27 11:17:10 +08:00
James Chen
5b45f85216
[HelloLua] print ~> cclog
2013-04-27 09:48:35 +08:00
Rohan Kuruvilla
d7020a7ab2
Adding new status messages for Android
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
8209fa56a2
Fixing bug where screen rotate would keep creating new NSD services
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
eb85a6c1fb
Handle evalScript from JNI. Also adds helpers for settings status
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
615329eee5
Add evalScript over the network code and force portrait mode on stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
374c456749
change orientation to Portrait on CCB Stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
ece710c4d8
Adding eval script wrapper for ScriptingCore to AppDelegate
2013-04-26 13:41:15 -07:00
minggo
d40fdd24b7
fixed #2075:add SpiteTest into Android.mk
2013-04-26 14:02:13 +08:00
minggo
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
minggo
62231912be
Merge https://github.com/cocos2d/cocos2d-x
2013-04-26 10:36:46 +08:00
Rohan Kuruvilla
c12268bd70
Modifying little log statements
2013-04-25 18:44:59 -07:00
Rohan Kuruvilla
56a1ba9e42
Removing unneeded code
2013-04-25 18:41:58 -07:00
Rohan Kuruvilla
e2edc04946
Fixing handling starting and stopping of NSD service in Android
2013-04-25 18:41:53 -07:00
Rohan Kuruvilla
8a59680175
Removing onSurfaceChange update since it was being executed after ccb_run. This resulted in frame size being changed after game was running (bug)
2013-04-25 18:41:48 -07:00
Rohan Kuruvilla
188f0354f3
Fixing configChanges flag to disable GL context being deleted on rotate
2013-04-25 18:41:43 -07:00
Rohan Kuruvilla
b1f9dd30e7
Using iOS specific text entry for setting pairing code
2013-04-25 18:41:38 -07:00
Rohan Kuruvilla
76f334797d
Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets
2013-04-25 18:41:33 -07:00
Rohan Kuruvilla
2636bafd0c
Fixing network logging for Android and iOS
2013-04-25 18:41:29 -07:00
Rohan Kuruvilla
cecb157f22
Fixing rotation for iOS
2013-04-25 18:41:24 -07:00
Rohan Kuruvilla
0378a97fa0
Adding sending of filelist when reset is pressed on iOS
2013-04-25 18:41:18 -07:00
Rohan Kuruvilla
7bd3f2a260
Fixing resolution handling for iOS and Android
...
1. Adding iPhone5 support
2. Changing Android resolution management based on DPI (Tablet mode or Phone mode)
3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly
4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio
5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)
2013-04-25 18:41:14 -07:00
Rohan Kuruvilla
f95b802866
Adding rudemntary support for Rotation in Android
2013-04-25 18:41:01 -07:00
Rohan Kuruvilla
bb91f1eb30
Adding rudementary support for Rotation in iOS
2013-04-25 18:40:56 -07:00
Rohan Kuruvilla
d8c30e0c5b
Adding log redirect over the network for iOS. Also fixing Stop command crash in Android
2013-04-25 18:39:51 -07:00
Rohan Kuruvilla
e6fc611346
Commiting out orientation change code. was causing gl errors with landscape games
2013-04-25 18:39:47 -07:00
Rohan Kuruvilla
9b86791eef
Adding CocosPlayer for iOS
2013-04-25 18:39:43 -07: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
James Chen
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
minggo
b6c8e78149
remove js files from compiling
2013-04-25 18:37:27 +08:00
minggo
3f72473aba
Merge https://github.com/cocos2d/cocos2d-x
2013-04-25 16:25:55 +08:00
James Chen
7bd1d8cde1
Updating cocos2d-js-tests.
2013-04-25 16:16:39 +08:00
James Chen
9913358dde
Updating TestJavascript project configuration.
2013-04-25 14:31:11 +08:00
minggo
9881012459
Merge https://github.com/cocos2d/cocos2d-x
2013-04-25 12:01:59 +08:00
James Chen
631b08e984
Updating project configuration for iOS.
2013-04-25 11:30:35 +08:00
minggo
fb7851b429
define checkAnim() before using it
2013-04-24 17:06:59 +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
minggo
d4efbcfcef
don't include unneeded header file
2013-04-23 10:10:14 +08:00
Sergey Shambir
8507f7a386
network: Added PUT and DELETE request types
2013-04-21 20:54:52 +04: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
James Chen
f129b94e2d
Removing unused file(uthash.h) in JSB projects.
2013-04-19 11:09:02 +08:00
minggo
37dc03b7d6
Merge pull request #2404 from minggo/assetmanager
...
fix a compiling error
2013-04-18 19:36:03 -07:00
minggo
f9aa710c36
fix a compiling error
2013-04-19 10:34:40 +08:00
Dawid Drozd
a153fa1f94
Fixing linking errors for TestCPP with libcurl
2013-04-18 12:14:18 +02:00
James Chen
41b0345e9c
Removing unused file (uthash.h) in Project.pbxproj.
2013-04-18 13:52:25 +08:00
minggo
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
James Chen
a005852fa5
issue #1847 : Using luajit for win32.
2013-04-17 10:46:38 +08:00
James Chen
928b6ad361
issue #1847 : Fix a typo in Ball.lua and Paddle.lua.
2013-04-17 09:52:26 +08:00
James Chen
6a56bb6d73
issue #1847 : [iOS] Using LuaJit for HelloLua and TestLua.
2013-04-17 09:51:28 +08:00
James Chen
79d58bcdb9
issue #1847 : Adding sources of Luajit2.0.1-hotfix, and adding android support.
2013-04-16 17:34:58 +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
Rohan Kuruvilla
3d7e8f0d84
Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation
2013-04-09 15:29:35 -07: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
James Chen
1a44f776f8
fixed #2005 : Adding CurrentLanguageTest for Testlua.
2013-04-07 16:34:07 +08:00
James Chen
268bd4dfad
fixed #2004 : Adding UserDefaultTest for TestLua.
2013-04-07 16:20:43 +08:00
James Chen
1913b2b3a5
[TestLua] The menu item of Tests which is not supported will be disabled.
2013-04-07 16:06:53 +08:00
James Chen
fce5deb0ec
Refactoring mainmenu.lua.
2013-04-07 15:56:05 +08:00
James Chen
ef731879f1
Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj
...
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-06 20:20:33 -07:00
James Chen
684c659ba7
Merge pull request #2311 from dumganhar/iss2002-more-luatest
...
fixed #2002 : Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
2013-04-06 19:45:28 -07:00
James Chen
6e1cf1e951
fixed #2002 : Adding EffectsAdvancedTest for TestLua.
2013-04-07 10:38:56 +08:00
minggo
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07:00
James Chen
85b0fd306a
Adding CocosDenshionTest.
2013-04-06 14:32:46 +08:00
James Chen
63c0ede945
Removing a comment.
2013-04-06 14:00:59 +08:00
James Chen
5171e11765
Adding FontTest for TestLua.
2013-04-06 14:00:17 +08:00
James Chen
17b948367a
Adding ZwoptexTest.
2013-04-05 23:34:46 +08:00
James Chen
e754909c5f
Adding RenderTexture test for TestLua.
2013-04-05 17:13:46 +08:00
James Chen
2bff6d6480
Adding Texture2dTest. And format some lua codes.
2013-04-05 16:13:04 +08:00
James Chen
425b95152c
Merge pull request #2295 from SevInf/master
...
fixed #1999 : CCEditBox iOS enchantments/bugfixes
2013-04-03 07:37:29 -07:00
Sergej Tatarincev
202edc1597
CCEditBox test for separate font name/size setters
2013-04-03 17:20:01 +03:00
James Chen
031e77ccbe
Updating SceneTest.lua.
2013-04-03 18:31:00 +08:00