f5ae2bbacc
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
...
issue #3401 : physical lua binding
2014-01-06 23:48:47 -08:00
cf146b32cf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
d15768d630
Removes RELASE_NOTES
2014-01-06 16:28:24 -08:00
b4118a7ccc
fixed #3582
...
1. add #include "cocostudio/CCComBase.h" into CocoStudio.h
2014-01-05 03:55:10 +08:00
aae6d27c74
fixed #3582
...
1. revert ComRender::create(cocos2d::Node *node, const char *comName).
2014-01-05 03:11:32 +08:00
bac600ab9f
fixed #3582
...
1. create Component By component Factory.
2014-01-05 02:22:32 +08:00
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
81bdfac795
Modify class name Label LabelBMFont LabelAtlas
2013-12-31 16:36:33 +08:00
8ae7ecff33
Merge branch 'develop' into #3457
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-12-26 12:55:52 +08:00
96279c12dc
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 18:32:15 +08:00
d72c9d94d7
upload trigger code.
2013-12-25 17:40:54 +08:00
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
2ae8576e0f
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 10:40:05 +08:00
e4e22b52cb
Merge branch 'develop' into #3456
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-12-24 22:05:13 +08:00
64f0987fea
issue #3456 ios test rapidjson.
2013-12-24 21:23:24 +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
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
24ac743a3c
remove class NewSpriteBatchNode
2013-12-24 11:03:59 +08:00
6dd55921aa
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-24 10:44:57 +08:00
8d58e43ad2
remove Class NewSprite
2013-12-24 09:40:00 +08:00
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +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
1dd2c1c20c
remove NewTextureAtlas
2013-12-23 20:11:50 +08:00
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
9aa85d2bd6
Remove NodeRGBA inherit
2013-12-23 15:02:52 +08:00
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
0db2067f97
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
2013-12-20 20:11:41 +08:00
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09: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
e673bd80bb
new spine runtime applied
2013-12-19 10:50:37 +09:00
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -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
d3a4dbab08
iOS & Mac project fix.
2013-12-17 16:34:05 +08:00
5d248ef77a
issue #2171 : Reorder renderer files for iOS & mac project.
2013-12-17 15:40:17 +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
2be1a640fa
update Xcode project file
2013-12-13 10:58:31 +08:00
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
8b69994d5c
issue #2790 : Removes CCBValue.
2013-12-09 17:55:56 +08:00
d8061477c1
issue #2790 : Removes CCSort.h/.cpp from projects.
2013-12-07 14:21:01 +08:00
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
dcf4eacd92
update project
2013-12-05 22:24:51 -08:00
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
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
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
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
James Chen