minggo
7704ab9161
issue #2412:remove platform.cpp/.h
2013-07-19 13:42:45 +08:00
Ricardo Quesada
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
rafael.x
c4ef2c9250
Added to various functions a check whether an OpenAL source exists on which OpenAL functions can be called.
...
Playback of background music starts now with the previously set volume, independent of the OpenAL source state.
Added a delete on the SimpleSoundEngine object within CocosDenshionTest::onExit() so that alutExit() gets called to release allocated resources by OpenAL.
2013-07-19 01:00:24 +02:00
carlo morgantini
9c53da22fa
some more cleanup
2013-07-18 14:11:12 -07:00
carlo morgantini
5480810a9c
clean up and now using FreeType for rendering fonts
2013-07-18 13:13:41 -07:00
James Chen
a425dd3dc0
Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes
...
Conflicts:
cocos2dx/actions/CCActionTiledGrid.h
2013-07-18 15:46:14 +08:00
James Chen
bf45fa86fe
Merge pull request #3176 from dumganhar/iss2413-overload-virtual
...
closed 2413: Warning fixes for overload virtual functions.
2013-07-18 00:33:53 -07:00
James Chen
8176f2f178
issue #2404 : Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2
2013-07-18 14:48:18 +08:00
carlo morgantini
80247d409b
rendering using free type. This commit is a work in progress and should NOT be used
2013-07-17 17:31:28 -07:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
James Chen
d6f713a31b
Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code
...
Conflicts:
samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h
2013-07-17 17:06:47 +08:00
James Chen
f4edc7a922
closed #2413 : Warning fixes for overload virtual functions.
2013-07-17 16:25:13 +08:00
James Chen
c31e8a8afc
issue #2407 : Updating SpriteTest.cpp, Don't hide virtual override function.
2013-07-17 14:33:15 +08:00
James Chen
b6fda7bf7c
issue #2407 : Removing unused codes in Box2dTest.h
2013-07-17 14:32:38 +08:00
Ricardo Quesada
5d499d351d
Some more changes to make the code more c++ friendly:
...
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
- Deprecates the old methods
- adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
- the new one is const
- Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
2013-07-16 18:16:04 -07:00
James Chen
13e939b55e
Merge pull request #3157 from ricardoquesada/override_love
...
closed 2407: Adds more readability to the class internals.
2013-07-15 22:05:33 -07:00
Ricardo Quesada
f9268c8054
small API changes
...
::create()
and const chars
2013-07-15 14:35:25 -07:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
pktangyue
6bb2d64f19
add S9CascadeOpacityAndColor test
2013-07-15 20:13:30 +08:00
minggo
93e75bad9f
Merge pull request #3154 from minggo/add-deprecated-header
...
Add deprecated header
2013-07-15 03:20:32 -07:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
yinkaile
680b7f1cb0
Remove vld.h
2013-07-13 22:59:21 +08:00
James Chen
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
James Chen
b5ca0b4ed5
Fixing warnings in SocketIOTest.cpp.
2013-07-13 19:21:31 +08:00
yinkaile
619a8810fe
Change Physics detector
2013-07-13 19:14:30 +08:00
carlo morgantini
e4af13f1f6
use freetype
2013-07-12 12:39:47 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
minggo
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
Chris Hannon
126ebb888c
Implements a socket.io client extension, adds a test case and updates the android makefiles.
...
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
carlo morgantini
002ae77698
new dynamic TTF label stuff
2013-07-11 14:41:03 -07:00
James Chen
3c64bc8972
issue #2396 : Updating Scale9SpriteTest.cpp.
2013-07-11 17:08:09 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
pktangyue
5e8de73061
add S9FrameNameSpriteSheetRotatedSetCapInsetLater test
2013-07-11 16:09:07 +08:00
James Chen
ad95ba4894
closed #2395 : Adding Scale9SpriteTest for TestCpp
2013-07-11 14:07:14 +08:00
James Chen
2e9d727466
issue #2395 : Removing unused codes in ActionTest.h.
2013-07-11 14:00:26 +08:00
yinkaile
54e5fca2aa
Bone can add a particle display as a CCNode
2013-07-10 10:00:51 +08:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
minggo
6d7b9ca236
Merge pull request #3108 from minggo/pitch_7platforms
...
Pitch 7platforms
2013-07-08 20:24:15 -07:00
minggo
e5a80eed91
fixed conflict
2013-07-09 10:39:16 +08:00
James Chen
85ef6b3b98
closed #2384 : Using static_cast instead of C cast in ExtensionsTest.cpp.
2013-07-09 10:18:15 +08:00
James Chen
3c394bba87
Merge branch 'iss3102-extensionstest-menuscroll' of https://github.com/hannon235/cocos2d-x into hannon235-iss3102-extensionstest-menuscroll
2013-07-09 10:16:31 +08:00
James Chen
976d4ad11e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
Ricardo Quesada
c7bf2ead10
More static_cast<>
2013-07-08 14:42:08 -07:00
Ricardo Quesada
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
Chris Hannon
bba9722faa
iss3102: make extension test submenu in TestCpp scrollable to access all entries
2013-07-08 16:20:24 -04:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
minggo
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
minggo
12bc534475
Merge pull request #3079 from dabingnn/Issue-2367-ClippingNodes-Bug
...
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-04 22:42:03 -07:00
Huabing.Xu
7a61ead598
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-05 11:59:46 +08:00
Ricardo Quesada
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
Darragh Coy
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
Huabing.Xu
dded008909
issue #2328 refractor etc support:remove comments
2013-07-02 15:46:17 +08:00
Huabing.Xu
041bef148a
Merge branch 'origin/develop'
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d.vcxproj.filters
2013-07-02 13:47:02 +08:00
Huabing.Xu
ae47e94db9
change test case, all platform not can read pkm file
2013-07-01 18:15:59 +08:00
Sergey Shambir
0a2207f531
Fixed coding style, rearranged CocosDenshionTest UI, changed
...
rewindBackgroundMusic to work with paused music.
2013-06-29 13:46:19 +04:00
Sergey Shambir
1c52517770
CocosDenshion: added effects customization for 7 platforms.
...
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.
Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
2013-06-29 13:44:16 +04:00
Ricardo Quesada
b846a3060e
cocos2d-x in Mac:
...
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
2013-06-28 19:02:10 -07:00
Ricardo Quesada
4204e8243c
TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...
...as dependencies, and other minor fixes
2013-06-24 16:59:00 -07:00
Ricardo Quesada
404193eb9f
Uses C++11 iterator in samples
...
or it just uses touches->anyObject() instead of creating an iterator
and removes more unneeded casts
2013-06-21 20:02:43 -07:00
Ricardo Quesada
6c0c48a3a9
Removes CallFuncO and CallFuncND
...
...which can be simualted with CallFunc and CallFuncN.
Adds std::function() support to CallFuncN.
Adds more samples
2013-06-21 14:58:52 -07:00
Ricardo Quesada
5e106f3c85
Uses C++11 code for the actions tests
...
Removes all casting.
Uses auto for actions
uses for(:) (C++11) iterator
2013-06-21 12:25:36 -07:00
James Chen
dcaa55e622
Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.
2013-06-21 14:15:20 +08:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
Sam Clegg
ab1243e8dd
[NaCl] Disable http tests under NaCl
2013-06-20 10:56:26 -07:00
James Chen
1fb9f44d15
issue #2129 : Removing CC prefix for samples module.
2013-06-20 14:17:10 +08:00
James Chen
31cbc0cbf8
issue #2129 : [TestCpp] A typo fix.
2013-06-20 14:08:22 +08:00
James Chen
74048d7eec
issue #2129 : [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix.
2013-06-20 14:04:44 +08:00
James Chen
e3ed28a8fb
issue #2129 : no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.
2013-06-20 14:02:14 +08:00
James Chen
b55a0dee2b
issue #2129 : using cocos2d::extension::armature namespace for Armature extension.
2013-06-20 13:48:43 +08:00
James Chen
7ce6ef04f8
issue #2129 : [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest.
2013-06-20 13:43:40 +08:00
Ricardo Quesada
3d2862f8f7
Converts copy->autorelease() to clone()
...
... in the samples
2013-06-18 16:12:28 -07:00
Ricardo Quesada
159ef1ec68
clone() doesn't use copy constructor
...
... and other bug fixes
2013-06-18 15:06:53 -07:00
Ricardo Quesada
d35cc3b0fa
Merge branch 'develop' into clone_reverse_fixes
...
Conflicts:
cocos2dx/actions/CCAction.cpp
cocos2dx/actions/CCActionEase.cpp
cocos2dx/actions/CCActionGrid.cpp
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/actions/CCActionInterval.cpp
scripting/javascript/bindings/generated
2013-06-18 09:59:34 -07:00
James Chen
2c0cc603d1
Merge branch 'master' into develop
...
Conflicts:
extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
James Chen
ccb67cbcb4
Template fix for iOS Template.
2013-06-17 15:54:12 +08:00
Ricardo Quesada
71ea3c7a3c
Fixed headers. Compiles but it doesn't link yet.
...
Many methods not implemented yet.
2013-06-15 18:54:34 -07:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Chen
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
minggo
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
Ricardo Quesada
8a6d33a212
Adds CC prefix to CALLBACK()
...
Now it is called: CC_CALLBACK()
2013-06-13 20:36:43 -07:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
0de1a4ebd8
Merge pull request #2877 from pyrasis/tizen_2.1
...
Support Tizen device
2013-06-12 22:56:23 -07:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
Ricardo Quesada
83b43ab93e
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
...
Handy macros for callbacks.
Instead of:
std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
CALLBACK_1(func_ptr, instance)
And also removes more warnings from the tests
2013-06-11 16:30:05 -07:00
Rene Klacan
f31a258c01
Merge pull request from cocos2d/develop
2013-06-11 01:06:12 +02:00
James Chen
4948de6462
[VS2012] Warning fixes.
2013-06-10 11:44:16 +08:00
James Chen
a14df8d28d
issue #2271 : Fixing some memory leaks.
2013-06-10 11:43:43 +08:00
James Chen
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
James Chen
3632693cd9
Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value.
2013-06-09 16:09:56 +08:00
James Chen
132fd591c1
[TestCpp] Commenting the line of loading configuration file in TestCpp.
2013-06-09 15:29:51 +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
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
93ecfbbf7e
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix
2013-06-08 15:42:41 +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
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
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
8cfe969137
Fixing compilation errors for win32.
2013-06-07 14:31:15 +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
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02: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
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
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
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
chengstory
ca3dc682ea
1. change “bool isEnabled()” to "bool isEnabled() const".
...
2. dolete license.
2013-06-05 15:05:49 +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
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
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
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
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
4b8f76c903
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-02 18:56:49 +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
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
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
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
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
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
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
Ricardo Quesada
207fc4be9c
Adds ConfigurationTest to the suite
2013-05-22 17:56:05 -07:00
Lee, Jae-Hong
6289a20fcb
Adding design size for Tizen.
2013-05-16 20:23:21 +09:00
carlo morgantini
36b88039a1
CCLabelTTF C++ test fixed
2013-05-15 16:37:08 -07:00
carlo morgantini
cab90dd276
CCTextDefinition is passed now by pointers
2013-05-15 16:35:24 -07:00
carlo morgantini
2430d79642
changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
2013-05-15 16:29:33 -07:00
carlo morgantini
c727fa33c0
CCLabelTTF have now a tint, plus bug fixing and code clean up
2013-05-15 16:29:33 -07:00
carlo morgantini
221884f6d4
better CCTexture2D API for init texture with shadow and stroke
2013-05-15 16:29:32 -07:00
carlo morgantini
dd9b4a8932
new shadow and stroke for CCLabelTTF
2013-05-15 16:12:43 -07:00
James Chen
dea45e8e79
fixed #2150 : Adding tests for this issue and fix compilation error of CCScale9Sprite.
2013-05-13 17:57:30 +08:00
James Chen
cbafaf67a6
fixed #2142 : Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok.
2013-05-10 15:07: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
3216995d4a
Merge branch 'master' into TexturePacker-SpriteSheetProtection
2013-05-08 10:22:14 -04: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
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
130ab4b584
Disable libcurl tests for Emscripten.
2013-05-06 20:59:47 -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
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
minggo
fa0370bba5
disable depth test for clipping test
2013-04-27 11:33:23 +08: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
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
minggo
c6dfee706c
fix memory leak in FontTest
2013-04-24 14:49:52 +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
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
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
Éloi Rivard
b9ec3ead65
* Fixed CocosDenshionTestBug
2013-03-29 09:32:50 +01:00
James Chen
c9cdb81020
Removing unused codes.
2013-03-25 14:30:25 +08:00
James Chen
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
James Chen
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
James Chen
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
James Chen
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
Sam Clegg
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
Sam Clegg
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
Asad ur Rehman
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
minggo
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
minggo
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
minggo
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
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
Sam Clegg
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
minggo
a330309628
issue #1686:add background color layer in CCTexture2DTest
2013-03-04 11:53:06 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
minggo
163ab2c0be
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 18:37:37 +08:00
minggo
8c80210007
issue #1686:not invoke CCLayer::init() in LayerTest to enable receiving touch messages
2013-03-01 17:11:02 +08:00
minggo
fb7642a332
issue #1686:change font size and fix a small bug in ActionTest
2013-03-01 11:25:40 +08:00
minggo
27b62952a4
issue #1686:draw polygon in CCFollowAction test case
2013-03-01 11:12:23 +08:00
minggo
70a70d38fc
Merge pull request #9 from dumganhar/iss1686-synchronize
...
issue #1686 : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
James Chen
3b3adc3eea
issue #1686 : Synchronizing LayerTest.
2013-02-28 16:45:59 +08:00
minggo
b952634d8e
issue #1686:synchronized NodeTest
2013-02-28 16:41:39 +08:00
minggo
dbd5a4069e
issue #1686:synchronized ParticleTest
2013-02-28 16:40:32 +08:00
minggo
738b96e478
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
2013-02-28 16:37:00 +08:00
minggo
c75e440e22
issue #1686:synchronized RenderTexture
2013-02-28 16:35:42 +08:00
James Chen
9d4c128391
tab ~> 4 spaces
2013-02-28 16:06:07 +08:00
James Chen
16422d7194
issue #1686 : Updated LayerTest.
2013-02-28 16:03:55 +08:00
James Chen
69a746fc8b
issue #1686 : Synchronizing LabelTest
2013-02-28 15:57:15 +08:00
James Chen
dbe1e2e427
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
2013-02-28 15:37:15 +08:00
James Chen
88fe33e927
Sync ActionsTest.
2013-02-28 15:32:27 +08:00
minggo
545882cb81
issue #1686:synchronized ShaderTest
2013-02-28 15:01:41 +08:00
minggo
f5e334d9e3
issue #1686:synchronized Texture2DTest
2013-02-28 14:54:09 +08:00
James Chen
5abec07fb5
Updated ActionsTest.
2013-02-28 14:42:45 +08:00
James Chen
e4b6495aac
Updated ActionEaseTest.
2013-02-28 14:42:32 +08:00
James Chen
d572a53a1d
Merge pull request #2050 from dumganhar/tableview-touch-fix
...
fixed #1751 : Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
2013-02-26 06:56:08 -08:00
James Chen
87935ac436
tableview touch area fix.
2013-02-26 19:59:14 +08:00
James Chen
efdb9180e4
fixed #1750 : [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
2013-02-26 11:16:26 +08:00
James Chen
0ece3056ee
fixed #1749 : Fixed compilation errors for win32.
2013-02-25 22:50:15 +08:00
James Chen
5fafaa8b67
Merge branch 'master' of https://github.com/neokim/cocos2d-x
...
Conflicts:
scripting/javascript/bindings/generated
2013-02-25 22:18:57 +08:00
Neo Kim
93195ebe17
Modified a preprocessor line which distinguishes device platform in CCEditBox test code.
2013-02-25 15:44:38 +09:00
James Chen
b50515c5bc
Merge pull request #1873 from ThePickleMan/master
...
fixed #1742 : Added 'rotationIsDir' property to ParticleSystem.
2013-02-21 19:02:39 -08:00
Neo Kim
a7c87f3b38
Add 'setFont' and 'setAnchorPoint' to CCEditBox
2013-02-20 22:41:08 +09:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
fb9ac31d08
fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.
2013-02-06 17:20:54 +08:00
James Chen
64248386a2
issue #1770 : Updating iOS project configuration and adding WEBP test demo.
2013-02-05 11:37:13 +08:00
James Chen
c362f7e439
issue #1687 : Adding new test - Checking whether file exists.
2013-02-01 22:18:43 +08:00
James Chen
3bdfb82e9c
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-01-30 22:31:19 +08:00
James Chen
001d3382a9
[TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget.
2013-01-29 12:59:43 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
minggo
249b935be8
fix some warnins
2013-01-28 20:34:52 +08:00
James Chen
e736ed487f
issue #1683 : Adding default search path if developer didn't pass it.
2013-01-28 17:44:53 +08:00
James Chen
16ef70c069
issue #1683 : Updating FileUtilsTest.cpp.
2013-01-28 17:43:53 +08:00
James Chen
f69ef6182c
issue #1683 : Adding FileUtilsTest.
2013-01-28 15:17:20 +08:00
James Chen
eec0ba3c19
Getting full path in before playing sound.
2013-01-27 19:20:49 +08:00
James Chen
2b9f79efc0
Merge pull request #1882 from dumganhar/memoryleak-action
...
Fixed memory leaks in CCActionCatmullRom class.
2013-01-22 22:41:44 -08:00
James Chen
b5efd699bf
Fixed a memory leak in ActionsTest.
2013-01-23 14:40:11 +08:00
PickleMan
c4d5bf8c85
Added test for rotation is dir in particle system
2013-01-21 12:35:59 -05:00
James Chen
c0d568da9b
fixed #1639 : Added custom property support for CCBReader.
2013-01-21 18:37:17 +08:00
minggo
a7dca5c05a
fixed #1547:set selected menu item to null when it is removed from a menu
2013-01-17 15:04:48 +08:00
Jozef Prídavok
9889b4f9fd
Added the very first implementation of CCEditBox for Win32.
2013-01-10 23:59:21 +01:00
Jozef Prídavok
229ad55dfa
Fixed and refactored Mac Implementation.
2013-01-09 15:34:53 +01:00
James Chen
8fa2eb080b
issue #1640 : Updated Box2dTest and ChipmunkTest.
2013-01-06 10:22:07 +08:00
James Chen
0c28510513
issue #1640 : Updated ChipmunkTest.cpp.
2013-01-06 10:13:59 +08:00
James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +08:00
James Chen
c68884a121
issue #1625 : Updated EffectsTest.cpp and EffectsTest.lua.
2012-12-27 11:48:46 +08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
James Chen
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +08:00