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

12841 Commits

Author SHA1 Message Date
boyu0 46710c5f06 issue #2771: delay load 2013-11-04 19:26:34 +08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
James Chen f560b11c75 Merge pull request #4066 from CocosRobot/updategeneratedsubmodule_1383310998 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-01 06:07:10 -07:00
CocosRobot 6360c40725 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 13:03:20 +00:00
James Chen 01b6e972a0 Update CHANGELOG [ci skip] 2013-11-01 20:58:25 +08:00
James Chen e2f14635e8 Merge pull request #4065 from dumganhar/develop 
closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
 2013-11-01 05:55:32 -07:00
James Chen 50c4261092 closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter. 2013-11-01 20:53:51 +08:00
James Chen 84e8aaf016 Merge pull request #4012 from ledyba/fix_inclusion_phys 
include climits for UINT_MAX
 2013-11-01 04:55:51 -07:00
James Chen 854c0c748e Merge pull request #4062 from dumganhar/develop 
[Android] Updating Android.mk for JSB projects.
 2013-11-01 03:30:38 -07:00
James Chen f31e6a3edb Merge pull request #4060 from CocosRobot/updategeneratedsubmodule_1383300172 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-01 03:28:54 -07:00
James Chen b751c41498 [Android] Updating Android.mk for JSB projects. 2013-11-01 18:27:47 +08:00
James Chen e893ae5697 Using namespace std; for AssetsManagerTest. 2013-11-01 18:27:09 +08:00
minggo 60b0b3c26e Merge pull request #4061 from minggo/iss2905-adjust_folder 
better log
 2013-11-01 03:26:01 -07:00
minggo 32c5755869 better log 2013-11-01 18:24:34 +08:00
CocosRobot a272bcd6ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 10:02:54 +00:00
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07:00
James Chen eabb611093 Update CHANGELOG [ci skip] 2013-11-01 17:49:01 +08:00
James Chen 8cf1337777 Update AUTHORS [ci skip] 2013-11-01 17:48:10 +08:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
samuele3 463ed08ffe issue #3037:Modify AssetsManagerTest.lua 2013-11-01 17:29:09 +08:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
minggo 5ca7f3425b Merge pull request #4055 from minggo/iss2905-adjust_folder 
fix a bug when building AssetsManagerTest
 2013-11-01 02:04:23 -07:00
James Chen aad4f3551a Merge pull request #4054 from dumganhar/develop 
Don't set debug flag in AndroidManifest.xml.
 2013-11-01 02:03:18 -07:00
minggo 81c16d9a0e fix a bug when building AssetsManagerTest 2013-11-01 17:03:15 +08:00
James Chen 9fad8bfc8d Don't set debug flag in AndroidManifest.xml. 2013-11-01 17:02:35 +08:00
minggo cd0a1b4d6d Merge pull request #4053 from minggo/iss2905-adjust_folder 
[ci skip]Iss2905 adjust folder
 2013-11-01 01:54:07 -07:00
minggo 915d75ea7c build release version of android samples 2013-11-01 16:44:35 +08:00
minggo 0a59d9eb3e fix assetsmansger path 2013-11-01 16:44:04 +08:00
boyu0 a2adbff2c8 issue #2771: fix some code style 2013-11-01 16:32:27 +08:00
boyu0 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
James Chen 485c9e7fbe Merge pull request #4049 from CocosRobot/updategeneratedsubmodule_1383291729 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-01 00:43:58 -07:00
CocosRobot 8aac938531 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 07:42:11 +00:00
James Chen 8e7ed129c5 Update before-install.sh 2013-11-01 15:39:46 +08:00
James Chen a93a904537 Merge pull request #4048 from dumganhar/develop 
[Bindings] Skip Label::getLettersInfo
 2013-11-01 00:36:16 -07:00
James Chen daf4e22819 [Bindings] Skip Label::getLettersInfo 2013-11-01 15:34:08 +08:00
James Chen 9177f78e5e Merge pull request #4046 from dumganhar/ios-mac-project-fix 
iOS and Mac project fix[ci skip]
 2013-11-01 00:24:08 -07:00
James Chen a04d1acede Fix of compilation errros of SimpleGame. 2013-11-01 15:19:51 +08:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
James Chen e0640ab5c6 Merge pull request #4044 from CocosRobot/updategeneratedsubmodule_1383288749 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-31 23:57:32 -07:00
CocosRobot 6eb6809b2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 06:52:31 +00:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
James Chen 997cee4cb4 Merge pull request #4043 from samuele3hu/developHttp 
Modify the all luajit build scripts and let libluajit.a of mac only support 64bit
 2013-10-31 23:48:18 -07:00
samuelhu e93bcca13e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-11-01 14:44:21 +08:00
samuelhu 8580b16638 Modify let the libluajit.a of mac only support 64bit 2013-11-01 14:40:35 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
minggo be1afb502b Merge pull request #4041 from minggo/iss2905-adjust_folder 
can run build-android.python in any path
 2013-10-31 23:28:23 -07:00
minggo d98c6f8de6 can run build-android.python in any path 2013-11-01 14:27:29 +08:00
James Chen afeb38be51 Merge pull request #4040 from dumganhar/travis-update 
Updating travic-ci scripts.
 2013-10-31 20:51:34 -07:00