James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
James Chen
e3e90db71c
[BB] Adding extra lua script resource folder for TestLua.
2013-06-07 18:16:10 +08:00
samuele3hu
567d1aa039
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 17:49:52 +08:00
samuele3hu
dda3c34be8
issue #2103 add webSocket lua test sample
2013-06-07 17:48:07 +08:00
yinkaile
850ea39107
Standardize code
2013-06-07 17:10:53 +08:00
James Chen
39a21625ec
Merge pull request #2803 from samuele3hu/test_sample_of_http_bind
...
fixed #2103 : Lua bind of websocket and add a test sample
2013-06-07 02:05:55 -07:00
samuele3hu
50f44db9a8
issue #2103 add webSocket lua test sample
2013-06-07 17:02:00 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +08:00
samuele3hu
16a34b0da3
issue #2103 add webSocket lua test sample
2013-06-07 16:51:50 +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
3405dee0ca
Merge pull request #2804 from dumganhar/ricardoquesada-test_base_class
...
Merge https://github.com/cocos2d/cocos2d-x/pull/2796
2013-06-07 00:07:22 -07:00
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +08:00
yinkaile
e1e41f7124
move const value to CCDataReaderHelper.cpp
2013-06-07 14:47:08 +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
Michael Chinen
7e9ba1c468
Merge branch 'develop' of https://github.com/simpliplant/cocos2d-x into simp
2013-06-07 15:16:30 +09:00
James Chen
421f07e8ca
Merge branch 'test_base_class' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-test_base_class
2013-06-07 14:05:25 +08:00
yinkaile
d4116f8478
1.remove #pragma endregion
...
2.change str.compare("")==0 to str.length()==0
2013-06-07 14:01:03 +08:00
samuele3hu
cdbf8b7250
issue #2103 add webSocket lua test sample
2013-06-07 13:55:36 +08:00
James Chen
9f47c80e5f
Merge pull request #2802 from dumganhar/develop
...
Updating multi-platform-xxx template for win32. And some warning fixes.
2013-06-06 21:58:39 -07:00
James Chen
ec8ab8bd8b
Updating multi-platform-xxx template for win32.
2013-06-07 12:57:28 +08:00
samuele3hu
f58d0a04aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 12:57:04 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
James Chen
302106a8a9
Merge pull request #2801 from dumganhar/master
...
Updating multi-platform-xxx template for win32.. And some warning fixes.
2013-06-06 21:52:23 -07:00
James Chen
d72e9d10b5
Updating multi-platform-xxx template for win32.
2013-06-07 12:50:02 +08:00
James Chen
945b41d147
Merge pull request #2799 from dumganhar/master
...
[master] Fix flags for debugger server socket, works on iOS and Android.
2013-06-06 19:57:35 -07:00
James Chen
4f13ac2ea6
Update AUTHORS [ci skip]
2013-06-07 10:55:56 +08:00
folecr
4a9504717b
Fix flags for debugger server socket
...
* Works on iOS and Android
2013-06-07 10:55:44 +08:00
yinkaile
65974f2243
standardize code
2013-06-07 10:52:32 +08:00
minggo
cf674ce5ba
Merge pull request #2795 from flaming0/sd-func-fix-win-build
...
Fix VS build (nullptr instead of NULL when assigning to std function)
2013-06-06 19:48:24 -07:00
James Chen
991daa8b65
Update AUTHORS [ci skip]
2013-06-07 10:47:03 +08:00
James Chen
736fe3c63a
Merge pull request #2792 from folecr/jsdb
...
Fix flags for debugger server socket
2013-06-06 19:45:33 -07:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
James Chen
6784533212
Merge pull request #2798 from CocosRobot/updategeneratedsubmodule_1370569307
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-06 19:00:26 -07:00
CocosRobot
919d24d5b2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-07 01:41:52 +00:00
minggo
16b4400c7b
Merge pull request #2794 from ricardoquesada/missing_config_files
...
Missing config files
2013-06-06 18:36:42 -07: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
flaming0
68ac1684a8
Fix windows build (nullptr instead of NULL when assigning to std::function)
2013-06-07 00:08:59 +04: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
minggo
1e9397d490
Merge pull request #2793 from minggo/master
...
copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 08:07:41 -07:00
minggo
4fa069df58
issue #2103:copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 23:04:26 +08:00
folecr
c01c9c8350
Fix flags for debugger server socket
...
* Works on iOS and Android
2013-06-06 07:35:54 -07:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
James Chen
698e4092ae
Merge pull request #2791 from dumganhar/develop
...
[iOS] [develop] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 03:11:43 -07:00
James Chen
d5bbcce165
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:09:44 +08:00
James Chen
665375862a
Merge pull request #2790 from dumganhar/master
...
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 03:08:45 -07:00
James Chen
6f52d72b82
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:07:11 +08:00
James Chen
c2e1d9e914
Merge pull request #2789 from CocosRobot/updategeneratedsubmodule_1370507591
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-06 01:34:24 -07:00