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

15088 Commits

Author SHA1 Message Date
samuele3hu 362c1dc0ea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 18:37:34 +08:00
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
Daniel T. Borelli 08dad98592 map:erase() is safe for item.second == FontAtlas* 2014-01-04 07:22:50 -03:00
James Chen 7759ba9978 Merge pull request #4875 from CocosRobot/updategeneratedsubmodule_1388830744 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-04 02:21:11 -08:00
CocosRobot c793f2e0fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 10:19:07 +00:00
James Chen 452df039e8 Merge pull request #4874 from dumganhar/develop 
Adds override keyword for override functions.
 2014-01-04 02:12:54 -08:00
James Chen 6827538802 Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
James Chen d237d3f129 Merge pull request #4873 from dumganhar/develop 
[ci skip] Updates TestLua project for iOS and Mac.
 2014-01-04 01:35:03 -08:00
James Chen 052f24cceb [ci skip] Updates TestLua project for iOS and Mac. 2014-01-04 17:33:21 +08:00
James Chen 3bd0691ef9 Merge pull request #4872 from dumganhar/merge4795 
Merge PR #4795
 2014-01-04 00:58:53 -08:00
James Chen 17be52740a Removes duplicated file in Android.mk 2014-01-04 16:57:46 +08:00
James Chen 284d845f2f Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795 2014-01-04 16:55:40 +08:00
James Chen 602cc62188 Merge pull request #4871 from samuele3hu/developNewUI 
Fix:resolve the bugs that some lua test cases can’t run
 2014-01-04 00:51:41 -08:00
James Chen 7a53ec12ee Merge pull request #4870 from heliclei/develop 
use print_exc() instead of format_exc()
 2014-01-04 00:50:13 -08:00
heliclei 6e1c508960 use print_exc() instead of format_exc() 2014-01-04 16:25:31 +08:00
samuele3hu 70ee13e2e1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 15:46:27 +08:00
samuele3hu 0550ec33ad Fix:Resolve the bugs that some lua test cases can’t run 2014-01-04 15:46:04 +08:00
James Chen 37a40e6222 Merge pull request #4869 from CocosRobot/updategeneratedsubmodule_1388821249 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 23:42:18 -08:00
CocosRobot ad11468b7b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 07:40:50 +00:00
James Chen 4c3fa3da49 Merge pull request #4865 from dumganhar/testjs-bugfix 
Some fixes for TestJavascript
 2014-01-03 23:34:08 -08:00
James Chen 6bb357300c Merge pull request #4835 from chuanweizhang2013/develop 
add cocos files generate script
 2014-01-03 23:31:17 -08:00
cw 556a6436bd modify 644 —>755 2014-01-04 15:27:39 +08:00
James Chen 87cdc47782 Merge pull request #4867 from dumganhar/iss3580-write-tofile 
closed #3580:  FileUtilsTest->TextWritePlist crashes
 2014-01-03 23:17:50 -08:00
James Chen 98265e7961 Reverts GUIReader definition. it should be inherited from Object to make bindings happy. 2014-01-04 15:17:36 +08:00
James Chen b2dc16c065 closed #3580: FileUtilsTest->TextWritePlist crashes 2014-01-04 15:03:46 +08:00
James Chen 5c77f7d035 Refactors search path setting for TestJavascript. 2014-01-04 14:24:25 +08:00
James Chen ef5ab1b9be sharedXXX -> getInstance, purgeXXX -> destroyInstance. 2014-01-04 14:23:40 +08:00
James Chen 046384ca1f Uses blue folder for iOS & Mac resources to prevent adding new resources. 2014-01-04 14:22:57 +08:00
chuanweizhang 5ffc3d9726 modify create_project.py suffix 2014-01-04 14:04:39 +08:00
James Chen 9bb558ad46 Removes wrong resource in TestJavascript project. 2014-01-04 13:54:25 +08:00
chuanweizhang accdf5635f modify print message 2014-01-04 13:54:17 +08:00
James Chen e860d659a4 Update AUTHORS [ci skip] 2014-01-04 13:45:55 +08:00
James Chen 43cdf1713b Merge pull request #4864 from daltomi/test 
fix bad name variable CCDirector
 2014-01-03 21:44:42 -08:00
chuanweizhang 51a6e4fc35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-04 13:25:34 +08:00
Daniel T. Borelli d10992951b fix bad name variable 2014-01-04 02:22:09 -03:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash 
fix compiling error and miss file on vs.
 2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen 90a295399d Merge pull request #4862 from CocosRobot/updategeneratedsubmodule_1388809336 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 20:22:42 -08:00
CocosRobot e42f721c6b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 04:22:17 +00:00
James Chen 44105c5d01 Merge pull request #4861 from dumganhar/develop 
Fixing CocoStudio bindings error.
 2014-01-03 20:12:05 -08:00
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
James Chen 83028deca6 Update CHANGELOG [ci skip] 2014-01-04 12:02:11 +08:00
James Chen e65c6b8e53 Merge pull request #4841 from dumganhar/template-container-unit-test 
Template container unit test
 2014-01-03 20:01:25 -08:00
James Chen 38d109f698 Merge pull request #4860 from CocosRobot/updategeneratedsubmodule_1388807921 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 20:01:17 -08:00
CocosRobot d29cdb5b52 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 03:58:44 +00:00
James Chen 233e0ab457 Update CHANGELOG [ci skip] 2014-01-04 11:50:35 +08:00
James Chen 55e45d44c4 Merge pull request #4810 from chengstory/#3480 
Update SceneReaderTest Samples
 2014-01-03 19:49:28 -08:00
James Chen 29e2bb89b1 issue #3577: Captures ‘this’ to make old gcc on linux happy. 2014-01-04 11:44:29 +08:00
James Chen cf8fa8e5fa issue #3577: Adds ValueTest. 2014-01-04 11:41:06 +08:00
James Chen 9342ae105a issue #3577: const_iterator —> iterator for Vector::erase(first, last). Makes android build happy. 2014-01-04 11:41:06 +08:00