d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
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
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
c0b2433bb5
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
2015-04-27 15:45:23 +08:00
2476f2b52d
fixed win32 application return code
2015-04-20 18:27:21 +08:00
f962e14b43
replace const_cast with mutable in path getters;
...
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
2aec39ad56
Added Bulgarian language.
2015-03-17 15:14:02 +02:00
f25be54e95
Merge pull request #10671 from kpkhxlgy0/v3
...
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
215fe8a0c9
Windows network path fix
2015-03-05 11:10:03 +03:00
99dea9395d
enable setWritablePath on platform win32 and mac
2015-02-28 18:21:57 +08:00
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
9e310ba272
added Romanian language
2015-02-25 17:25:19 +02:00
653bf1549d
win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable.
2015-02-09 02:23:01 +03:00
05db3bfd72
Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 11:55:49 +08:00
415bbeba21
Fixed the alpha channel of text color of system font not take effect
2015-01-20 16:04:14 +08:00
41f53d6607
added checkfilename in win32 FileUtils
...
make win32 check filename case like linux
2015-01-16 17:24:54 +08:00
4c7377480b
Merge pull request #9837 from minggo/memory-leak
...
fix memory leak
2015-01-07 17:23:28 +08:00
1dcdd81fc4
fix memory leak
2015-01-07 15:02:27 +08:00
b88b9ea994
Merge pull request #9777 from ffskyfan/v3
...
fix the problem that engine can't get data from file on windows
2015-01-06 10:21:36 +08:00
f155386f05
fix memory leak
2015-01-05 13:49:47 +08:00
cb3b760759
Update CCFileUtils-win32.cpp
...
fix the problem that engine can't get data from file while other app using the file on windows platform
2015-01-04 16:43:10 +08:00
d9b5ab4a4c
added Turkish and Ukrainian language;
...
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
2014-12-25 12:08:23 +02:00
7b23e3ab1d
remove useless function call.
2014-12-15 19:47:25 +08:00
1212b4a6e9
fix win32 high cpu occupancy rate
2014-12-04 14:33:17 +08:00
4765ed8494
Fix wrong text color for system font on Linux/Window
2014-10-20 14:33:33 +08:00
ee3086ff8d
compiler fixes for windows
2014-10-10 17:41:11 -07:00
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
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00
fdabaa3082
Compiles on Android
2014-09-09 17:53:08 -07:00
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
ed849a1863
fix: win32 cpp-tests sometimes cannot display font correctly
...
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
2014-09-03 11:34:40 +08:00
25a7f21056
make debug writable path the same as release
2014-08-29 17:27:55 +08:00
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
Ricardo Quesada