Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,508 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

305 Commits

Author SHA1 Message Date
CocosRobot bc5fd247ac [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 20:35:41 +00:00
CocosRobot 58e25a657f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 03:47:33 +00:00
CocosRobot f3d3e65e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 09:35:05 +00:00
James Chen 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
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
CocosRobot 8c0d74bb33 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 02:56:57 +00:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00
CocosRobot 982d5626fc [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 13:13:34 +00:00
CocosRobot fc1516aee4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 12:54:14 +00:00
James Chen 755d29b0e1 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind 2013-12-19 20:17:54 +08:00
James Chen 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
CocosRobot 8421d43195 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 10:12:28 +00: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
CocosRobot ac24dec620 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 04:19:07 +00:00
CocosRobot 403315e315 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 03:58:41 +00:00
CocosRobot 228b4ebf75 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 22:11:07 +00:00
CocosRobot d0779b5352 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 20:14:20 +00:00
CocosRobot 000958bf82 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 09:57:15 +00:00
James Chen 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
James Chen 589b71eecf Merge pull request #4530 from samuele3hu/developConversion 
issue #3402:Add the new label lua binding and the releated test cases
 2013-12-18 01:16:47 -08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +08:00
CocosRobot 8f1e94471e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 06:52:09 +00:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
CocosRobot 12d8740537 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 10:39:43 +00:00
James Chen 37f408f2b9 Merge pull request #4506 from Dhilan007/ushort_jsb 
add API for transform unsigned short
 2013-12-17 02:20:56 -08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +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
CocosRobot 30521ff5a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 09:50:36 +00:00
CocosRobot 91cfecb931 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 08:13:06 +00:00
CocosRobot 21c74322bd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 07:25:00 +00:00
Huabing.Xu d63d3b3c24 remove manually JS binding functions 2013-12-16 14:45:21 +08:00
CocosRobot 1e645cfcd5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-16 06:36:50 +00:00
James Chen 3a11dafda7 Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize. 2013-12-16 14:13:24 +08:00
James Chen adb45d3c68 Adds conversions for ssize_t. 2013-12-16 13:01:20 +08:00
boyu0 c15ad14ed3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-16 03:45:06 +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
Dhilan007 4e2e423615 fix compile error related to ssize_t. 2013-12-13 17:53:03 +08:00
CocosRobot 4114b682ca [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-13 09:10:37 +00:00
samuele3hu 6c49131ed6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-13 15:51:03 +08:00
samuele3hu 98bd84c436 Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define 2013-12-13 15:50:12 +08:00
boyu0 aabb2c655d issue #3162: reset submodule 2013-12-13 11:48:16 +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
CocosRobot 644e2d923c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 22:48:57 +00: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
samuele3hu 4ccceea230 Fix:Remove some needless lua binding functions and resolve a bug 2013-12-12 14:47:35 +08:00
CocosRobot f12895a020 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 03:32:44 +00:00
James Chen 320ae15db4 issue #2790: Lua compilation fix. 2013-12-12 10:54:41 +08:00
samuele3hu d104f49dea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-11 12:06:37 +08:00
samuele3hu 6d8deac8a8 issue #3374:Register the lua manual binding funtions leading to the top index of lua state 2013-12-11 12:05:46 +08:00
CocosRobot bf11a8d309 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 11:27:50 +00: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
samuele3hu 89c079009b issue #2790:Resolve some errors of basical conversion functions 2013-12-10 18:01:40 +08:00
CocosRobot a775f7940d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 08:30:00 +00:00
CocosRobot b5a0048ffd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 07:21:39 +00:00
CocosRobot 1927e3e62c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 04:08:19 +00:00
samuele3 85783fff2b issue #2790:Unify the format 2013-12-10 11:47:51 +08:00
samuele3 34c0147cf3 issue #2790:Resolve the compile error 2013-12-10 11:33:57 +08:00
samuele3 f801a8e5fe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-10 11:21:59 +08:00
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
CocosRobot b2e7966137 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-09 03:53:01 +00:00
boyu0 d6d7923134 closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them 2013-12-09 11:32:28 +08:00
James Chen f406dcfebc Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray 2013-12-07 23:32:49 +08:00
James Chen be7c62a2b9 issue #2790: Removes unused CCSet binding glue codes. 2013-12-07 14:44:21 +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
CocosRobot 8442f17259 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-06 09:31:16 +00:00
James Chen b5978eeee6 issue #2790: Bindings-generator supports binding Vector<T> and some bug fixes. 2013-12-06 16:46:19 +08:00
samuele3 c006bfd68e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 2013-12-06 14:17:23 +08:00
samuele3 ad8638d976 issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper 2013-12-06 14:16:33 +08:00
CocosRobot d04f777351 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-05 04:02:07 +00:00
CocosRobot a354031526 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-04 07:47:50 +00:00
samuele3 c1a226686f issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
samuele3 a8c1bba464 issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings 2013-12-03 15:40:59 +08:00
CocosRobot a24af527a3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-28 03:14:39 +00:00
James Chen 468ba24183 Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-26 22:32:04 -08:00
James Chen 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
CocosRobot 4d327b8180 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 06:25:08 +00:00
James Chen 6dc9183c8a closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes! 2013-11-27 14:12:43 +08:00
James Chen 4311e7c469 [Script Binding] Bind ‘unsigned long’. 2013-11-27 13:52:41 +08:00
James Chen f4610c5272 Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin 
closed #3279: XMLHttpRequest receives wrong binary array.
 2013-11-26 19:02:07 -08:00
CocosRobot dda13b7e8a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 02:18:42 +00:00
James Chen f6a1f5cc95 issue #3279: A warning fix for 64bit platform. 2013-11-26 21:54:48 +08:00
James Chen ecc7783685 closed #3279: XMLHttpRequest receives wrong binary array. 2013-11-26 20:31:44 +08:00
CocosRobot 17c4631f45 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-26 08:36:22 +00:00
James Chen 999b7ccd07 Merge pull request #4375 from dumganhar/constructors_are_protected 
issue #3258: Merge PR #4351: Constructors are protected
 2013-11-26 00:30:06 -08:00
James Chen ebcdf2f87d issue #3258: Bug fix of MenuItemToggle binding. 2013-11-26 15:44:49 +08:00
James Chen 5fbf164142 closed #3274: Can't override cc.Node.setPosition in JSB. 2013-11-26 10:14:56 +08:00
Ricardo Quesada a198fb51df JS Bindings Menu 
doesn't initialize the menu twice.
 2013-11-25 16:24:33 -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
James Chen 9ebc4e3722 Merge pull request #4358 from samuele3hu/developTableView 
issue #3228:CallFuncND + auto remove lua test case have no effect
 2013-11-25 00:18:30 -08:00
James Chen b9fa8566f2 closed #3273: ScriptingCore::evalString crashes 2013-11-25 15:52:59 +08:00
James Chen 8574fb0494 Build fix for XMLHttpRequest after using std::unordered_map instead of std::map. 2013-11-25 15:11:43 +08:00
CocosRobot a4c2ccdf65 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-25 02:16:36 +00: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 b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
CocosRobot 54ef1d6c15 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-20 04:24:55 +00:00