James Chen
fd37cdf8df
SimpleGame doesn't depend on extension now.
2013-06-09 14:02:49 +08:00
James Chen
2025e7257f
Merge pull request #2835 from dumganhar/2youyouo2-master
...
fixed #2270 : Adding Armature(CocoStudio runtime) support.
2013-06-08 20:20:30 -07:00
James Chen
44c6043a3f
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-master
2013-06-09 10:40:44 +08:00
samuele3hu
bc699c1c1e
issue #2103 modify AudioEngine framework and CocosDenshionTest sample
2013-06-09 10:32:23 +08:00
yinkaile
af819c6db5
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
2013-06-08 22:09:34 +08:00
yinkaile
d29931dc4f
1.add hd resource
...
2.remove zobie resource
3.support frame event
2013-06-08 22:08:22 +08:00
chengstory
86f4b96f05
Merge branch 'master111'
...
Conflicts:
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
2013-06-08 20:01:25 +08:00
James Chen
4edd35e2b1
Merge pull request #2829 from dumganhar/nacl-fix
...
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
2013-06-08 03:00:04 -07:00
James Chen
aee8e829ca
[Android] Updating Application.mk for HelloLua and TestLua.
2013-06-08 17:28:03 +08:00
chengstory
c2e85c1ae4
1. adds support for iOS and Mac.
...
2. Modify position of some examples.
2013-06-08 17:11:11 +08:00
James Chen
bf781feba1
[NaCL] Updating project.
2013-06-08 16:08:55 +08:00
James Chen
bb8a0d2859
Updating iOS Project after adding Armature support.
2013-06-08 16:08:05 +08:00
James Chen
93ecfbbf7e
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix
2013-06-08 15:42:41 +08:00
James Chen
51aa2433fc
Updating makefile for native client.
2013-06-08 15:35:45 +08:00
samuele3hu
836bfe1d3f
issue #2103 modify audioEngine table name to AudioEngine
2013-06-08 14:06:19 +08:00
yinkaile
8ff088da53
Standardize code
2013-06-08 12:14:43 +08:00
yinkaile
cba46082ce
Standardize code
2013-06-08 11:48:45 +08:00
samuele3hu
34b4cb48ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
2013-06-08 11:25:51 +08:00
samuele3hu
4be415cc04
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
2013-06-08 11:23:21 +08:00
carlo morgantini
494ec43fe8
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-08 10:59:07 +08:00
James Chen
ba5972ef79
[C++ 11] Bug fix for the usage of lambda in testBasic.cpp while using GCC compiler.
2013-06-08 10:25:53 +08:00
Ricardo Quesada
022dfc0acc
CPP Tests migrated to the new C++11 API
...
Many tests were converted to the C++11 API
and some tests were also simplified by using the "CL" macro
instead of the "CF" macro.
2013-06-07 17:21:11 -07:00
carlo morgantini
b7ffb5b810
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-07 16:33:01 -07:00
yinkaile
7c924c714f
Standardize code
2013-06-07 22:56:54 +08:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
Lee, Jae-Hong
b9f5691706
[Tizen] Add libwebsockets.h, .a and support C++11
2013-06-07 20:14:43 +09:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
7c650d7f28
[BB] Updating project configuration.
2013-06-07 18:45:58 +08:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
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
dda3c34be8
issue #2103 add webSocket lua test sample
2013-06-07 17:48:07 +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
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +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
samuele3hu
cdbf8b7250
issue #2103 add webSocket lua test sample
2013-06-07 13:55:36 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
yinkaile
65974f2243
standardize code
2013-06-07 10:52:32 +08: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
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
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
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08: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
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
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
James Chen
5832934e41
Reverting target to android-8.
2013-06-06 16:20:22 +08:00
James Chen
deceba3fd2
Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes
2013-06-06 15:52:33 +08:00
James Chen
03549e6a59
Updating JS-Test.
2013-06-06 15:47:07 +08:00
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02:00
James Chen
ed4b9b2bb3
Marmalade projects fix.
2013-06-06 14:26:35 +08:00
James Chen
f22d320797
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
2013-06-06 14:24:58 +08:00
yinkaile
3cfba7bc9a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile
245b0395b1
1.upload CCArmature
2013-06-06 12:02:54 +08:00
Ricardo Quesada
479062fdb7
on dealloc, log "this" with %p, not %x.
...
Also adds %p where it was missing.
And make a few fixes on the iOS project
2013-06-05 18:21:05 -07:00
Ricardo Quesada
3441ca5563
MenuItemToggle is fixed
...
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
2013-06-05 17:51:40 -07:00
James Chen
1bb73e50df
Fixing a warning in Bug-458.cpp
2013-06-05 18:18:59 +08:00
minggo
cdf09c04ea
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 17:43:49 +08:00
James Chen
dc8cfeb648
Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback
2013-06-05 16:40:25 +08:00
minggo
3713ff5b71
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder
...
add cocosbuilder lua test sample
2013-06-05 01:38:57 -07:00
minggo
a9788a7f9d
Merge pull request #2767 from chengstory/master_Components#2
...
1. change “bool isEnabled()” to "bool isEnabled() const".
2013-06-05 00:52:32 -07:00
samuele3hu
75b26d9cdf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
2013-06-05 15:19:01 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
chengstory
ca3dc682ea
1. change “bool isEnabled()” to "bool isEnabled() const".
...
2. dolete license.
2013-06-05 15:05:49 +08:00
minggo
d71e07db4e
fixed conflict
2013-06-05 13:48:31 +08:00
James Chen
993070b27e
Minor fix in CCConfiguration.
2013-06-05 09:47:29 +08:00
Ricardo Quesada
d27da88c06
Adds setObject to CCConfiguration
...
also adds the test
Conflicts:
scripting/javascript/bindings/generated
2013-06-05 09:46:56 +08:00
James Chen
26219d4a14
Minor fix in CCConfiguration.
2013-06-05 09:41:03 +08:00
James Chen
2a16a6b17f
Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value
2013-06-05 09:36:53 +08:00
Ricardo Quesada
4b37ec252a
Adds C++11 std::function<> support to MenuItem
...
Updates some of the tests
2013-06-04 18:29:26 -07:00
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
david feng
9d9bc1f593
fix a library search path error
2013-06-04 21:13:08 +08:00
James Chen
ddbdb3e983
[iOS] Fixing compilation errors for HelloLua.
2013-06-04 21:11:44 +08: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
minggo
7bd9717944
make lua works ok on iOS
2013-06-04 15:12:16 +08: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
samuele3hu
37b508ad6d
issue #2103 modify some compile setup
2013-06-03 18:25:37 +08:00
samuele3hu
23eec2f1ce
issue #2103 modify some compile setup
2013-06-03 18:14:06 +08:00
samuele3hu
9352b60653
issue #2103 modify some compile setup and del some resource file
2013-06-03 17:40:31 +08:00
samuele3hu
bf1cd2e909
issue #2103 modify some compile setup
2013-06-03 16:56:45 +08:00
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00
samuele3hu
7101bc4377
issue #2103 remove simple cocosbuilder sample
2013-06-03 14:59:04 +08:00
samuele3hu
af0737ce87
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder
2013-06-03 13:48:12 +08:00
samuele3hu
afa6b81ba7
issue #2103 add cocosbuilder lua bind and add a simple sample
2013-06-03 13:47:12 +08: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
c29e434ead
Updating JS-Test.
2013-06-02 18:57:01 +08:00
James Chen
4b8f76c903
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-02 18:56:49 +08:00
James Chen
68d0ebfec5
fixed #1647 : Updating JS-test.
2013-06-02 18:56:30 +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
62f4e40e4a
Updating JS-Test.
2013-06-01 19:51:59 +08: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
ad05363265
fixed #1647 : Updating JS-test.
2013-05-31 23:27:59 +08: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
8b5450ef4a
issue #2103 modify some build script
2013-05-24 13:55:05 +08:00
samuele3hu
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
samuele3hu
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
samuele3
24a34e50bf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
2013-05-23 15:40:48 +08:00
samuele3
5da5407efe
issue #2103 add menu test lua sample
2013-05-23 15:39:41 +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
10ba265f46
Merge pull request #2614 from pyrasis/tizen_2.1
...
Adding lua libaray and sample projects for Tizen.
2013-05-22 06:12:17 -07:00
Lee, Jae-Hong
6acd8c66c2
Adding lua libaray and sample projects for Tizen.
2013-05-22 21:45:53 +09:00
James Chen
a70740bd90
Merge pull request #2613 from dumganhar/iss2214-spidermonkey-v21
...
fixed #2214 : Upgrading Spidermonkey to Firefox v21
2013-05-22 03:09:06 -07:00
James Chen
974546557d
fixed #2214 : Upgrading Spidermonkey to Firefox v21
2013-05-22 17:31:07 +08: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