Damien
52c66a678c
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
...
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
- CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);
Fix Tested on Android. Affects Android only.
2013-12-19 12:32:51 -08:00
Huabing.Xu
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
Huabing.Xu
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
Huabing.Xu
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
Huabing.Xu
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
James Chen
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
Huabing.Xu
44366c653c
fix compile error
2013-12-19 17:20:36 +08:00
Huabing.Xu
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
Huabing.Xu
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
Huabing.Xu
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
Ricardo Quesada
1d3cc7a24c
Skew works again!
2013-12-18 21:11:06 -08:00
James Chen
d31c1457b1
Merge pull request #4546 from Dhilan007/update_vsProject
...
update vs project for removes unneeded files
2013-12-18 19:30:21 -08:00
Ricardo Quesada
d138925aa0
Merge branch 'develop' into node_fixes
2013-12-18 18:33:56 -08:00
Ricardo Quesada
b9a64725ab
iterator in Sprite fixes
...
And replaces some std::for_each() with for() to prevent another object in the stack.
2013-12-18 18:33:04 -08:00
Dhilan007
ffa6ad3cb2
update vs project for removes unneeded files
2013-12-19 10:24:50 +08:00
minggo
9fc28e6c7d
Merge pull request #4534 from boyu0/edit_hungarian_notation
...
Edit hungarian notation
2013-12-18 18:10:17 -08:00
Ricardo Quesada
89701f5006
getNodeToParentTransform fixes
...
Code is cleaner.
`Armature` calls parent to reduce code.
[]: Skew is still not working properly
2013-12-18 18:00:55 -08:00
boyu0
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
Ricardo Quesada
8390e7eadb
Node cleanup
...
Uses "normal" interation without the lambda to prevent another object in the stack.
removed unused code.
2013-12-18 16:56:59 -08:00
Ricardo Quesada
7616edd9f3
Improves SpriteTest
...
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).
Needed for the new renderer.
Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
Ricardo Quesada
b36d77b1c2
Android and Linux fixes
2013-12-18 12:07:51 -08:00
Ricardo Quesada
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
boyu0
d0b039ceda
fix compile errors.
2013-12-18 22:44:03 +08:00
boyu0
71be55a9aa
revert AccelerometerSimulation.m
2013-12-18 19:02:49 +08:00
boyu0
f16384a105
fix more code with hungarian notation
2013-12-18 18:51:36 +08:00
boyu0
082c3d274a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:05:30 +08:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
Huabing.Xu
46d1d5bb91
add GridNode New renderer imp
2013-12-18 17:19:50 +08:00
James Chen
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
James Chen
581ba49399
Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-18 15:41:57 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
Dhilan007
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
Ricardo Quesada
24f89ac45c
Revert... android platform is 10
2013-12-17 19:07:28 -08:00
Ricardo Quesada
156f69c528
Renderer is subclass of Object again... needed for Android.
...
ouch
2013-12-17 19:06:22 -08:00
Ricardo Quesada
5c9b8db0cb
Updates project files file Linux and Android
2013-12-17 18:47:46 -08:00
Ricardo Quesada
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
Ricardo Quesada
f369a8eec3
Adds correct License to Renderer files
2013-12-17 18:12:15 -08:00
Ricardo Quesada
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -08:00
Ricardo Quesada
d6be81b7a8
The Renderer is not a singleton
...
In order to access, you have to get it from the Director
`Director::getInstance()->getRenderer()`
2013-12-17 17:50:17 -08:00
Ricardo Quesada
441cb6c282
fixes warnings in QuadCommand
2013-12-17 10:35:15 -08:00
Ricardo Quesada
ff106ed070
fixes warning on Label Fragment shader
2013-12-17 10:01:38 -08:00
Huabing.Xu
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen
3829f841e7
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 18:09:07 +08:00
James Chen
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
minggo
85ba3ee1a9
Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError
...
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
2013-12-17 00:32:50 -08:00
LinWenhai
649e6b8065
use size_t replace unsigned int for record redeque::size returned value.
2013-12-17 16:04:48 +08:00
James Chen
12cc6c6153
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
...
Conflicts:
cocos/2d/CMakeLists.txt
2013-12-17 15:50:24 +08:00
James Chen
7fc7757470
issue #2171 : Adds header files of renderer in cocos2d.h.
2013-12-17 15:40:50 +08:00
James Chen
08edcca9be
issue #2171 : small fix in ccTypes.h
2013-12-17 15:39:35 +08:00
James Chen
8f5970ef90
issue #2171 : Don’t ‘using namespace std;’ in header file.
2013-12-17 15:32:24 +08:00
minggo
16ed9155c0
Merge pull request #4460 from Dhilan007/label_distanceField
...
new label:add support for distanceField
2013-12-16 23:18:41 -08:00
James Chen
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
James Chen
4e01769cd5
issue #2171 : [New Renderer] Fixing compilation errors for Android.
2013-12-17 14:18:41 +08:00
Ricardo Quesada
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
Huabing.Xu
6abb6639b5
remove android properties change by eclipse
2013-12-16 19:22:40 +08:00
Dhilan007
f7a448814c
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
2013-12-16 17:12:53 +08:00
Dhilan007
0cf17f5658
label : fix some error on android when the GLSL versions is 1.0
2013-12-16 14:36:11 +08:00
Huabing.Xu
6aa2908c13
rename:
...
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
boyu0
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
Lee, Jae-Hong
2807e785c0
fix CCImage bug on android platform.
...
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
2013-12-15 21:07:55 +09:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
James Chen
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
James Chen
ed93c114e5
Reverts CCSpriteBatchNode.h
2013-12-13 16:47:42 +08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
James Chen
7a8f2ae235
size_t —> ssize_t in CCTMXLayer.cpp
2013-12-13 16:41:03 +08:00
Dhilan007
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
Huabing.Xu
a8a2ceb887
add linux make list
2013-12-13 12:25:17 +08:00
Huabing.Xu
305e80030c
update Visual studio project file
2013-12-13 10:59:23 +08:00
Huabing.Xu
00edb5f7fe
update android.mk in 2d folder
2013-12-13 10:57:23 +08:00
boyu0
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
Ricardo Quesada
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
Ricardo Quesada
f4c68e4eef
More renames of description() to getDescription()
2013-12-12 14:38:12 -08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
Huabing.Xu
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
Huabing.Xu
256fe13d3f
other grid scene transitions can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
f1cac00dd7
TransitionPageTurn can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
ea9d744d79
add setGridTarget method, grid node now can affect its target and its child
2013-12-12 15:15:43 +08:00
Huabing.Xu
09a9b1f557
remove setGrid getGrid in class Node
2013-12-12 15:15:43 +08:00
Huabing.Xu
aad617e200
add class GridNode
2013-12-12 15:10:04 +08:00
minggo
040c42ebfd
use ssize_t for index
2013-12-12 14:48:26 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
minggo
ab23b47043
use ssize_t for capacity and index in containers
2013-12-12 14:48:26 +08:00
James Chen
b5bab598b3
issue #2790 : Disables deprecated warning for android to make Travis-CI happy.
2013-12-12 10:35:13 +08:00
James Chen
b2e8bdce1e
issue #2790 : Uses StringUtils::format for Node::description().
2013-12-12 09:47:35 +08:00
James Chen
976bef8b68
issue #2790 : StringUtils::toStringWithFormat —> StringUtils::format.
2013-12-12 09:37:56 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
9e637a3a3b
issue #2790 : GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
2013-12-11 22:35:37 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
49cc9719a6
issue #2790 : log —> CCLOG.
2013-12-11 18:08:06 +08:00
James Chen
40bc797b1f
issue #2790 : Configuration::getValue has default value now.
2013-12-11 18:08:06 +08:00
James Chen
022df4c014
issue #2790 : Removes test codes.
2013-12-11 18:08:05 +08:00
James Chen
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
boyu0
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +08:00
boyu0
7cbce905bf
issue #3162 : delete duplicate functions.
2013-12-11 16:12:14 +08:00
boyu0
463ae20ce6
issue #3162 : Add layer cascade color and cascade opacity test, fix bugs
2013-12-11 15:57:20 +08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
35eeebe64a
add comments for include "CCStdC.h" only for windows
2013-12-10 23:13:21 +08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
boyu0
d0da73c365
Add _stencil is nil test, add warning log.
2013-12-09 14:00:10 +08:00
boyu0
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
James Chen
908f5ed515
issue #2790 : Fix for TMXObjectGroup::getObject.
2013-12-07 16:38:50 +08:00
James Chen
6b0589679b
issue #2790 : Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler
2013-12-07 14:25:24 +08:00
James Chen
d7997cf0cc
issue #2790 : Updates MenuItemToggole
2013-12-07 14:24:31 +08:00
James Chen
b0cb7c230a
#issue #2790 : Uses Vector<Scene*> for scenesStack in CCDirector.
2013-12-07 14:22:51 +08:00
James Chen
0091ca2b6f
issue #2790 : Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp.
2013-12-07 14:22:03 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
Ricardo Quesada
8df96b1a6e
Layercolor uses the new API
2013-12-06 17:59:34 -08:00
Ricardo Quesada
ba2f65c6b2
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 17:42:48 -08:00
Ricardo Quesada
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
Nite Luo
94255a9d52
Fix culling
2013-12-06 14:59:06 -08:00
Ricardo Quesada
439adafbcd
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 11:57:19 -08:00
Ricardo Quesada
745541979b
Particles working again.
...
Paticle Batch working too: increased VBO_SIE to 10500
2013-12-06 11:51:17 -08:00
Nite Luo
3e0bee706e
Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command
2013-12-06 11:41:24 -08:00
Ricardo Quesada
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada
73b1e3bb9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCSprite.cpp
2013-12-06 09:37:08 -08:00
boyu0
0e94d4f3b8
closed #3162 : fix indent.
2013-12-06 18:23:31 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
James Chen
0d30f2bbbb
Merge pull request #4445 from dumganhar/iss2790-template-container
...
issue #2790 : Fix of JSB project broken after using Vector<T>
2013-12-06 01:24:21 -08:00
minggo
368647c166
Merge pull request #4444 from minggo/fix-warning
...
fix some warnings
2013-12-06 01:07:03 -08:00
James Chen
9f6d2df63b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container
2013-12-06 16:46:51 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
0126aaa205
Merge pull request #4442 from minggo/use-schedule
...
use Schedule::performFunctionInCocosThread
2013-12-05 22:30:54 -08:00
Ricardo Quesada
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
Ricardo Quesada
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
Nite Luo
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
Nite Luo
e3fc789070
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-05 12:05:44 -08:00
darkdukey
5f902d95b3
Merge pull request #5 from dabingnn/newRendererParticleSystem
...
New renderer particle system
2013-12-05 12:05:18 -08:00
Ricardo Quesada
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
b520941c5c
Reverts config of VS project.
2013-12-05 16:37:50 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
6a034a91f1
Merge branch 'develop' into console
...
Conflicts:
cocos/scripting/auto-generated
2013-12-04 21:58:11 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -08:00
James Chen
b0af2667f8
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
minggo
ba62c88682
Merge pull request #4420 from dumganhar/iss2790-template-container
...
[ci skip]issue #2790 : (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
2013-12-04 20:06:24 -08:00
martell
e0523c73f5
fixed CCImage for MSVC someone added std:tolower which broke it
2013-12-05 03:53:25 +00:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
Nite Luo
9b0e0d2116
Fix a bug with auto batching logic
2013-12-04 19:05:17 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
Ricardo Quesada
4aae44f1e9
fixes cocos2d.h include
2013-12-04 18:54:15 -08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Huabing.Xu
e6823875d5
change VBO_SIZE to a big number to avoid crash temporarily
2013-12-05 10:20:54 +08:00
Huabing.Xu
7a58cb5a29
use quad command instead of custom command for ParticleSystemQuad::draw()
2013-12-05 10:20:22 +08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
Nite Luo
e316ac779b
Sprite culling now using vertices directly to avoid calculation on transform
2013-12-04 17:41:18 -08:00
Nite Luo
a98714f6a5
support device without VAO
2013-12-04 17:02:02 -08:00
Nite Luo
792cb5a716
Merge branch 'develop' into newRenderer
2013-12-04 15:23:12 -08:00
Nite Luo
143df8af7d
Fix RenderTexture after merging commandpool
2013-12-04 15:13:13 -08:00
darkdukey
4b7d0c290a
Merge pull request #4 from dabingnn/newRendererCommandPool
...
New renderer command pool
2013-12-04 15:08:17 -08:00
Nite Luo
f423166471
Fix bugs with RenderTexture with NewRender
2013-12-04 15:06:28 -08:00
Ricardo Quesada
f69d5d1328
Merge branch 'develop' into console
2013-12-04 12:28:05 -08:00
Nite Luo
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
4212e33aee
issue #2790 : Removes unused comments in CCAnimation.h
2013-12-04 17:27:53 +08:00
James Chen
60874ece64
issue #2790 : Updates Makefile, Moves some codes to CCValue.cpp.
2013-12-04 16:18:22 +08:00
James Chen
ceaa1f26bb
issue #2790 : Windows run ok with ValueDict for FileUtils.
2013-12-04 16:02:54 +08:00
James Chen
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
James Chen
5c60f66c63
issue #2790 : Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
2013-12-04 16:02:53 +08:00
James Chen
f01f56113c
issue #2790 : Don’t make an assert if converting Value failed.
2013-12-04 16:02:53 +08:00
James Chen
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
James Chen
411136dd57
issue #2790 : Updates CCValue, supports using ‘const char*’ to construct a Value.
2013-12-04 16:02:52 +08:00
James Chen
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
James Chen
8a435aa274
issue #2790 : ArrayValue —> ValueArray, DictValue —> ValueDict.
2013-12-04 16:02:52 +08:00
James Chen
3136ffc3dd
issue #2790 : Adds CCValue.h/.cpp.
2013-12-04 16:02:51 +08:00
James Chen
d2bddee11e
issue #2790 : Adds CCMap.h.
2013-12-04 16:01:56 +08:00
James Chen
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
James Chen
0d581a15d8
issue #2790 : MenuItemToggle::setSubItems() uses Vector<MenuItem*> now.
2013-12-04 16:01:55 +08:00
James Chen
8aef092005
issue #2790 : TestCpp with new Vector<>.
2013-12-04 16:01:54 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
boyu0
98779b0a9f
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 14:36:32 +08:00
minggo
92b180080c
Merge pull request #4409 from mlepage/develop
...
[ci skip]Fix typos
2013-12-03 19:13:23 -08:00
Ricardo Quesada
a34352cef7
Console is working!
2013-12-03 18:46:54 -08:00
Huabing.Xu
cd562676f5
use block allocation for commands
2013-12-04 10:39:34 +08:00
boyu0
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
Huabing.Xu
757f1abc7f
1. protected render command construction/destruction function.
...
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
2013-12-03 14:08:47 +08:00
Huabing.Xu
44f12ce8e4
add RenderCommandPool head file
2013-12-03 11:52:51 +08:00
Huabing.Xu
d4b9e0538b
refactor: group command use a non parameter constructor and a reentrant init function
2013-12-03 11:24:03 +08:00
Huabing.Xu
d33f05b3f0
refactor: custom command use a non parameter constructor and a reentrant init function
2013-12-03 11:17:21 +08:00
Huabing.Xu
ace75eebce
refactor: quad command use a non parameter constructor and a reentrant init function
2013-12-03 11:11:46 +08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
8801f508eb
Partcle system use the new renderer
2013-12-02 12:13:05 -08:00
Nite Luo
fbadb3329a
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada
dbcae0af1e
Merge branch 'develop' into console
2013-12-02 09:57:53 -08:00
James Chen
9618eb00be
Merge pull request #4411 from martell/cmake
...
closed #3328 : cmake support for windows
2013-12-02 01:22:57 -08:00
martell
06ff1bc594
Fixed HelloCpp Linking on Linux
2013-12-02 07:10:37 +00:00
minggo
d2f235f8b8
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
...
[ci skip]issue #2345 : add tga support to Image
2013-12-01 18:18:42 -08:00
minggo
24f7819e99
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
...
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-12-01 18:08:58 -08:00
martell
f369606d77
fix cocos2d-x for vs2013
2013-11-30 08:05:39 +00:00
martell
79401a7596
quickly added win32 cmake
2013-11-30 06:09:12 +00:00
Marc Lepage
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
Jason Xu
266e4e1654
rename to with Jni suffex
2013-11-29 19:34:36 +08:00
Jason Xu
27c3a459ed
rename android native function names.
2013-11-29 17:17:15 +08:00
boyu0
83f855e2ec
issue #2345 : delete unnecessary include
2013-11-29 15:31:58 +08:00
boyu0
04c3d95005
issue #2345 : namespace cocos2d { -> NS_CC_BEGIN
2013-11-29 15:25:21 +08:00
boyu0
dffc12e648
issue #2345 : new/delete -> malloc/free
2013-11-29 15:13:16 +08:00
boyu0
86074c23d8
issue #2345 : class Image add tga image format support.
2013-11-29 14:31:42 +08:00
minggo
3268da3a4d
Merge pull request #4401 from minggo/thread-helper
...
[ci skip]add helper funcion to invoke a function in gl thread
2013-11-27 22:26:11 -08:00
Ricardo Quesada
21afd63d82
Merge branch 'develop' into console
2013-11-27 14:29:27 -08:00
Nite Luo
83972ecf57
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-11-27 10:16:34 -08:00
Nite Luo
75381ebc51
Merge branch 'develop' into newRenderer
2013-11-27 10:16:17 -08:00
boyu0
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
minggo
eded94ef76
don't create a pool, since it doesn't invoke any iOS dependent codes
2013-11-27 17:43:54 +08:00
boyu0
2b43e72e7c
issue #2771 : fix vs compile errors, change project setting
2013-11-27 17:33:33 +08:00
minggo
bcb131262c
add helper funcion to invoke a function in gl thread
2013-11-27 16:49:07 +08:00
Huabing.Xu
ea46e1c658
change test case
2013-11-27 14:30:38 +08:00
Huabing.Xu
3da196ea43
add Frustum culling to new Sprite
2013-11-27 10:35:12 +08:00
Huabing.Xu
80da1dac3f
add Frustum, AABB, ViewTransform
2013-11-27 10:34:30 +08:00
James Chen
6c097fa692
Merge pull request #4389 from minggo/remove-unneeded-codes
...
override addChild in Sprite to fix error in binding generator
2013-11-26 18:14:20 -08:00
minggo
0ac9022201
fix a typo
2013-11-27 10:02:32 +08:00
minggo
85002285c2
override addChild in Sprite to fix error in binding generator
2013-11-27 09:50:47 +08:00
Nite Luo
3123c70153
Sprite are now using NewRenderer
2013-11-26 17:13:04 -08:00
Nite Luo
bf53cc116b
use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode
2013-11-26 17:01:32 -08:00
Ricardo Quesada
2f1dffe46b
Adds performFunctionInCocos2dThread
...
... in Scheduler
2013-11-26 16:58:14 -08:00
Ricardo Quesada
b7f7b0dae4
Reports wether the build is DEBUG or RELEASE
...
Reports wether the build is DEBUG or RELEASE in Configuration
2013-11-26 14:36:31 -08:00
Nite Luo
92b57c79ba
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
2013-11-26 11:56:03 -08:00
Nite Luo
61ca4f0137
Fix a bug with NewSprite Update Quad
2013-11-26 11:48:37 -08:00
boyu0
8346fe4b4d
issue #2771 : edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX
2013-11-26 18:22:52 +08:00
minggo
fcf43823b4
remove unneeded codes
2013-11-26 17:53:34 +08:00
boyu0
0100c05a93
issue #2771 : fix compile errors
2013-11-26 17:29:09 +08:00
James Chen
63702188be
issue #3258 : Compilation error fix for linux port.
2013-11-26 15:56:43 +08:00
James Chen
b55e8f17c7
issue #3258 : MenuItemFont has empty argument create function now.
2013-11-26 15:44:21 +08:00
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
Nite Luo
f3830985bb
Sprite now using New renderer
2013-11-25 16:33:05 -08:00
Ricardo Quesada
b6f6e72c94
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCActionInstant.h
2013-11-25 13:59:24 -08:00
Nite Luo
19b8ba89e2
Merge branch 'develop' into newRenderer
2013-11-25 10:21:02 -08:00
Nite Luo
b67ec6618f
Finish converting LayerColor start working on particle system
2013-11-22 17:14:24 -08:00
Ricardo Quesada
cc5a03f21a
updates cocos2d version
2013-11-22 16:58:05 -08:00
Ricardo Quesada
447a34655a
RenderTexture contructor ctor is public again
2013-11-22 16:14:05 -08:00
Nite Luo
60ada5dee3
Fonts are now using NewSprite to render
2013-11-22 16:09:11 -08:00
Ricardo Quesada
9b52af010d
Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN
...
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
2013-11-22 16:09:05 -08:00
Ricardo Quesada
3f1983214f
Effects have protected contructors
...
and disallowed copy + assign
2013-11-22 15:07:58 -08:00
Nite Luo
b02af0cbfe
Clean up renderer code
2013-11-22 10:24:52 -08:00
Ricardo Quesada
4d7e56b44a
fix indentation
2013-11-22 09:42:21 -08:00
Jason Xu
7c5784005c
Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-11-23 00:07:15 +08:00
samuele3
eb3f5eb629
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-22 11:52:32 +08:00
samuele3
192deb7952
issue #3228 : Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
2013-11-22 11:51:07 +08:00
Ricardo Quesada
515786a7ee
adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons
...
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
2013-11-21 17:06:06 -08:00
Nite Luo
43941bcbe0
Only init render after GLview has been initialized
2013-11-21 16:36:19 -08:00
Ricardo Quesada
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
Nite Luo
96d2910a99
Merge branch 'develop' into newRenderer
2013-11-21 10:19:32 -08:00
Nite Luo
db52698b26
Fix the crash on ios 7
2013-11-20 20:39:32 -08:00
Ricardo Quesada
90f51e0dab
Merge branch 'develop' into constructors_are_protected
2013-11-20 11:26:55 -08:00
Ricardo Quesada
6a8c4784a4
Adds some #pragma mark love
2013-11-20 11:26:33 -08:00
Ricardo Quesada
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
Nite Luo
f438e83104
Merge branch 'develop' into newRenderer
2013-11-20 11:14:28 -08:00
Nite Luo
0e51504ee6
Use stack to manage current RenderGroup
2013-11-20 11:05:01 -08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
James Chen
6b579ebe5e
Don't deprecate callback functions in Layer. Reason:
...
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
2013-11-20 11:19:51 +08:00
James Chen
93333ad252
Merge pull request #4340 from Dhilan007/jssubmodule
...
recover controller on layer.
2013-11-19 18:49:07 -08:00
Dhilan007
bd3789e0b5
add miss api
2013-11-20 10:40:43 +08:00
James Chen
424431690a
Fixing warning generated by VS2012.
2013-11-20 10:39:30 +08:00
Dhilan007
0646e59bf3
resolve conflict
2013-11-20 10:26:00 +08:00
Ricardo Quesada
9a51d6c0ba
Merge branch 'develop' into constructors_are_protected
2013-11-19 17:59:43 -08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo
8ce16e1e12
Finish DrawNode
2013-11-19 13:57:39 -08:00
Ricardo Quesada
27b09a2b3b
Merge branch 'develop' into constructors_are_protected
2013-11-19 13:54:34 -08:00
Ricardo Quesada
582afe3b61
Fixes warnings in CCLabel
...
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Ricardo Quesada
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
Nite Luo
a3725c2394
Merge branch 'develop' into newRenderer
2013-11-19 11:08:26 -08:00
Nite Luo
7ad64ece36
Add Transform to DrawNode
2013-11-19 11:06:26 -08:00
Dhilan007
dc42645afe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 16:49:28 +08:00
Dhilan007
3929e6070d
fix error form overrides a 'final' function
2013-11-19 16:27:09 +08:00
Dhilan007
c307d83b35
add miss Deprecated api
2013-11-19 16:06:27 +08:00
Dhilan007
1a65af9d1a
fix warn
2013-11-19 15:54:54 +08:00
Dhilan007
f0ab3f9ca1
fix some error in layer controller code
2013-11-19 15:41:22 +08:00
Dhilan007
0586c4d275
recover controller on layer.
2013-11-19 13:56:30 +08:00
minggo
bd00e6fabb
Merge pull request #4326 from dabingnn/develop_hotFix
...
[ci skip]Develop hot fix
2013-11-18 19:33:07 -08:00
Huabing.Xu
fff851a8aa
HotFix: change tab to space
2013-11-19 11:17:02 +08:00
Dhilan007
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
Nite Luo
abb011f0ef
Test clipping node with alpha
2013-11-18 15:52:47 -08:00
Nite Luo
c288e5ef9c
Fix Clipping Node
2013-11-18 14:58:41 -08:00
Ricardo Quesada
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
Nite Luo
e5ebcb2845
Merge branch 'develop' into newRenderer
2013-11-18 10:22:16 -08:00
minggo
fc56d9234e
Merge pull request #4309 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug callback retain release error
2013-11-18 05:14:41 -08:00
Huabing.Xu
699dd9518b
HotFix: fix bug callback retain release error
2013-11-18 21:12:47 +08:00
minggo
c7971bcaad
Merge pull request #4300 from minggo/textinput-crash
...
[ci skip]fix crash of textinput test case
2013-11-18 00:23:51 -08:00
minggo
30b7ac8dd1
fix crash of textinput test case
2013-11-18 15:14:48 +08:00
minggo
bbb579faad
Merge pull request #4298 from boyu0/fix_keypadtest_crash
...
[ci skip]fix keypad test crash bug
2013-11-17 23:01:10 -08:00
boyu0
eea09d60f7
fix keypad test crash bug
2013-11-18 14:33:24 +08:00
minggo
5e4b3c6919
Merge pull request #4291 from dabingnn/develop_hotFix
...
[ci skip]HotFix: remove Mac platform Image::saveToFile assert
2013-11-17 20:57:47 -08:00
boyu0
90f07f680f
Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical
2013-11-18 11:22:20 +08:00
Huabing.Xu
09f27f1d16
HotFix: remove Mac platform Image::saveToFile assert
2013-11-18 10:14:57 +08:00
minggo
982a23af3d
fix some hungarial
2013-11-16 21:08:00 +08:00
Nite Luo
f5a8c1d02c
Fix NewClipNodeTest
2013-11-15 17:32:29 -08:00
Ricardo Quesada
a3fabd6b6d
TiledMap uses std::string
2013-11-15 16:37:57 -08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -08:00
Ricardo Quesada
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
Nite Luo
c5f9434331
Merge branch 'develop' into newRenderer
2013-11-15 11:33:38 -08:00
Nite Luo
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -08:00
Ricardo Quesada
417657b5a9
Merge branch 'develop' into constructors_are_protected
2013-11-15 10:11:49 -08:00
boyu0
988630c12f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-15 16:38:58 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Nite Luo
7ad93d8a94
Create new clippingNode
2013-11-14 16:39:03 -08:00
Ricardo Quesada
17a6575bd3
more protected constructors
...
Adds protected constructors for:
* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
2013-11-14 16:33:43 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Ricardo Quesada
b87684c022
fixes Sprite::setTexture()
...
Sprite::setTexture(std::string&) works as expected.
It sets the texture rect of the sprite
2013-11-14 15:37:43 -08:00
Nite Luo
8d63faa0de
New Renderer working with RenderStack
2013-11-14 12:17:54 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
Nite Luo
a70cad8c97
Merge branch 'develop' into newRenderer
2013-11-14 10:36:43 -08:00
Nite Luo
4f1858fa8a
Crate NewClipping Node
2013-11-14 10:35:28 -08:00
minggo
2f7f05d1d7
fix asynchronize loading bug
2013-11-14 18:39:23 +08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
minggo
e0076cbdf3
Merge pull request #4246 from minggo/zorder-fix
...
[ci skip]Zorder fix
2013-11-13 23:26:05 -08:00
Huabing.Xu
03c8c8f4fc
Fix bug: use free() in imageCommon_cpp.h
2013-11-14 14:48:16 +08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
minggo
a057274115
set z order after reorder
2013-11-14 14:08:50 +08:00
Huabing.Xu
46ef7a7fbc
Fix bug: deprecate old interface
2013-11-14 13:35:17 +08:00
minggo
996be7502a
Merge pull request #4129 from michaelcontento/color-convenience
...
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo
95effc0207
Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut
...
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-13 19:16:34 -08:00
Jason Xu
f4425f5db2
C++11: NULL -> nullptr
2013-11-14 11:08:50 +08:00
Jason Xu
dee3bffcdc
Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-14 10:40:06 +08:00
minggo
ed83a0b374
Merge pull request #4205 from bmanGH/fix_touch_retain
...
[ci skip]fix direct delete touch object without use release crash bug;
2013-11-13 18:30:21 -08:00
minggo
e6653e133b
Merge pull request #4193 from ricardoquesada/doxygen_markdown
...
[ci skip]Adds markdown comments in the doxstrings
2013-11-13 18:15:59 -08:00
minggo
97063dfe7d
Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram
...
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
2013-11-13 18:10:10 -08:00
minggo
a34011c682
Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn
...
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
2013-11-13 18:08:25 -08:00
Huabing.Xu
b4b4e99522
Fix bug: rename const with under line seperator
2013-11-14 10:00:59 +08:00
minggo
84689e0121
Merge pull request #4206 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warnings
2013-11-13 17:57:25 -08:00
minggo
4abf5b50dd
Merge pull request #4214 from samuele3hu/developCCS
...
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
2013-11-13 17:45:34 -08:00
Huabing.Xu
ccbbff3c22
Fix bug: Z fighting on TransitionScenePageTurn
2013-11-14 09:44:35 +08:00