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

97 Commits

Author SHA1 Message Date
James Chen 6b73fa570e Merge pull request #4601 from samuele3hu/toluaerror 
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
 2013-12-23 05:40:15 -08:00
samuele3hu b1dd233a04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 20:30:33 +08:00
samuele3hu 48a95cfa55 [Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>. 2013-12-23 20:29:05 +08:00
samuele3hu 783be69322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 17:20:17 +08:00
James Chen 9dff1dcd36 [LUA] Removes CCCameraDeprecated table in Deprecated.lua. 2013-12-23 16:37:40 +08:00
samuele3hu f0dc7f0b15 issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info 2013-12-23 11:19:55 +08:00
samuele3hu 71d5896d41 issue #3403:Delete Camera manual lua binding 2013-12-23 09:42:36 +08:00
samuele3hu 50bcdee725 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
samuele3hu 97f26176e8 issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08: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
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
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
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +08: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
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 defae416f3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-13 18:09:39 +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 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
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
James Chen 320ae15db4 issue #2790: Lua compilation fix. 2013-12-12 10:54:41 +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
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
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 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
boyu0 d6d7923134 closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them 2013-12-09 11:32:28 +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
samuele3 ad8638d976 issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper 2013-12-06 14:16:33 +08: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
James Chen 4311e7c469 [Script Binding] Bind ‘unsigned long’. 2013-11-27 13:52:41 +08:00
James Chen ebcdf2f87d issue #3258: Bug fix of MenuItemToggle binding. 2013-11-26 15:44:49 +08: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
samuele3 a2e9920288 Hot fix:Repair some lua test samples and modify layer touch listener functions 2013-11-18 22:16:49 +08:00
samuele3 ee815c8e9a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 15:57:14 +08:00
samuele3 b281a2f06f Hot fix:repalce unsigned int/int type of params with long to solve tableview bug 2013-11-18 15:55:58 +08:00
samuele3 5c8d24a11e hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in 2013-11-18 14:12:07 +08:00
samuele3 c1bdd8ad3c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-15 13:49:19 +08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-11-15 09:44:29 +08:00
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-11-14 14:47:01 +08:00
samuele3 babc985409 Add deprecated functions of class TextureCache 2013-11-14 14:12:25 +08:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00