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

242 Commits

Author SHA1 Message Date
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
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
CocosRobot d8ec58831a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 09:40:27 +00:00
CocosRobot 0855ff0841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 03:50:57 +00:00
minggo fb2c2ec7f2 Merge pull request #4323 from Dhilan007/jssubmodule 
[ci skip]fix miss bind setGrid\getGrid for JS.
 2013-11-18 18:53:51 -08:00
CocosRobot 186b6fd98b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 02:40:44 +00:00
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +08:00
minggo 27f35ac3e3 Merge pull request #4312 from samuele3hu/developTableView 
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
 2013-11-18 07:09:57 -08:00
minggo 0e2ea2971d Merge pull request #4313 from minggo/develop 
[ci skip]fix compiling error of js template
 2013-11-18 06:33:23 -08:00
minggo 2028cde015 fix compiling error of js template 2013-11-18 22:32:13 +08:00
samuele3 6c88dd34c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 22:17:47 +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
CocosRobot 853a895c69 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:57:00 +00:00
James Chen 060e8413dd Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 02:51:11 -08:00
CocosRobot 7afb8877c5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:40:18 +00:00
minggo 593c0f8946 Merge pull request #4304 from Dhilan007/di3223 
[ci skip]issue #3223:bind gui and studio
 2013-11-18 02:28:53 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +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
minggo f06d71dd49 Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-14 02:26:45 -08:00
CocosRobot 523cb2e8d9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 09:39:25 +00: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 a20620c185 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-14 14:14:52 +08:00
samuele3 babc985409 Add deprecated functions of class TextureCache 2013-11-14 14:12:25 +08:00
CocosRobot 515d20d863 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 04:32:48 +00:00
rablwupei 96462eb81f fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +08:00
CocosRobot dff9c6a5b5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 01:52:57 +00:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
CocosRobot 0acaa1f76e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-12 09:50:13 +00:00
samuele3 ae6597dbaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 
Conflicts:
	tools/bindings-generator
 2013-11-12 17:23:41 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
Ricardo Quesada be64dd97cf replaces `delete[]` with `free()` in C-based API 
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.

- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`

But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...

So, this patch does:

- Migrates the API from  `new []` / `delete[]` to  `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
 2013-11-11 18:09:47 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
James Chen 49289d7576 Adding cc.TextureCache.getInstance() to jsb_deprecated.js. 2013-11-11 16:45:44 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
CocosRobot 2e52dd4905 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 08:05:15 +00:00
James Chen 9d7a8c44f9 Reverts auto-generated. 2013-11-11 14:40:23 +08:00
James Chen 8f8d0f86d7 Updating Bindings-generator. 2013-11-11 14:38:12 +08:00
James Chen ff3bfbe8a2 Using std::unordered_map instead of UTHASH for js_type_class_t. 
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
 2013-11-11 14:36:43 +08:00
James Chen 5a0df8d2e8 VS2012 doesn’t support invoke another constructor method in current constructor. 2013-11-11 14:36:43 +08:00
James Chen fe88f7c941 Fixing memory leak of JSStringWrapper::set . 2013-11-11 14:36:43 +08:00
James Chen 9d5813b7d9 Some fixes: 
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
 2013-11-11 14:36:42 +08:00
James Chen 0c4b6e7a37 Removing JSB Version since JSB source codes will be updated with cocos2d-x. 
Also, remove some unused codes.
 2013-11-11 10:40:51 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop 
[ci skip]fix tolua_fix, cleanup peertable after object deleted
 2013-11-10 17:44:24 -08:00
dualface c75c20de04 fix Lua 5.2 compatibility 2013-11-10 11:49:52 +08:00
CocosRobot 6e6c63e111 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-10 03:29:03 +00:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
dualface 2a2fc81f86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-10 00:00:19 +08:00
samuele3 e26fe04deb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-09 23:04:11 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -08:00
CocosRobot fd37d3e973 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 04:17:15 +00:00