1bd0f90437
Warning fix in js_manual_conversions.cpp/h
2014-01-06 20:02:01 +08:00
f3eb21e748
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
...
closed #3579 : TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
2014-01-03 18:51:16 -08:00
61af958976
closed #3579 : Bug fix in setTouchEnabledForLayer for jsbindings.
2014-01-04 10:32:04 +08:00
e017609fc4
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
2014-01-03 23:59:05 +08:00
b6e676caa4
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
2014-01-03 23:03:48 +08:00
b4d392dc38
update js binding for studio change.
2014-01-03 21:33:48 +08:00
8e2c51d31e
update vs project for split spine binding.
2014-01-03 15:29:50 +08:00
04760f2508
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
2014-01-03 10:30:55 +08:00
831e0b08e0
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
...
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 06:46:25 -08:00
e337fb35fc
closed #3291 : XMLHttpRequest.status needs to be assigned even when connection fails.
2014-01-02 21:59:47 +08:00
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
674b38beef
no in header file
2014-01-02 21:43:27 +08:00
9124f189c3
fix compiling errors because of new namespace of network module
2014-01-02 19:44:46 +08:00
1d8ee016e5
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
...
closed #2050 : fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
1edf748dc3
[JSB] Adds trigger bindings for CocoStudio.
2013-12-30 20:57:46 +08:00
1f72fafd08
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
17ff6ef764
Renames: IntValueMap —> ValueMapIntKey
2013-12-26 22:07:20 +08:00
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
5dfb7f321a
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
2013-12-26 16:03:30 +08:00
0ff85852cc
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
2013-12-24 18:08:40 +08:00
d33b2c41c7
Merge branch 'develop' into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +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
325f2e21a7
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
2013-12-24 10:41:45 +08:00
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
3327614a99
Binds Node::setAnchorPoint manually.
2013-12-23 21:54:02 +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
3096c34311
Removes unneeded binding glue codes, Sprite::setPosition.
2013-12-23 20:25:46 +08:00
669ba8149a
closed #2050 : fix js glue code.
2013-12-23 17:06:13 +08:00
43e9df17bb
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 16:39:25 +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
ca082080b5
Binds FileUtils::getStringFromFile automatically since we have added this method.
2013-12-23 11:47:56 +08:00
0a2490333b
Compilation fix after this PR ( https://github.com/cocos2d/cocos2d-x/pull/4583 ).
2013-12-23 10:03:36 +08:00
55ff96df3a
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.
2013-12-20 17:13:09 +08:00
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +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
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
0414926b52
add API for transform unsigned short
2013-12-17 18:17:04 +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
d63d3b3c24
remove manually JS binding functions
2013-12-16 14:45:21 +08:00
3a11dafda7
Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize.
2013-12-16 14:13:24 +08:00
adb45d3c68
Adds conversions for ssize_t.
2013-12-16 13:01:20 +08:00
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
be7c62a2b9
issue #2790 : Removes unused CCSet binding glue codes.
2013-12-07 14:44:21 +08:00
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
1a283ab600
Merge pull request #4396 from dumganhar/iss3289-armature-crash
...
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
2013-11-26 22:29:36 -08:00
6dc9183c8a
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes!
2013-11-27 14:12:43 +08:00
4311e7c469
[Script Binding] Bind ‘unsigned long’.
2013-11-27 13:52:41 +08:00
f6a1f5cc95
issue #3279 : A warning fix for 64bit platform.
2013-11-26 21:54:48 +08:00
James Chen