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

487 Commits

Author SHA1 Message Date
James Chen 4fba832fb1 Return non-zero if ndk build fails. 2013-11-09 21:05:17 +08:00
Nite Luo fa9d8fe077 Add CustomCommand 2013-11-08 12:06:39 -08:00
Nite Luo be71eb8626 Merge branch 'develop' into newRenderer 
Conflicts:
	.gitignore
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/2d/CCDirector.cpp
 2013-11-07 17:24:57 -08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
Nite Luo 3108d499e5 use placeholder logic to generate material id 2013-11-06 14:24:56 -08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
James Chen c364c4f083 issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00
samuele3 b9e5d4bc91 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 17:37:54 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
Ricardo Quesada 2f0a19c7a3 Enables more warnings in Xcode project 2013-11-04 16:30:00 -08:00
Ricardo Quesada ab6d620b3d Disables arm64 for the moment 2013-11-04 15:11:20 -08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
James Chen bc251bcc95 [cmake] Update make-all-linux-projects.sh. 2013-11-04 21:03:09 +08:00
James Chen 733197fa65 [cmake] copy resources works. 2013-11-04 21:03:08 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -08:00
James Chen 6b8b1fb3c9 Update android-build.py 
Fixing wrong capital letter, `samples/JavaScript` --> `samples/Javascript`
 2013-11-03 14:01:02 +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
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
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
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 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 81c16d9a0e fix a bug when building AssetsManagerTest 2013-11-01 17:03:15 +08:00
minggo 0a59d9eb3e fix assetsmansger path 2013-11-01 16:44:04 +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 ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08: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
samuelhu f3ff7955a8 issue #3037:Modify platform build config 2013-11-01 11:18:02 +08:00
samuelhu de4aaeda2d issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-31 22:06:34 +08:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
minggo 9e5420c954 Merge pull request #4029 from minggo/iss2905-adjust_folder 
use build/android-build to build android samples, and update readme
 2013-10-30 03:30:03 -07:00
minggo da9f7c912b use build/android-build to build android samples, and update readme 2013-10-30 18:27:56 +08:00
minggo 93cde4d814 Merge pull request #4027 from minggo/iss2905-adjust_folder 
add script to build android samples
 2013-10-29 23:22:26 -07:00
minggo 4d9b05a67d add script to build android samples 2013-10-30 14:19:07 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-29 11:45:19 +08:00
samuelhu a4d028e905 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
James Chen b4eb970589 [JSB] Fixing compilation errors for iOS and Mac projects. 2013-10-25 10:50:03 +08:00
samuelhu d7689073e0 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-24 11:12:21 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Dhilan007 9a0fa3c181 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-21 16:27:49 +08:00
samuelhu 0cffe51219 fix libluajia.a search path bug 2013-10-18 18:08:05 +08:00
samuelhu 4ccb13f5d0 fix libluajia.a search path bug 2013-10-18 17:37:04 +08:00
Dhilan007 6ce34288e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 15:53:26 +08:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
James Chen 34fe2ba02c Added missing icons for some iOS and Mac samples. 2013-10-17 14:12:43 +08:00
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Dhilan007 d82c2ca060 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 09:39:48 +08:00
Ricardo Quesada 28de91d965 more Xcode fixes 2013-10-16 11:45:58 -07:00
Dhilan007 a91621ae5a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:51:02 +08:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
James Chen b5233fc18d issue #2905: [iOS Mac] Updating project configurations. 2013-10-16 17:27:30 +08:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
James Chen 00ee416006 issue #2905: [iOS Mac] All js games work now. 2013-10-16 16:21:55 +08:00
Dhilan007 3d1f734326 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 15:44:43 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 039a2c93e1 issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file. 2013-10-16 11:30:56 +08:00
James Chen 65f33461bc issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now. 2013-10-16 11:19:42 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
Ricardo Quesada 8cad67a3e1 small fixes for the Xcode projects 2013-10-15 13:36:03 -07:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
James Chen 9f89879e5e issue #2905: [iOS, Mac] Always search user path. 2013-10-14 17:43:59 +08:00
James Chen 16c88363f5 issue #2905: Updating project configuration for SimpleGame. 2013-10-14 17:16:39 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00