eb9cb237d5
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
...
closed #3480 : Removes unneeded codes of override function.
2013-12-23 03:43:27 -08:00
0dab85a3bf
update CMakeLists.txt
2013-12-23 18:37:18 +08:00
75597bc47f
Merge branch 'develop' into develop_mergeNewRenderTexture
...
* develop:
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583 ).
issue #3403:Delete Camera manual lua binding
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
8c3315de76
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
2013-12-23 18:23:39 +08:00
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
bcaec978d3
remove NewRenderTexture Class
2013-12-23 18:04:04 +08:00
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
a7a50dffcc
move begin(), end(),draw() to RenderTexture
2013-12-23 17:13:06 +08:00
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
fad585fbef
move rendering callback to RenderTexture
2013-12-23 15:59:47 +08:00
b7c0d7a9e8
1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear
2013-12-23 14:59:44 +08:00
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
aeafe06d7f
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
11423b5851
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
2013-12-23 11:53:39 +08:00
7daace0b2a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 09:43:05 +08:00
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
786b7d9912
update vs project for remove CCCamera.
2013-12-22 17:19:59 +08:00
4f435a8613
Adds getScene() to Node
...
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
49903ea779
Director emits events after visit, after draw and after update. And when the projection changes
...
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
eea2e70d1e
Adds events in director
2013-12-21 00:56:28 -08:00
72d77bb035
removes dirty from ActionCamera
2013-12-20 19:45:30 -08:00
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -08:00
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
b8b7714431
Camera is working OK in 2d projection
2013-12-20 19:19:24 -08:00
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
0703d974e2
NodeGrid fixes
...
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
2013-12-20 11:52:52 -08:00
2a7b2c107a
Updates CCUserDefaultAndroid.cpp.
2013-12-20 21:51:53 +08:00
9bea08ded9
Merge pull request #4580 from dabingnn/develop_MotionStreak
...
Migrate MotionStreak to new renderer
2013-12-20 05:36:52 -08:00
739cf0ce85
Migrate MotionStreak to new renderer
2013-12-20 21:21:50 +08:00
9e05f300f3
[Data Refactor] compilation error fix.
2013-12-20 21:16:46 +08:00
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
3d76281617
Removes an unused assert.
2013-12-20 19:49:25 +08:00
5852c66e5a
closed #3463 : ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
2013-12-20 19:47:11 +08:00
a8d2ae9eda
Merge branch 'develop' into develop_transitionScene
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
[AUTO] : updating submodule reference to latest autogenerated bindings
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 19:15:50 +08:00
f3e4d9277e
spine android build phase moved
2013-12-20 19:16:16 +09:00
e54c993918
Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android
...
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 00:13:05 -08:00
ef5b072182
fix transition scene CrossFade
2013-12-20 14:38:02 +08:00
2c590cea3e
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-20 14:06:24 +08:00
87f62bc8a0
Merge branch 'develop' into develop_transitionScene
...
* develop:
#include <string> in CCComponentContainer.h to fix linux build failure.
#include <algorithm> for std::find in CCVector.h.
const love in CCFileUtils.cpp.
More std::for_each —> for(const auto& …)
2013-12-20 12:45:22 +08:00
ea751f8f1f
Merge pull request #4568 from dabingnn/develop_transitionScene
...
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
9385fb3481
fix transition scene progress timer
2013-12-20 10:53:35 +08:00
e56a4a7c00
Merge pull request #4567 from dumganhar/for_each-gone
...
All std::for_each has gone. uses for(const auto& ...) instead.
2013-12-19 18:50:50 -08:00
a53f00c579
#include <string> in CCComponentContainer.h to fix linux build failure.
2013-12-20 10:41:29 +08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
58772d7dec
const love in CCFileUtils.cpp.
2013-12-20 10:11:41 +08:00
34382b4a8a
More std::for_each —> for(const auto& …)
2013-12-20 09:54:50 +08:00
f5d0d1ce43
batched children work as expected
...
Fixed order in the multi matrix.
2013-12-19 16:33:47 -08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
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
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
44366c653c
fix compile error
2013-12-19 17:20:36 +08:00
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
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
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
1d3cc7a24c
Skew works again!
2013-12-18 21:11:06 -08:00
d31c1457b1
Merge pull request #4546 from Dhilan007/update_vsProject
...
update vs project for removes unneeded files
2013-12-18 19:30:21 -08:00
d138925aa0
Merge branch 'develop' into node_fixes
2013-12-18 18:33:56 -08:00
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
ffa6ad3cb2
update vs project for removes unneeded files
2013-12-19 10:24:50 +08:00
9fc28e6c7d
Merge pull request #4534 from boyu0/edit_hungarian_notation
...
Edit hungarian notation
2013-12-18 18:10:17 -08:00
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
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
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
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
b36d77b1c2
Android and Linux fixes
2013-12-18 12:07:51 -08:00
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
d0b039ceda
fix compile errors.
2013-12-18 22:44:03 +08:00
71be55a9aa
revert AccelerometerSimulation.m
2013-12-18 19:02:49 +08:00
f16384a105
fix more code with hungarian notation
2013-12-18 18:51:36 +08:00
082c3d274a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:05:30 +08:00
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
46d1d5bb91
add GridNode New renderer imp
2013-12-18 17:19:50 +08:00
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
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
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
24f89ac45c
Revert... android platform is 10
2013-12-17 19:07:28 -08:00
156f69c528
Renderer is subclass of Object again... needed for Android.
...
ouch
2013-12-17 19:06:22 -08:00
5c9b8db0cb
Updates project files file Linux and Android
2013-12-17 18:47:46 -08:00
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
f369a8eec3
Adds correct License to Renderer files
2013-12-17 18:12:15 -08:00
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -08:00
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
441cb6c282
fixes warnings in QuadCommand
2013-12-17 10:35:15 -08:00
ff106ed070
fixes warning on Label Fragment shader
2013-12-17 10:01:38 -08:00
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
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
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
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
649e6b8065
use size_t replace unsigned int for record redeque::size returned value.
2013-12-17 16:04:48 +08:00
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
7fc7757470
issue #2171 : Adds header files of renderer in cocos2d.h.
2013-12-17 15:40:50 +08:00
08edcca9be
issue #2171 : small fix in ccTypes.h
2013-12-17 15:39:35 +08:00
James Chen