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

792 Commits

Author SHA1 Message Date
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08:00
andyque 62b1404213 Merge branch 'v3' into update-curl 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-12-31 14:04:04 +08:00
Dale Stammen 79e71b6c50 Merge branch 'v3' into wp8-fix2 2014-12-30 21:25:54 -08:00
Dale Stammen 4e4028fc67 added missing files 2014-12-30 21:03:57 -08:00
Dale Stammen 09efe9be04 removed unused winrt CCPlatformDefine.h 2014-12-30 21:03:33 -08:00
huangshiwu 893aded9b7 iOS HttpClient replace libcurl - fix Jenkins compile error 2014-12-31 11:32:35 +08:00
andyque 7a8634ff0e remove libcurl.dylib 2014-12-31 10:18:44 +08:00
andyque 5caccfd053 upgrade libcurl mac project settings 2014-12-31 10:18:44 +08:00
andyque 60ec08eef4 upgrade libcurl for iOS 2014-12-31 10:18:44 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
 2014-12-26 13:42:13 +08:00
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
youyou 3f46f2e641 update project file 2014-12-24 16:22:25 +08:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
yusheng.lu d543f8f6a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-23 16:12:50 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yusheng.lu 1e05361873 ios/mac project compeleted 2014-12-22 20:08:27 +08:00
kaile.yin f792b4ac68 remove same line 2014-12-22 14:08:15 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
mannewalis c50bf94c59 removing Allocator<T> and inheriting base directly. 2014-12-15 09:34:25 -08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
mannewalis bc7757a366 adding allocator system 2014-12-12 08:57:06 -08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +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
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
pipu 1cbc0120be Merge branch 'v3' into v3_flatbuffers 2014-12-01 22:56:18 +08:00
pipu 22b044805c Add callback parse 2014-12-01 21:50:05 +08:00
pipu 4aea718c13 Delete protobuf-lite in User Head Search Path 2014-12-01 12:56:49 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
Ricardo Quesada 4a5069244f Ouch. DEBUG instead of RELEASE for Build on Xcode 2014-11-27 10:54:09 -08:00
Ricardo Quesada 154a059d1c mend 2014-11-27 10:53:29 -08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
Dhilan007 a92b1733f0 Fix generate apk fail 2014-11-27 16:10:52 +08:00
Dhilan007 4cda033a04 Fixed compiling and linking error of lua tests when using NDK r10 above. 2014-11-27 13:56:15 +08:00
pipu 889f84e540 newest v3 flatbuffers 2014-11-26 13:29:23 +08:00
yangxiao 35020c7c71 async task pool 2014-11-26 11:28:14 +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 9e10d2d32b Revert "Merge pull request #9193 from pipu/v3_flatbuffers" 
This reverts commit fa22b12628, reversing
changes made to 8dce62b94c.
 2014-11-24 10:19:53 -08:00
youyou 966100a511 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 10:35:51 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
Ricardo Quesada 15c0b18301 Adds gnutls-dev to linux deps 2014-11-20 12:28:38 -08:00
youyou 769b2cbc75 add file to mac project 2014-11-19 20:06:10 +08:00
Dale Stammen 200cb6d3b4 fixed test solution folder names to enable building project using devenv 2014-11-17 11:52:46 -08:00
Ricardo Quesada 4d2752e84f fixes how to check for CPU in android-build 2014-11-10 16:08:12 -08:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00