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

31 Commits

Author SHA1 Message Date
Ricardo Quesada d9b3ef55ae Merge pull request #15880 from ricardoquesada/issue-15776 
fix: TextureCache ASSERTS if image is invalid
 2016-06-17 16:48:19 -07:00
Ricardo Quesada c387f953fa fix: TextureCache ASSERTS if image is invalid 
Github issue #15776
 2016-06-17 16:07:33 -07:00
Dale Stammen b80a81fc7c removed incorrect AppBundle info 2016-06-16 06:09:59 -07:00
Dale Stammen 53321e401a updated to support Windows 10 UWP x64 builds 2016-06-15 08:50:04 -07:00
minggo 98bee7e12a remove unneeded test case and fix resource missing (#15804) 
* remove unneeded test case and fix resource missing

* remove unneeded test case
 2016-06-08 13:36:36 +08:00
Ricardo Quesada 8bd4ddf081 fix: compile on linux, android and windows 2016-05-26 16:02:24 -03:00
Dale Stammen cf305a56b1 removed missing files from project 2016-05-10 21:41:39 -07:00
minggo 8068c51d94 remove studio related test cases and resources (#15574) 
* remove studio related test cases and resources

* remove unneeded files
 2016-05-06 13:38:19 +08:00
Dale Stammen 4d7bf1f827 updated expiration dates of all winrt test app and template certificates 2016-04-19 09:07:30 -07:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
minggo 3c676d9712 Merge pull request #15037 from Shulepov/spriteframecache_pixel_format 
SpriteFrameCache: take pixelFormat into account if specified
 2016-03-23 09:48:35 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
Mikhail Shulepov fb7044c535 Add SpriteFrameCacheTest to Android, Windows, Linux project files 2016-02-17 20:52:30 +03:00
Dale Stammen 3f359381dc moved file to correct folder in vcxproj 2015-10-20 10:07:30 -07:00
Dale Stammen e2730a3d92 fixed msbuild by removing incorrect AppxBundle properties from project 2015-10-16 09:25:24 -07:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
zhangbin e3161eb127 Remove performance tests from cpp-tests project. 2015-09-10 16:01:56 +08:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
Dale Stammen 6669fec648 added missing bug test 2015-07-23 12:34:37 -07:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
Neo Kim 00e360f438 Add the missing file into CMake and Windows project configurations. 2015-07-01 15:36:53 +09:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
Dale Stammen e14fdedf67 added missing NavMeshTest files 2015-06-15 18:19:51 -07:00
Dale Stammen d702012972 don't auto update version number for each windows app certification test 2015-05-28 15:04:09 -07:00
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00