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

14337 Commits

Author SHA1 Message Date
James Chen a515c7eb1c Merge pull request #4616 from CocosRobot/updategeneratedsubmodule_1387852095 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 18:36:46 -08:00
CocosRobot d22f2aaf67 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 02:28:17 +00:00
James Chen dfaae3072b Merge pull request #4615 from dabingnn/develop_mergeNewSprite 
Develop merge new sprite
 2013-12-23 18:23:30 -08:00
Huabing.Xu 8310c18105 update project file: android and linux 2013-12-24 10:07:53 +08:00
Huabing.Xu c4f4f91cb4 Merge branch 'develop' into develop_mergeNewSprite 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Binds Node::setAnchorPoint manually.
  Don’t hide parent’s addChild method in TMXLayer class.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates JS-tests to the latest version.
  [Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
  Updates js tests to the latest version.
  Removes unneeded binding glue codes, Sprite::setPosition.
  Bindings-generator skips Node::setContentSize. Binds it manually.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3353:Add the DisplayLinkDirector lua binding
  issue #2771: fix warning log and fix typo.
  issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
 2013-12-24 10:03:21 +08:00
Huabing.Xu 8d58e43ad2 remove Class NewSprite 2013-12-24 09:40:00 +08:00
James Chen a9f014eb22 Merge pull request #4612 from CocosRobot/updategeneratedsubmodule_1387807797 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 07:31:57 -08:00
CocosRobot a9d8a64e63 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 14:10:01 +00:00
James Chen 44f9009a5d Merge pull request #4610 from dumganhar/lastest-js-test 
Updates JS-test to the latest version and some binding fixes
 2013-12-23 06:04:49 -08:00
James Chen d6850c363a Updates Bindings-generator. 2013-12-23 22:00:11 +08:00
James Chen 3327614a99 Binds Node::setAnchorPoint manually. 2013-12-23 21:54:02 +08:00
James Chen 5f17984826 Don’t hide parent’s addChild method in TMXLayer class. 2013-12-23 21:53:23 +08:00
James Chen 9e1801a1b8 Merge pull request #4608 from CocosRobot/updategeneratedsubmodule_1387806355 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 05:46:38 -08:00
CocosRobot cc7aa1ee0d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 13:45:59 +00:00
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
James Chen 09e04e1490 Merge pull request #4607 from samuele3hu/NewEventDispatcher 
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>
 2013-12-23 05:38:53 -08:00
James Chen b08995ae67 Updates JS-tests to the latest version. 2013-12-23 21:14:55 +08:00
Huabing.Xu e66eb6464d use Sprite instead of NewSprite 2013-12-23 21:07:25 +08:00
Huabing.Xu c3247c800f merge feature function from NewSprite into Sprite 2013-12-23 21:06:37 +08:00
James Chen a48544c814 Merge pull request #4598 from boyu0/iss2771_physical 
issue #2771: fix warning log and fix typo.
 2013-12-23 05:00:03 -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
James Chen 92ee688b73 Updates js tests to the latest version. 2013-12-23 20:26:13 +08:00
James Chen 3096c34311 Removes unneeded binding glue codes, Sprite::setPosition. 2013-12-23 20:25:46 +08:00
James Chen b3cc7d7e68 Bindings-generator skips Node::setContentSize. Binds it manually. 2013-12-23 20:25:11 +08:00
James Chen 1ed0f80348 Merge pull request #4605 from dabingnn/develop_mergeNewTextureAtlas 
Develop merge new texture atlas
 2013-12-23 04:16:16 -08:00
James Chen 041f62c389 Merge pull request #4606 from CocosRobot/updategeneratedsubmodule_1387800852 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 04:15:33 -08:00
CocosRobot 2efe4b7420 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 12:14:14 +00:00
Huabing.Xu b3eb297249 Merge branch 'develop' into develop_mergeNewTextureAtlas 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break'
  Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
  Updates bindings-generator, skips to bind override functions.
  Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
 2013-12-23 20:12:06 +08:00
Huabing.Xu 1dd2c1c20c remove NewTextureAtlas 2013-12-23 20:11:50 +08:00
James Chen bbbfa4b106 Merge pull request #4603 from dabingnn/develop_mergeNewRenderTexture 
Develop merge new render texture
 2013-12-23 04:09:33 -08:00
Huabing.Xu 98d573f4cb rename protected _beginWithClear to beginWithClear 2013-12-23 19:59:09 +08:00
James Chen 8bfabb0989 Merge pull request #4604 from CocosRobot/updategeneratedsubmodule_1387799293 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 03:50:02 -08:00
CocosRobot 509d4513eb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 11:48:15 +00:00
James Chen eb9cb237d5 Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes 
closed #3480: Removes unneeded codes of override function.
 2013-12-23 03:43:27 -08:00
James Chen 0c19081a0b Merge pull request #4602 from dumganhar/bmfont-fix 
closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break'
 2013-12-23 03:18:39 -08:00
Huabing.Xu 0dab85a3bf update CMakeLists.txt 2013-12-23 18:37:18 +08:00
Huabing.Xu 75597bc47f Merge branch 'develop' into develop_mergeNewRenderTexture 
* develop:
  [LUA] Removes CCCameraDeprecated table in Deprecated.lua.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
  Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
  issue #3403:Delete Camera manual lua binding
  issue #3403:Add the EventDispatcher lua binding and the releated test cases
 2013-12-23 18:34:12 +08:00
James Chen 8c3315de76 closed #3478: BitmapFontMultiLineAlignment test shows some unneeded 'line break' 2013-12-23 18:23:39 +08:00
Huabing.Xu 9c97fc6f19 remove NewRenderTexture include file 2013-12-23 18:08:50 +08:00
Huabing.Xu bcaec978d3 remove NewRenderTexture Class 2013-12-23 18:04:04 +08:00
Huabing.Xu 487e0b21af update Xcode project file& android.mk 2013-12-23 18:03:08 +08:00
samuele3hu 4399adc869 issue #3353:Add the DisplayLinkDirector lua binding 2013-12-23 17:31:57 +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
Huabing.Xu 41a77fed61 TestCase Use RenderTexture instead of NewRenderTexture 2013-12-23 17:13:41 +08:00
Huabing.Xu a7a50dffcc move begin(), end(),draw() to RenderTexture 2013-12-23 17:13:06 +08:00
James Chen ed93f90ccc Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings. 2013-12-23 16:58:26 +08:00
James Chen 46cc91be3b Updates bindings-generator, skips to bind override functions. 2013-12-23 16:41:17 +08:00
James Chen 43e9df17bb Removes unneeded ‘clone’ in cocos2d_specifics.cpp. 2013-12-23 16:39:25 +08:00
James Chen 58966a433e Merge pull request #4599 from dumganhar/lua-bind-remove-cccameradeprecated 
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
 2013-12-23 00:38:27 -08:00