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

152 Commits

Author SHA1 Message Date
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dhilan007 1651c6ab23 update project 2014-09-22 15:58:50 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
Dhilan007 51c19d4b06 update project for lua bindings of AudioEngine 2014-09-14 23:17:39 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
minggo e0df8114fa Merge pull request #7968 from Dhilan007/v3-audio903 
New Audio Engine[ios/android]
 2014-09-11 15:23:17 +08:00
Ricardo Quesada e46fa14be9 Fixes Xcode 6 warnings 2014-09-10 12:01:35 -07:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +08:00
Ricardo Quesada 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
yangxiao ed63f01c7e seperate billboard test from Sprite3D test 2014-09-04 16:27:18 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
samuele3hu 281da9f1d7 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases 2014-08-25 09:51:08 +08:00
samuele3hu cddb6c9fbd Integrate all module into cocos2d on the iOS/Mac platform 2014-08-19 18:00:34 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
samuele3hu e0168c373c Add manual lua bindings for 3d and adjust related test case on different platform 2014-08-18 15:04:32 +08:00
samuele3hu 85ef11ae56 Split cocos3d from cocos2d on the iOS/Mac platform and adjust the related iOS/Mac test project 2014-08-16 21:51:39 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
samuele3hu 47c034af5d Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure 2014-08-11 10:25:40 +08:00
lvlong 8101e2ff1a 1. move drawnode3d to Sprite3DTest 
2. add getAABB to sprite3D and mesh
 2014-08-08 17:54:39 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
samuele3hu 497847f7e8 Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files. 2014-08-06 14:46:30 +08:00
samuele3hu 9912b596f8 Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake 2014-08-06 13:51:46 +08:00
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
samuele3hu e5f9c1b488 Adjust common script and related test cases 2014-08-04 15:22:07 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
Huabing.Xu 2bf2bbeed7 1. remove mac 32bit 
2. remove copy files for mac(because of mac use .a instead of dylib)
 2014-07-31 15:46:16 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
minggo bf6e706ab9 fix xcode project setting 2014-07-28 15:37:00 +08:00
Huabing.Xu b72bffab1f change mac/ios target name 2014-07-25 14:27:52 +08:00
Huabing.Xu dbb3e0ac2e copy dylib to *.app bundle 2014-07-18 14:00:14 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
samuele3hu a9031154e0 Fix the actionTimelineTest crash on mac platform 2014-07-17 17:38:53 +08:00
Huabing.Xu 0f89c6c8b5 add dependency for lua iOS targets 2014-07-17 13:58:50 +08:00
Huabing.Xu 02c61af9fd add cocosStudio cocosBuilder cocosGUI iOS target 2014-07-17 12:06:20 +08:00
Huabing.Xu 4c609e11f0 add cocosSpin iOS target 2014-07-17 10:44:13 +08:00
Huabing.Xu d030c8aed3 add cocosNetwork ios target 2014-07-17 10:06:23 +08:00
Huabing.Xu add4caca5a add cocosNetwork target for mac 2014-07-16 18:21:21 +08:00
Huabing.Xu ab76be8d47 add cocosSpine target for mac 2014-07-16 17:51:42 +08:00
Huabing.Xu 778f1983b1 add cocosStudio target for mac 2014-07-16 17:35:35 +08:00
Huabing.Xu b7f6ba84c6 add cocosGUI and cocosBuilder target for mac 2014-07-16 16:37:29 +08:00
samuele3hu 7757df222a Add bit extend module 2014-07-14 18:26:39 +08:00