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

303 Commits

Author SHA1 Message Date
samuele3hu 7fe2b6c0ad Update the CCFileUtils.h 2014-10-16 11:07:15 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
Dale Stammen 2b4d1c204c updated wp8 precompiled shaders 2014-10-14 18:39:12 -07:00
Dale Stammen 420a19f222 run app after setting delegates 2014-10-14 18:12:24 -07:00
Dale Stammen d6912c3d84 updated winrt platform files 2014-10-14 16:32:39 -07:00
Dale Stammen ad9c729f6b updated winrt include files 2014-10-14 14:20:02 -07:00
Dale Stammen 2ef8b291bf updated wp8 include files 2014-10-14 14:19:47 -07:00
Dale Stammen eeeac0a398 updated wp8 include files 2014-10-14 14:19:35 -07:00
Anton Sokolchenko fc35cc2efe CMake fix for Mac Os X. 
You can open project with CLion and see that everything works.
 2014-10-15 00:19:29 +03:00
Dale Stammen ef13db4643 updated pch include files 2014-10-14 14:19:14 -07:00
Dale Stammen 946121ec71 added CC_DLL to export classes 2014-10-14 14:18:56 -07:00
Dale Stammen adfe072937 fixed include paths 2014-10-14 14:18:31 -07:00
Dale Stammen 37cd3dc7f9 added check for WP8_SHADER_COMPILER 2014-10-14 14:18:14 -07:00
Dale Stammen bbca4823f5 fixed check for WINRT_NO_WINSOCK 2014-10-14 14:17:49 -07:00
Dale Stammen 7a57ea4cb8 added Windows 8.1 ANGLE support 2014-10-14 14:17:28 -07:00
Dale Stammen e0157f7471 check for WP8_SHADER_COMPILER 2014-10-14 14:16:52 -07:00
Dale Stammen fbc25a055c updated winrt include 2014-10-14 14:16:24 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
lite3 3419a38961 Merge remote-tracking branch 'upstream/v3' into v3 2014-10-11 17:40:47 +08:00
minggo 5a60e99131 Merge pull request #8577 from ntotani/detach-thread-on-exit 
call detach method on thread exit
 2014-10-11 16:54:59 +08:00
minggo c01d1b1166 Merge pull request #8646 from huangshiwu/v3_languagecode 
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
 2014-10-11 16:23:49 +08:00
huangshiwu 4dd9120e67 fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string 2014-10-11 15:19:20 +08:00
martell 0d26b33eaa mingw64: mirgrate to upstream minizip 2014-10-11 04:39:42 +01:00
lite3 e1814d0480 add virtual in FileUtilsAndroid::getNewFilename 2014-10-11 11:20:14 +08:00
Ricardo Quesada ee3086ff8d compiler fixes for windows 2014-10-10 17:41:11 -07:00
Dhilan007 7fb448e90f add 'static' for global function 2014-10-10 15:13:05 +08:00
Dhilan007 250875b081 fixed compile error 2014-10-10 14:03:20 +08:00
Dhilan007 6a8c4f4194 Fixed FileUtils::removeFile doesn't work on iOS 2014-10-10 11:59:35 +08:00
Huabing.Xu d5e29d285d fix gel Config error on android 2014-10-09 18:34:14 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
Naoyuki Totani b0d1fb79b3 call detach method on thread exit 2014-10-08 18:34:06 +09:00
martell 8a4b8afc6c Android: added support for building libcocos2d 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:35 +01:00
martell 1a7ecbe427 Finalise Mac Support for cmake 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:19 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell d9228d31c0 added support for static and shared builds on windows 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:18 +01:00
martell 1ef0f41e0e Changed WIN32 to _WIN32 to support gnu c++11 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:17:55 +01:00
lite3 21081b9e1a use reference 2014-09-30 01:07:19 +08:00
lite3 240b922271 remove '../' at path on android. 
because AAssetManager_open do not support '../' in path.
 2014-09-29 19:31:05 +08:00
Huabing.Xu 88679c2437 change tab to space 2014-09-29 18:44:01 +08:00
minggo 0cd2f985e8 Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug 
fix egl config chooser bug
 2014-09-29 18:24:19 +08:00
minggo 8a5829631d Merge pull request #8171 from huangshiwu/v3_Teivaz 
Enable screen orientation change handling - by Teivaz
 2014-09-29 18:02:03 +08:00
Dale Stammen 24e5df1644 updated wp8 precompiled shaders 2014-09-26 12:16:16 -07:00
Dale Stammen 67377b7d46 added check for WINRT_NO_WINSOCK 2014-09-26 12:05:19 -07:00
Dale Stammen ef58fa7fd4 fixed winrt file functions to pass app certification tests. 2014-09-26 11:38:17 -07:00
Huabing.Xu d7a5c464dd remove test code 2014-09-26 16:37:05 +08:00
Huabing.Xu 7cfcdc1af8 fix egl config chooser bug 2014-09-26 16:23:54 +08:00