c29b796c15
fix actionTest->ActionCardinalSplineStacked
2013-12-25 09:58:35 +08:00
122f97f20a
fix actionTest->ActionFollow, ActionCatmullRomStacked
2013-12-25 09:51:55 +08:00
0dac69523c
Remove "_renderer" from widget
2013-12-24 20:22:14 +08:00
e497f823ea
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
2013-12-24 16:14:10 +08:00
0305ff15db
Merge pull request #4625 from dabingnn/develop_NewClippingNode
...
Develop new clipping node
2013-12-23 23:20:38 -08:00
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
67c3480320
change std::string.compare() to ==
2013-12-24 14:21:25 +08:00
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
9f8d95131e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 13:48:41 +08:00
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
b61bf3ad95
LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
...
remove NewSpriteBatchNode testcase to SpriteBatchNode
2013-12-24 10:51:35 +08:00
4de3e520d8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 10:51:24 +08:00
6dd55921aa
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-24 10:44:57 +08:00
c4f4f91cb4
Merge branch 'develop' into develop_mergeNewSprite
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Binds Node::setAnchorPoint manually.
Don’t hide parent’s addChild method in TMXLayer class.
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates JS-tests to the latest version.
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
Updates js tests to the latest version.
Removes unneeded binding glue codes, Sprite::setPosition.
Bindings-generator skips Node::setContentSize. Binds it manually.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3353:Add the DisplayLinkDirector lua binding
issue #2771 : fix warning log and fix typo.
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-24 10:03:21 +08:00
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
b08995ae67
Updates JS-tests to the latest version.
2013-12-23 21:14:55 +08:00
e66eb6464d
use Sprite instead of NewSprite
2013-12-23 21:07:25 +08:00
a48544c814
Merge pull request #4598 from boyu0/iss2771_physical
...
issue #2771 : fix warning log and fix typo.
2013-12-23 05:00:03 -08:00
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
92ee688b73
Updates js tests to the latest version.
2013-12-23 20:26:13 +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
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
a19000b49f
Add samples
2013-12-23 15:35:35 +08:00
69f1834e61
issue #2771 : fix warning log and fix typo.
2013-12-23 14:30:43 +08:00
8d9035c5e8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 14:06:22 +08:00
ba809a0096
change const char* to const std::string&
2013-12-23 14:05:46 +08:00
f0dc7f0b15
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
2013-12-23 11:19:55 +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
3d37a26e21
Merge pull request #4523 from Dhilan007/increase_test_pressure
...
increase label test pressure.
2013-12-21 17:08:20 -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
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -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
0db2067f97
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
2013-12-20 20:11:41 +08:00
ef1709bc3d
Add SpineTest to TestJavascript 1
2013-12-20 19:20:13 +09:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -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
99ae4d86d3
fixes compiler warnings
...
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
cfec4d5b7e
Updates spine test.
2013-12-19 21:35:43 +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
2d2a6b205d
Adds const in ShaderTest2.h
...
Adds const in ShaderTest2.h
2013-12-18 21:15:47 -08:00
113fa9924e
Merge pull request #4550 from dumganhar/merge-pr-4532
...
Merge pr 4532
2013-12-18 20:12:18 -08:00
c044a91f6e
Adds `std::for_each` test in invocation
...
and removes CArray and CMacro tests
2013-12-18 19:28:09 -08:00
a6a432d2a2
fixed not render
2013-12-19 10:42:06 +08:00
93eaf44e9c
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
2013-12-19 09:42:21 +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
d1b555614e
removes `using namespace std` from header file
...
... in order to prevent possible collisions.
`using namespace XXX` MUST never be used in header files.
2013-12-18 11:45:30 -08:00
324732b867
change play arguments
2013-12-18 23:29:54 +08:00
57c33e0604
fixed compile error
2013-12-18 22:36:10 +08:00
d3a575e8cc
change for iterator and callfunc
2013-12-18 22:07:33 +08:00
026811ca59
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-18 22:03:16 +08:00
9c0d39c6f9
Merge pull request #4531 from dumganhar/extension-warning-fix
...
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 01:48:14 -08:00
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
f5f95399fd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-18 14:58:35 +08:00
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
4d4b96ba30
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 11:39:43 +08:00
2a3390d3eb
increase label test pressure.
2013-12-18 10:46:02 +08:00
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -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
6ff45b09e7
Merge branch 'newRenderer' into Array
...
Conflicts:
cocos/editor-support/cocostudio/CCArmature.cpp
cocos/editor-support/cocostudio/CCArmature.h
cocos/editor-support/cocostudio/CCBatchNode.cpp
cocos/editor-support/cocostudio/CCColliderDetector.cpp
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-17 18:06:11 +08:00
c0d741d0d8
Merge pull request #4507 from dumganhar/del-vector-foreach
...
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 01:55:35 -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
bcb07abb7b
Merge pull request #4505 from 2youyouo2/newRenderer
...
update armature to new render
2013-12-17 01:43:07 -08:00
bc868cc004
update armature to new render
2013-12-17 17:00:01 +08:00
d3a4dbab08
iOS & Mac project fix.
2013-12-17 16:34:05 +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
16ed9155c0
Merge pull request #4460 from Dhilan007/label_distanceField
...
new label:add support for distanceField
2013-12-16 23:18:41 -08:00
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
4e01769cd5
issue #2171 : [New Renderer] Fixing compilation errors for Android.
2013-12-17 14:18:41 +08:00
2a38a2c154
[Win32] fix argument type.
...
- argument of interface is ssize_t.
2013-12-17 15:11:37 +09:00
3a25d9079d
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-16 13:58:27 -08:00
5c178f1c93
Merge branch 'develop' into newRenderer
2013-12-16 13:57:29 -08:00
6abb6639b5
remove android properties change by eclipse
2013-12-16 19:22:40 +08:00
545000a213
Add mouse scrolling support for extension test
2013-12-16 17:40:34 +08:00
81cdbea9c8
change Array to Vector, Dictionary to Map
2013-12-16 14:34:09 +08:00
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
32f23ebdba
fix bad position for performance test about Label.
2013-12-16 11:04:52 +08:00
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
2444f407b2
issue #3162 : fix test title
2013-12-16 04:13:49 +08:00
917bd8c3d9
change Array to Vector
2013-12-13 19:40:38 +08:00
0e8c3409e5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-12-13 16:28:50 +08:00
4befb50307
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
2013-12-13 16:26:26 +08:00
6a3aff0861
fixed change animation internal, animation speed not right
2013-12-13 15:58:58 +08:00
8b9cfd7d35
fix compiling error on linux and android.
2013-12-13 12:58:16 +08:00
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
349724b6fd
Fix ArmatureSceneTest Crash
2013-12-12 15:15:43 +08:00
503918db02
Fix EffectAdvancedTest Crash
2013-12-12 15:15:42 +08:00
8bcbf8d186
Fix EffectTest Crash
2013-12-12 15:15:42 +08:00
Huabing.Xu