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

124 Commits

Author SHA1 Message Date
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08:00
huangshiwu 893aded9b7 iOS HttpClient replace libcurl - fix Jenkins compile error 2014-12-31 11:32:35 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
mannewalis bc7757a366 adding allocator system 2014-12-12 08:57:06 -08:00
minggo a86bfbf6b0 Merge pull request #9330 from pipu/v3_flatbuffers 
newest V3 flatbuffers
 2014-12-04 10:06:42 +08:00
Ricardo Quesada 803d0a268e By default, use "dwarf with dSYM file" in cpp-tests 2014-12-03 15:07:34 -08:00
pipu 22b044805c Add callback parse 2014-12-01 21:50:05 +08:00
James Chen 5d21c889aa Reverts GCC_TREAT_WARNINGS_AS_ERRORS=YES for Xcode project of cpp-tests. 2014-11-25 10:33:16 +08:00
James Chen 2c0445b25d Updates Xcode project for Math perf test 2014-11-25 10:33:16 +08:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00
samuele3hu 634d42775e Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning 2014-10-19 17:00:05 +08:00
samuele3hu 30f375ef07 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-17 17:37:18 +08:00
samuele3hu 1d6128443a Update Mac project setting and some lua test cases about UI and ActionTimeline 2014-10-17 17:35:50 +08:00
andyque 8161d2ad34 fix scrollView rotate issue 2014-10-17 11:31:00 +08:00
huangshiwu 0a04da0a10 Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode 2014-10-16 15:53:12 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
samuele3hu 83d210ce7d Update the Xcode project setting for related test cases 2014-10-15 11:18:22 +08:00
samuele3hu e0c4ff060a Update iOS and Mac project setting 2014-10-15 00:44:44 +08:00
samuele3hu 9b9b9d9700 Fix the lua-tests compile error 2014-10-11 14:14:08 +08:00
samuele3hu f97a7ae52d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
samuele3hu 115d81574c Add CameraTest、OBBTest and related lua bindings 2014-10-10 09:49:25 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-09-29 09:48:35 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
minggo ebf0562b84 remove armv7s support on iOS 2014-09-26 10:35:50 +08:00
samuele3hu 38530772ae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 15:26:03 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
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
Sergey b8b5397e4e Tests for Mac/iOS android Linux & Windows 2014-09-22 17:54:49 +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
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +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
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +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
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
Ricardo Quesada e46fa14be9 Fixes Xcode 6 warnings 2014-09-10 12:01:35 -07:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +08: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
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +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