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
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
0b3ed85914
issue #2430:fix some compiling error
2013-07-26 16:43:40 +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
d345ac7f3f
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
2013-07-26 14:00:10 +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
a1c3631962
issue #2404 : DrawPrimitives deprecated.
2013-07-25 22:38:55 +08:00
4d7ac6c800
issue #2430:fix conflict
2013-07-25 21:37:12 +08: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
25beed0051
[Android] Fixing path error and reducing dependence for extension.
2013-07-25 16:53:35 +08:00
aaf5bcef52
issue #2404 : Invocation of some deprecated methods fixes.
2013-07-25 15:25:11 +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
a13a46e54f
Merge pull request #3243 from azmeuk/emscripten-package
...
Use of a single emscripten HTML template file
2013-07-24 18:36:28 -07: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
6f4f8c0e38
Qt 5: System-wide installation of targets
2013-07-24 20:23:08 +02:00
366dbeda31
Qt 5: Build test application (Cpp/TestCpp)
2013-07-24 20:23:07 +02:00
15e3a7825c
Re-enable use of CocosDenshion in SimpleGame
2013-07-24 20:19:49 +02:00
e1baba5407
Build SimpleGame example
2013-07-24 20:19:20 +02:00
b64c0a0e87
Platform abstraction implementation with Qt 5
...
Based partially on the Linux platform abstraction, therefore
this right now works only with Qt 5 on Linux.
2013-07-24 20:18:43 +02:00
97363c9382
some more cleanup and refactory for the new Label stuff
2013-07-24 10:22:46 -07:00
682a1238fa
Use of a single emscripten HTML template file.
2013-07-24 17:59:21 +02: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
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08: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
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +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
56419b9e90
issue #2410 : [Android] Adding listener for CCDrawNode when application resume from background.
...
Reset the order of reloading shaders and textures in main.cpp.
2013-07-17 12:53:30 +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
510b29a2ff
Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2013-07-16 16:33:02 +08: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
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
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
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +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
1f8e852020
issue #2397 : Shader::sharedShaderCache() --> Shader::getInstance().
2013-07-12 13:40:01 +08:00
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +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
227afc37b9
Merge branch 'iss2395-s9sprite-test' of https://github.com/dumganhar/cocos2d-x into iss2395-s9sprite-test
2013-07-11 15:10:27 +08:00
1527c1b4c3
issue #2395 : Updating TestCpp/Android.mk
2013-07-11 15:09:13 +08:00
ab4e9749b6
issue #2395 : [Win32] Updating TestCpp project configuration
2013-07-11 14:17:43 +08:00
9946bc4f00
issue #2395 : Adding Scale9SpriteTest for other platforms.
2013-07-11 14:13:01 +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
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
626ba2686f
Solving 'black screen' on android
2013-07-09 21:21:43 +01:00
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
d853934f1b
Added -std=c++0x flag in C++ eclipse projects
2013-07-09 15:23:19 +02: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
dca0874ee3
issue #2371 : Removed unused projects.
2013-07-04 17:24:34 +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
55202b978a
Merge pull request #3048 from dabingnn/iss2328-refractor-etc
...
Iss2328 refractor etc
2013-07-02 01:37:55 -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
c38e932fe8
Adds SimpleGame and HelloCpp to the mac samples project
2013-07-01 17:31:03 -07:00
9e13cb91a5
Adds xcworspace data
2013-07-01 16:33:17 -07:00
f83383b86c
removes unused projects
2013-07-01 14:43:47 -07:00
87fc7d4d62
cocos2d mac project redesigned
2013-07-01 14:41:39 -07: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
9bac943040
issue #2325 : [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp.
2013-06-29 12:25:44 +08:00
e2b9863bf7
issue #2325 : [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.
2013-06-29 11:44:14 +08: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
ccd9cb486c
JS Tests compiles and links in Mac
...
...but it doesn't work yet due to a bug with the touch events :-(
2013-06-27 00:58:46 -07:00
398c6593f0
JS Tests: Almost working on Mac
2013-06-26 23:45:08 -07:00
10f4446596
Merge pull request #2998 from sbc100/emscripten_linux
...
closed #2333 : 1) Share top level Makefile between emscripten, linux and nacl.
2) Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 22:43:16 -07:00
f9ae701a4b
Fix emscripten build on linux
...
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
4196f2036e
Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix
...
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 08:41:28 -07:00
3e052d5525
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 23:21:06 +08:00
86646bb820
issue #2329:fixed a compiling error of AssetsManager on Android
2013-06-25 17:09:10 +08:00
d13597bcc3
Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem
2013-06-25 16:55:39 +08:00
425db1af6b
Merge pull request #2982 from ricardoquesada/ios_project_fixes
...
[iOS] TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
2013-06-24 22:02:53 -07:00
436c7e9391
removes Xcode's autogenerated library paths
2013-06-24 21:30:04 -07:00
e1d65e149b
some fixes
...
removes deprecated functions from AsssetManager
AssetManager: updated project
HelloCpp: does not depent on box2d, chipmunk, etc.
2013-06-24 18:20:07 -07:00
ef6f67902f
Adds mac workspace
...
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
4204e8243c
TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...
...as dependencies, and other minor fixes
2013-06-24 16:59:00 -07:00
6708983de2
Update target to android-10 for NDK code
2013-06-24 15:14:14 -07:00
7d4ce91b6b
Up the minSdkVersion to 9
2013-06-24 15:14:14 -07:00
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
80cb06d3f7
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-24 10:01:57 +08:00
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08: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
88a0dbec5e
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-21 21:29:25 +08:00
0a768da240
issue #2305 : use 4.7 toolchain to fix compiling errors
2013-06-21 17:17:23 +08:00
12549f72f9
Adding resource for ComponentTest.
2013-06-21 14:16:03 +08:00
dcaa55e622
Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.
2013-06-21 14:15:20 +08:00
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
2a715ec3cf
Merge pull request #2956 from ricardoquesada/cc_namespace_obj
...
issue #2129 : Re-adds 'CC' prefix to objective-c classes.
2013-06-20 19:10:01 -07:00
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
04d7d5a061
[NaCl] Add support for building using glibc toolchain.
...
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/14694016
2013-06-20 12:56:14 -07:00
d3110c0a45
[NaCl] Recreate webstore zip archive each build.
2013-06-20 12:56:13 -07:00
47878c1855
[NaCl] Remove legacy nacl_mounts usage.
...
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
2013-06-20 12:56:12 -07: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
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09: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
Ricardo Quesada