ff56ad5435
fix bugs with new Label stuff and add new sample for unicode
2013-07-30 16:41:26 -07:00
9de1ef3f97
New label TTF. New text alignment sample.
2013-07-30 10:27:22 -07:00
6a1938056c
closed #2447 : Fix clippingNodeTest RawStencilBufferTest6 crash bug
2013-07-30 16:27:13 +08:00
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
023b46154f
Fix problems with missing glyphs in .ttf file
2013-07-29 13:43:23 -07:00
894584e5a0
Add texture2D convert test and fix the convert bugs
2013-07-29 17:34:33 +08:00
0dcf9e88c3
close #2437 : replace stencil mechanism with a new approach by removing glColorMask call
2013-07-29 14:13:36 +08:00
4ebfc1c6e4
issue #2437 : Fix Bug RenderTextureTestDepthStencil not clipped by stencil
2013-07-29 14:11:21 +08:00
92f9ed743a
use correct type to initialize an array
2013-07-28 23:23:35 +08:00
cc95fcaa69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-28 14:35:38 +08:00
3aeefb51b3
Modify deprecated CCPhysicsDebugNode typedef and some test bug
2013-07-28 14:33:02 +08:00
e97b2504ea
fix a logical error
2013-07-28 10:22:12 +08:00
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
324607c32c
More warning fixes.
2013-07-27 15:15:54 +08:00
6e4aafdacf
fix a problem with the new Label and colors
2013-07-26 16:30:36 -07:00
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
8416e7cf6d
Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-26 15:54:50 -07:00
0da367e05e
fixes warnigns when using HttpRequest
...
fixes warnigns when using HttpRequest
2013-07-26 14:34:17 -07:00
be47a6da52
Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq
...
Conflicts:
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-26 11:58:18 -07:00
76ebeb0676
some more clean up for CCLabel
2013-07-26 10:29:29 -07:00
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
54ab99bf74
enum class for ProgressTimer::type
2013-07-26 17:28:18 +08:00
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
b57d48b0d2
ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS
2013-07-26 13:47:30 +08:00
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08:00
8bf24f0475
ccGLXXX -> GL::xxx
...
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`
Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
7d141a3f57
the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore)
2013-07-25 17:58:13 -07:00
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
058935aa8d
Removes Hungarian notation
...
Removes Hungarian notation from the code.
2013-07-25 15:53:24 -07:00
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
8b748e2992
issue #2430:use const member variable instead of macro
2013-07-25 21:04:32 +08:00
051caf5e54
issue #2430:move TransitionScene enum into class
2013-07-25 20:50:39 +08:00
df48f52aa3
issue #2430:use Image::Format instead of tImageFormat
2013-07-25 20:38:15 +08:00
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
beb192ecaa
issue #2430:move Menu enum into class
2013-07-25 20:04:24 +08:00
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +08:00
8dab462f6f
issue #2430:move Director enum into class
2013-07-25 14:39:32 +08:00
edcea3eb8d
issue #2430:move more Particle enum into class
2013-07-25 14:27:46 +08:00
4519a09ce4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-25 13:54:55 +08:00
4bfe6c2439
issue #2430:move Particle enum into class
2013-07-25 13:54:32 +08:00
306587167d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated
...
Conflicts:
AUTHORS
2013-07-25 11:28:48 +08:00
a7760d117d
Adds more tests
2013-07-24 17:21:51 -07:00
e0523b3438
Merge branch 'developNewLabelForRiq' into label_merge
...
Conflicts:
cocos2dx/textures/CCTexture2D.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-24 15:15:08 -07:00
943b805bc8
Fixes some warnings
...
... and updates the version to pre-alpha0
2013-07-24 14:02:36 -07:00
97363c9382
some more cleanup and refactory for the new Label stuff
2013-07-24 10:22:46 -07:00
e0f9ac82da
issue #2404 : Updating ExtensionsTest/CocosBuilderTest.
2013-07-24 18:17:20 +08:00
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
2013f841ad
Merge branch 'develop' into more_best_practices_fixes
2013-07-23 13:36:22 -07:00
12bb640307
issue #2378 : ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB
2013-07-23 20:47:19 +08:00
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
c158cd5be6
More best practices fixes
...
- Removes Hungarian notation from the CPP test (there are still some Hungarian to remove)
- Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)
2013-07-22 17:25:44 -07:00
98bb0c26f3
working on the new label stuff
2013-07-22 14:43:45 -07:00
98c52cd98d
new FontCache
2013-07-22 13:08:37 -07:00
5668607e0e
merging with Ricardo stuff and fixin the new Label
2013-07-22 11:40:39 -07:00
b58d18e20a
More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.
2013-07-22 14:28:19 +08:00
e81c0f944d
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 11:47:08 +08:00
604c30f102
Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers
...
Conflicts:
CocosDenshion/include/SimpleAudioEngine.h
samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
2013-07-22 10:06:14 +08:00
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
2219bde542
bmfont sample working
...
...still TTF working OK
2013-07-19 16:49:51 -07:00
88928fff99
Merge branch 'developNewLabelMerge' into merge_new_label
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/textures/CCTexture2D.h
samples/Javascript/Shared
2013-07-19 16:04:23 -07:00
c977e6c3fa
Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge
...
Conflicts:
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontDefinition.h
cocos2dx/label_nodes/CCStringTTF.cpp
cocos2dx/label_nodes/CCStringTTF.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-19 12:24:25 -07:00
5068622c04
working on the new atlas stuff
2013-07-19 10:33:26 -07:00
0470ce936b
1.Fix release CCTexture2DMutable.cpp crash
...
2.Change frame tween method
2013-07-19 19:02:26 +08:00
7704ab9161
issue #2412:remove platform.cpp/.h
2013-07-19 13:42:45 +08:00
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
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
9c53da22fa
some more cleanup
2013-07-18 14:11:12 -07:00
5480810a9c
clean up and now using FreeType for rendering fonts
2013-07-18 13:13:41 -07:00
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
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
8176f2f178
issue #2404 : Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2
2013-07-18 14:48:18 +08:00
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
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
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
f4edc7a922
closed #2413 : Warning fixes for overload virtual functions.
2013-07-17 16:25:13 +08:00
c31e8a8afc
issue #2407 : Updating SpriteTest.cpp, Don't hide virtual override function.
2013-07-17 14:33:15 +08:00
b6fda7bf7c
issue #2407 : Removing unused codes in Box2dTest.h
2013-07-17 14:32:38 +08:00
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
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
f9268c8054
small API changes
...
::create()
and const chars
2013-07-15 14:35:25 -07:00
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
6bb2d64f19
add S9CascadeOpacityAndColor test
2013-07-15 20:13:30 +08:00
93e75bad9f
Merge pull request #3154 from minggo/add-deprecated-header
...
Add deprecated header
2013-07-15 03:20:32 -07:00
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
680b7f1cb0
Remove vld.h
2013-07-13 22:59:21 +08:00
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
b5ca0b4ed5
Fixing warnings in SocketIOTest.cpp.
2013-07-13 19:21:31 +08:00
619a8810fe
Change Physics detector
2013-07-13 19:14:30 +08:00
e4af13f1f6
use freetype
2013-07-12 12:39:47 -07:00
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
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
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
002ae77698
new dynamic TTF label stuff
2013-07-11 14:41:03 -07:00
3c64bc8972
issue #2396 : Updating Scale9SpriteTest.cpp.
2013-07-11 17:08:09 +08:00
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
5e8de73061
add S9FrameNameSpriteSheetRotatedSetCapInsetLater test
2013-07-11 16:09:07 +08:00
ad95ba4894
closed #2395 : Adding Scale9SpriteTest for TestCpp
2013-07-11 14:07:14 +08:00
2e9d727466
issue #2395 : Removing unused codes in ActionTest.h.
2013-07-11 14:00:26 +08:00
54e5fca2aa
Bone can add a particle display as a CCNode
2013-07-10 10:00:51 +08:00
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
6d7b9ca236
Merge pull request #3108 from minggo/pitch_7platforms
...
Pitch 7platforms
2013-07-08 20:24:15 -07:00
e5a80eed91
fixed conflict
2013-07-09 10:39:16 +08:00
85ef6b3b98
closed #2384 : Using static_cast instead of C cast in ExtensionsTest.cpp.
2013-07-09 10:18:15 +08:00
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
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
c7bf2ead10
More static_cast<>
2013-07-08 14:42:08 -07:00
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
bba9722faa
iss3102: make extension test submenu in TestCpp scrollable to access all entries
2013-07-08 16:20:24 -04:00
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
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
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
7a61ead598
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-05 11:59:46 +08:00
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
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
dded008909
issue #2328 refractor etc support:remove comments
2013-07-02 15:46:17 +08:00
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
ae47e94db9
change test case, all platform not can read pkm file
2013-07-01 18:15:59 +08:00
0a2207f531
Fixed coding style, rearranged CocosDenshionTest UI, changed
...
rewindBackgroundMusic to work with paused music.
2013-06-29 13:46:19 +04:00
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
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
4204e8243c
TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...
...as dependencies, and other minor fixes
2013-06-24 16:59:00 -07:00
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
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
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
dcaa55e622
Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.
2013-06-21 14:15:20 +08:00
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
ab1243e8dd
[NaCl] Disable http tests under NaCl
2013-06-20 10:56:26 -07:00
1fb9f44d15
issue #2129 : Removing CC prefix for samples module.
2013-06-20 14:17:10 +08:00
31cbc0cbf8
issue #2129 : [TestCpp] A typo fix.
2013-06-20 14:08:22 +08:00
74048d7eec
issue #2129 : [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix.
2013-06-20 14:04:44 +08:00
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
b55a0dee2b
issue #2129 : using cocos2d::extension::armature namespace for Armature extension.
2013-06-20 13:48:43 +08:00
7ce6ef04f8
issue #2129 : [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest.
2013-06-20 13:43:40 +08:00
3d2862f8f7
Converts copy->autorelease() to clone()
...
... in the samples
2013-06-18 16:12:28 -07:00
159ef1ec68
clone() doesn't use copy constructor
...
... and other bug fixes
2013-06-18 15:06:53 -07:00
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
2c0cc603d1
Merge branch 'master' into develop
...
Conflicts:
extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
ccb67cbcb4
Template fix for iOS Template.
2013-06-17 15:54:12 +08:00
71ea3c7a3c
Fixed headers. Compiles but it doesn't link yet.
...
Many methods not implemented yet.
2013-06-15 18:54:34 -07:00
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
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
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
8a6d33a212
Adds CC prefix to CALLBACK()
...
Now it is called: CC_CALLBACK()
2013-06-13 20:36:43 -07:00
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
0de1a4ebd8
Merge pull request #2877 from pyrasis/tizen_2.1
...
Support Tizen device
2013-06-12 22:56:23 -07:00
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
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
f31a258c01
Merge pull request from cocos2d/develop
2013-06-11 01:06:12 +02:00
4948de6462
[VS2012] Warning fixes.
2013-06-10 11:44:16 +08:00
a14df8d28d
issue #2271 : Fixing some memory leaks.
2013-06-10 11:43:43 +08:00
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
3632693cd9
Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value.
2013-06-09 16:09:56 +08:00
132fd591c1
[TestCpp] Commenting the line of loading configuration file in TestCpp.
2013-06-09 15:29:51 +08:00
af819c6db5
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
2013-06-08 22:09:34 +08:00
d29931dc4f
1.add hd resource
...
2.remove zobie resource
3.support frame event
2013-06-08 22:08:22 +08:00
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
c2e85c1ae4
1. adds support for iOS and Mac.
...
2. Modify position of some examples.
2013-06-08 17:11:11 +08:00
93ecfbbf7e
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix
2013-06-08 15:42:41 +08:00
8ff088da53
Standardize code
2013-06-08 12:14:43 +08:00
cba46082ce
Standardize code
2013-06-08 11:48:45 +08:00
494ec43fe8
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-08 10:59:07 +08:00
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
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
b7ffb5b810
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-07 16:33:01 -07:00
7c924c714f
Standardize code
2013-06-07 22:56:54 +08:00
2418afc96d
conform declare and initialize order
2013-06-07 16:13:08 +08:00
942c797749
Removing unused codes.
2013-06-07 15:39:18 +08:00
8cfe969137
Fixing compilation errors for win32.
2013-06-07 14:31:15 +08:00
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
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
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02:00
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
245b0395b1
1.upload CCArmature
2013-06-06 12:02:54 +08:00
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
1bb73e50df
Fixing a warning in Bug-458.cpp
2013-06-05 18:18:59 +08:00
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
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
carlo morgantini