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

148 Commits

Author SHA1 Message Date
Vincent Yang 52293ad451 Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'. 2015-07-10 14:37:42 +08:00
jianglong0156 abee4a376a add write api in FileUtils 
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
 2015-07-07 14:06:59 +08:00
子龙山人 17207f14e5 Merge pull request #12689 from fusijie/refine_setAnimationInterval 
Refine setAnimationInterval from double to float.
 2015-07-06 16:18:45 +08:00
Jacky 4499b60446 Refine setAnimationInterval from double to float. 2015-07-06 14:57:42 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
Dale Stammen 7684c208e0 unsupported cocos2d-x image formats removed or updated 2015-06-29 08:41:44 -07:00
Dale Stammen eb668f63ce unsupported cocos2d-x image formats removed or updated 2015-06-29 08:39:31 -07:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
WenhaiLin ed029d264f Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform` 2015-06-23 18:40:39 +08:00
Dale Stammen 0f64a2d192 removed obsolete override of setViewPortInPoints 2015-06-11 07:59:52 -07:00
Dale Stammen 05d33ac0c8 removed old WP8 files 2015-05-28 14:08:25 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
Dale Stammen aa7876aefc remove deprecated methods 2015-05-20 07:55:10 -07:00
Dale Stammen cada493685 remove deprecated methods 2015-05-20 07:51:52 -07:00
Dale Stammen f1fe802442 updated winrt keyboard support to support physical keyboard 2015-05-12 09:20:10 -07:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
WenhaiLin 26c9be7881 Add FileUtils::getSuitableFOpen[window-universal] 2015-05-04 16:06:04 +08:00
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen aec086a473 convert BGR and RGB to GUID_WICPixelFormat24bppRGB 2015-04-21 18:16:54 -07:00
Dale Stammen 516966a96f check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
Dale Stammen 0c47df5df2 fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments 2015-04-21 06:21:32 -07:00
Dale Stammen 50f381f070 added CCLOG message to describe how to handle Windows Phone back button event 2015-04-20 18:30:52 -07:00
Dale Stammen 4169ebf5c8 Windows Phone 8.1 back button and terminate app support 2015-04-20 10:43:34 -07:00
Dale Stammen ec378b612e added listener if back button event not handled by app 2015-04-19 18:53:10 -07:00
Dale Stammen a97d5c5370 added support for hardware back button on Windows Phone 8.1 2015-04-19 16:31:30 -07:00
Dale Stammen 2ccff5671a fix for encoding images with WIC 2015-04-17 09:20:23 -07:00
Dale Stammen 7d22e49642 only needed if _MSC_VER < 1900 2015-04-15 09:18:48 -07:00
Dale Stammen 68430ce4fa added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:18:23 -07:00
Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix 2015-04-08 07:29:45 -07:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters; 
more getters (is*/get*) became const;
 2015-04-07 17:15:15 +03:00
WenhaiLin fdba25cdde Disable MessageBox when the device does not have an accelerometer on WinRT 2015-04-03 11:51:00 +08:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
Dale Stammen 7b6b02d338 catch exception for older winrt tablets not supporting accelerometer report interval 2015-01-16 15:36:16 -08:00
Dale Stammen ef816a1bb9 fixed handling of default font 2015-01-14 11:10:58 -08:00
Dale Stammen 09efe9be04 removed unused winrt CCPlatformDefine.h 2014-12-30 21:03:33 -08:00
Dale Stammen d33fad0ac7 fixed check for header already included 2014-12-30 16:39:02 -08:00
Dale Stammen f4cd2e311d added missing inet_pton() for windows phone 2014-12-30 16:38:18 -08:00
Mykyta Usikov d9b5ab4a4c added Turkish and Ukrainian language; 
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
 2014-12-25 12:08:23 +02:00
Dale Stammen 2c8cb4b3bd updated Application::getCurrentLanguage to work on WP8 and Universal App 2014-11-25 11:21:56 -08:00
Dale Stammen fac9d2880f added missing OpenURL support for universal app 2014-11-25 10:05:02 -08:00
Dale Stammen ff172e0057 fixed accelerometer for windows store apps device orientation 2014-11-20 09:00:22 -08:00
Dale Stammen 060779c138 added check for WP8_SHADER_COMPILER 2014-10-28 21:01:26 -07:00
Dale Stammen 5b69a55121 added check for WP8_SHADER_COMPILER 2014-10-27 11:16:14 -07:00
Dale Stammen 2eccd58d45 added DPI support for universal app 2014-10-27 11:07:00 -07:00
Dale Stammen 77c00bc77f removed use of std::mutex. Now using lock-free concurrent_queue 2014-10-27 08:32:19 -07:00
Dale Stammen fa6b70cbb8 disabled xaml functions for WP8 2014-10-24 05:59:59 -07:00
Dale Stammen c82a75d4f7 added xaml support functions 2014-10-23 19:29:38 -07:00
Dale Stammen 0af2f30d61 fixed WP8_SHADER_COMPILER checks 2014-10-23 08:40:34 -07:00
Dale Stammen a4294c07c1 added check for WP8_SHADER_COMPILER 2014-10-23 08:32:31 -07:00
Dale Stammen b5fdf892b2 added text input from keyboard support for winrt 2014-10-23 07:38:46 -07:00
Dale Stammen 1112cad792 remove PhoneDirect3DXamlAppComponent namesapce refactor 2014-10-23 07:12:51 -07:00
Dale Stammen 3d16bbc6b9 added UIEditBoxEvent. namespace refactor 2014-10-23 07:09:03 -07:00
Dale Stammen b20015f845 updated for Universal App support 2014-10-23 07:07:58 -07:00
Dale Stammen 06913670dc use device orientation for acceleration values 2014-10-23 07:04:13 -07:00
Dale Stammen 8af672c588 moved messagebox code to winrt cceglview to handle threading issues 2014-10-23 07:03:41 -07:00
Dale Stammen 41fe4a3e17 dpi for wp8 only 2014-10-16 11:16:26 -07:00
Dale Stammen d6912c3d84 updated winrt platform files 2014-10-14 16:32:39 -07: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
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 67377b7d46 added check for WINRT_NO_WINSOCK 2014-09-26 12:05:19 -07:00
huanghsiwu 7a2a44ad88 Enable screen orientation change handling - by Teivaz 2014-09-26 16:16:34 +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
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
Dale Stammen 2226aa5c8a need to reset the accelerometer before trying to enable it again 2014-09-23 10:01:42 -07:00
Guy Kogus 6e91c65e74 Windows Phone 8 can now open URLs. 2014-09-22 17:47:38 +04:00
Guy Kogus a9a0ff35f6 Added method for converting from std::string to Platform::String. 2014-09-22 17:47:38 +04:00
Sergey 2255cf91ba openUrl function for all platform but on windows RT empty function 2014-09-22 17:47:38 +04:00
Ricardo Quesada d5a6289a9b compiles on wp8 2014-09-09 18:22:11 -07:00
Ricardo Quesada 6b4323642a compiles on winphone8 2014-09-09 18:15:16 -07:00
Ricardo Quesada fdabaa3082 Compiles on Android 2014-09-09 17:53:08 -07:00
Ricardo Quesada 0972506bf5 compiles and runs on linux 2014-09-09 17:41:49 -07:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
minggo d91dc842de Merge pull request #7822 from Teivaz/v3_WP8 
Added method for custom precompiled shader program loading in WP8
 2014-08-20 11:22:26 +08:00
teivaz 0e5a79d486 + [WP8] Added method for custom precompiled shader program loading 2014-08-20 12:02:16 +03:00
Sergey bfe6513706 setKeepScreenOn method 2014-08-19 15:00:58 +04:00
teivaz 0e7ec265ee * [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res" 2014-08-20 11:54:41 +03:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
minggo bf4b376ae5 return correct language type 2014-07-12 20:40:15 +08:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Dale Stammen 0efc070104 fixed shader compiler after cocos refactor 2014-05-20 07:48:12 -07:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00