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

14480 Commits

Author SHA1 Message Date
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
James Chen 9dff1dcd36 [LUA] Removes CCCameraDeprecated table in Deprecated.lua. 2013-12-23 16:37:40 +08:00
Huabing.Xu fad585fbef move rendering callback to RenderTexture 2013-12-23 15:59:47 +08:00
Huabing.Xu b7c0d7a9e8 1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear 2013-12-23 14:59:44 +08:00
boyu0 69f1834e61 issue #2771: fix warning log and fix typo. 2013-12-23 14:30:43 +08:00
yinkaile 8d9035c5e8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-23 14:06:22 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
James Chen 7c6b4f2838 Merge pull request #4597 from CocosRobot/updategeneratedsubmodule_1387777977 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-22 22:00:44 -08:00
CocosRobot 9901703f4a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 05:52:59 +00:00
James Chen f9c45f89ac Merge branch 'data-refactor' of https://github.com/dumganhar/cocos2d-x into data-refactor 2013-12-23 13:52:42 +08:00
James Chen 2fec81fcae Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 13:52:15 +08:00
James Chen 71966d8ca9 Merge pull request #4593 from samuele3hu/NewEventDispatcher 
issue #3403:Add the EventDispatcher lua binding and the releated test cases
 2013-12-22 21:46:12 -08:00
James Chen 4ed988b8c5 Fixes linux build failure. 2013-12-23 13:45:31 +08:00
James Chen 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
James Chen 11423b5851 Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant. 2013-12-23 11:53:39 +08:00
James Chen 366c4ca9fb Updates tools/tojs(tolua)/cocos2dx.ini. 2013-12-23 11:48:22 +08:00
James Chen ca082080b5 Binds FileUtils::getStringFromFile automatically since we have added this method. 2013-12-23 11:47:56 +08:00
samuele3hu 9128960c13 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 11:22:41 +08:00
samuele3hu f0dc7f0b15 issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info 2013-12-23 11:19:55 +08:00
James Chen c9b4cad6bf Merge pull request #4594 from dumganhar/remove-cccamera 
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
 2013-12-22 18:17:12 -08:00
James Chen 0a2490333b Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583). 2013-12-23 10:03:36 +08:00
minggo b5976b1a51 Merge pull request #4592 from Dhilan007/android_build_script 
support generate APK by script in template project and unify help messag...
 2013-12-22 17:48:05 -08:00
samuele3hu 7daace0b2a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 09:43:05 +08:00
samuele3hu 71d5896d41 issue #3403:Delete Camera manual lua binding 2013-12-23 09:42:36 +08:00
minggo deb681ef98 Merge pull request #4591 from Dhilan007/update_vsProject 
update vs project for remove CCCamera.
 2013-12-22 17:40:01 -08:00
yinkaile 87103434e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-23 09:30:14 +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
Dhilan007 d1972b3d17 support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00
Dhilan007 786b7d9912 update vs project for remove CCCamera. 2013-12-22 17:19:59 +08:00
minggo 3d37a26e21 Merge pull request #4523 from Dhilan007/increase_test_pressure 
increase label test pressure.
 2013-12-21 17:08:20 -08:00
minggo d353ad2853 Merge pull request #4590 from CocosRobot/updategeneratedsubmodule_1387658138 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-21 17:07:19 -08:00
CocosRobot bc5fd247ac [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 20:35:41 +00:00