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

790 Commits

Author SHA1 Message Date
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
andyque a29a298ec3 fix wrong comment 2015-03-20 09:49:34 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi 
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
 2015-03-19 21:47:32 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3 
enable setWritablePath on platform win32 and mac
 2015-03-16 14:57:26 +08:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path 
Windows network path fix
 2015-03-10 11:25:53 +08:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -08:00
kpkhxlgy0 99dea9395d enable setWritablePath on platform win32 and mac 2015-02-28 18:21:57 +08:00
Nite Luo 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
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3 
added Romanian language
 2015-02-26 10:51:46 +08:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo 
Fix typo in Image::Format
 2015-02-25 09:32:58 +08:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
mannewalis 21dbc29ad1 adding CC_DEPRECATE(version) macro 2015-02-17 13:01:53 -08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
minggo 3a4e9ced46 Merge pull request #10442 from Dhilan007/v3-accelerometer-fix 
Fixed Accelerometer has lagged on iOS
 2015-02-12 17:20:07 +08:00
sawada_yasuharu cf8a7cd6da Changed the option to be passed to calculate bounding rect size for 
strings.

As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
 2015-02-12 15:30:46 +08:00
WenhaiLin 20ad425407 Fixed Accelerometer has lagged on iOS 2015-02-11 16:28:43 +08:00
Vladimir Timofeev 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
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
minggo 18a45e36eb Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix 
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
 2015-01-29 13:56:11 +08:00
WenhaiLin 05db3bfd72 Fixed system font can't display the proper text when the text contains '&' on win32. 2015-01-29 11:55:49 +08:00
Wenhai Lin 4a218ea3e2 Fixed game awaked by the clock on Android 2015-01-28 15:30:52 +08:00
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix 
Fixed sets the page's base URL for WebView doesn't work.
 2015-01-26 13:51:08 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
Dale Stammen e5b54f8c47 updated precompiled shaders for wp8 2015-01-21 10:50:44 -08: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
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +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
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +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 5988cb520d added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite" 2015-01-16 14:59:08 -08:00
Dale Stammen 7b3154a7ee updated precompiled shaders for WP8 2015-01-16 11:19:32 -08:00
HoneyCat 41f53d6607 added checkfilename in win32 FileUtils 
make win32 check filename case like linux
 2015-01-16 17:24:54 +08:00
WenhaiLin 6a2ac7aaf8 [ci skip]Fixed log level within the CocosPlayClient 2015-01-15 18:21:03 +08:00
Dale Stammen ef816a1bb9 fixed handling of default font 2015-01-14 11:10:58 -08:00
Dale Stammen 32c14710e7 allow custom shaders for WinRT Universal App 2015-01-14 10:37:04 -08:00
minggo 1e2029598d Merge pull request #9936 from Dhilan007/v3-cocosplay 
Integrate CocosPlayClient
 2015-01-14 16:10:20 +08:00
WenhaiLin 553cf58312 Remove FileUtilsAndroid::purgeCachedEntries 2015-01-14 16:05:33 +08:00
Dale Stammen 5a4c6d75d8 clean up CC_USE_WEBP disabled for WP8 and WINRT 2015-01-13 14:37:22 -08:00
huangshiwu f4ac7c4e44 modify WP8 project and update precompileshader 2015-01-14 02:15:04 +08:00
Wenhai Lin 58c45ca144 Integrate CocosPlayClient 2015-01-13 17:30:07 +08:00
Satoshi SUZUKI b0d1dd2435 FileUtils::fullPathForFilename should return "" if resource is not found. 
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
 2015-01-10 19:30:42 +09:00
WenhaiLin 57cd4cd3c6 Fixed VideoPlayer can't play when passing the full path of video resource 2015-01-09 19:14:19 +08:00
WenhaiLin d92a525bfa Fixed dead loop when width of label[system font] smaller then one word of the string on android 2015-01-09 16:52:40 +08:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp 
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
 2015-01-07 17:45:43 +08:00
minggo 4c7377480b Merge pull request #9837 from minggo/memory-leak 
fix memory leak
 2015-01-07 17:23:28 +08:00
minggo 1dcdd81fc4 fix memory leak 2015-01-07 15:02:27 +08:00
Huabing.Xu 339a8b1abc class rename for EGLConfigChooser 2015-01-06 16:18:01 +08:00
Huabing.Xu 1180f7a41e move class cocos2dEGLConfigChooser to Cocos2dxActivity 2015-01-06 12:44:29 +08:00
minggo 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
minggo ef5076983d Merge pull request #9792 from minggo/memory-leak 
fix memory leak
 2015-01-05 14:20:49 +08:00
minggo f155386f05 fix memory leak 2015-01-05 13:49:47 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
ffskyfan 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
Luis Cabellos 651b7fc13c Remove warn error on Exit 
Change the return error on Linux to  -1  to  standard EXIT_SUCCESS value.
 2014-12-31 18:37:59 +01:00
Dale Stammen 79e71b6c50 Merge branch 'v3' into wp8-fix2 2014-12-30 21:25:54 -08:00
Dale Stammen 09efe9be04 removed unused winrt CCPlatformDefine.h 2014-12-30 21:03:33 -08:00
samuele3hu 3795f9cc2a Rename HttpClient-android.cpp and unify java indent format 2014-12-31 12:03:27 +08:00
samuele3hu f7ed73c1e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient 2014-12-31 10:17:12 +08:00
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +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
minggo 42e6232113 fix typo and memory leak 2014-12-26 14:25:55 +08:00
minggo 94d70358b7 make FileUtils extendable 2014-12-26 11:34:31 +08:00
minggo 1c87c53ff8 Merge pull request #9636 from musikov/v3-language 
added Turkish and Ukrainian language;
 2014-12-26 09:31:57 +08:00
minggo 3b01762db4 Merge pull request #9638 from yinjimmy/writablepath 
set default resource root path & writable path
 2014-12-26 09:27:59 +08:00
yinjimmy 744a9043f9 set default resource root path & writable path 2014-12-25 20:33:47 +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
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
minggo 0c66e638f7 Merge pull request #8183 from xseekerj/patch-3 
CCPlatformMacros.h
 2014-12-25 14:02:52 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00
joewanchen 7b23e3ab1d remove useless function call. 2014-12-15 19:47:25 +08:00
minggo a1c60bcf24 Merge pull request #9452 from minggo/java-style 
[ci skip]use java coding style
 2014-12-11 10:55:14 +08:00
minggo 7c07bc6a90 Merge pull request #9449 from Dhilan007/v3-keycode 
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
 2014-12-11 09:58:57 +08:00
minggo 1d1028a68b Merge pull request #9410 from andyque/fixEditBox_v3 
Fix edit box v3
 2014-12-10 18:54:20 +08:00
minggo 0e7470505f replace tab with 4 spaces 2014-12-10 18:32:58 +08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
minggo 77ed7a47e2 use java coding style 2014-12-10 18:07:46 +08:00
minggo dd5659b6eb Merge pull request #9401 from minggo/iss9398-not-close-dir 
invoke closedir after invoke opendir
 2014-12-08 18:10:41 +08:00
andyque 119a68afd9 fix EditBox move animation position is wrong on iPhone6 Plus 2014-12-08 15:34:58 +08:00
minggo c067338c17 closedir when succeed 2014-12-08 11:36:11 +08:00
minggo 74c80296aa invoke closedir after invoke opendir 2014-12-08 09:58:58 +08:00
Dale Stammen 1d908f94ab fixed renameFile for wp8 and winrt to pass file and assetmangers tests 2014-12-05 18:12:25 -08:00
minggo 0d89b9b742 Merge pull request #9368 from huangshiwu/v3_wincpu 
fix win32 high cpu occupancy rate
 2014-12-04 15:17:26 +08:00
minggo 0badda268a Merge pull request #9366 from Dhilan007/v3-33rc1 
Fixed label may show nothing when using system font on Mac
 2014-12-04 15:11:50 +08:00
huangshiwu 1212b4a6e9 fix win32 high cpu occupancy rate 2014-12-04 14:33:17 +08:00
Wenhai Lin ed86f65270 Fixed label may show nothing when using system font on Mac 2014-12-03 17:07:51 +08:00
minggo 77b5c40283 Merge pull request #9224 from pjc0247/v3 
fix C4129 warning
 2014-12-03 14:15:38 +08:00
Wenhai Lin 1bfdd757a2 Fixed fail to play background music again after invoking stopBackgroundMusic 2014-12-02 15:03:26 +08:00
Park June Chul 9b792d97c4 Merge pull request #2 from cocos2d/v3 
update project
 2014-11-28 22:52:13 +09:00
minggo e93ff4f5b7 Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios 
eaglview release leak in CCEAGLViewImpl-ios
 2014-11-26 13:54:49 +08:00
minggo d7de8a48a3 Merge pull request #9241 from dumganhar/iss8988-left-ctrl 
issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
 2014-11-26 13:47:36 +08:00
minggo dbb473fdcb Merge pull request #9203 from dumganhar/arm64-juno 
Some updates for neon64 instruction
 2014-11-26 11:46:19 +08:00
James Chen cebfed108c issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode. 2014-11-26 10:41:14 +08: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 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate 2014-11-25 08:07:29 -08:00
James Chen 528f24010b Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c 2014-11-25 10:33:16 +08:00
Park June Chul be60a33d25 fix C4129 warning 2014-11-25 04:52:44 +09:00
minggo 97df35f346 Merge pull request #9207 from dumganhar/iss8984-remove-unused 
#8984: Removes unused codes in CCStdC-linux.cpp
 2014-11-24 18:48:05 +08:00
minggo 88c3cc2ad9 Merge pull request #9105 from Dhilan007/v3-video-web-fix 
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
 2014-11-24 15:15:18 +08:00
James Chen cb6d81599b #8984: Removes unused codes in CCStdC-linux.cpp 2014-11-24 15:01:57 +08:00
Dale Stammen fc09fa8798 Merge branch 'v3' into v3-win8.1-appstate 2014-11-21 16:27:01 -08:00
Dale Stammen a607d41454 implemented lostDevice support when app loses the directx device 2014-11-21 16:24:51 -08:00
Dale Stammen 32fe5d07ae fixed compiler warning. Don't use _filePath to check tga if it's length is 0 2014-11-21 16:23:54 -08:00
Ricardo Quesada 9fedb14354 Fixes for FileUtils 
compiles after previous patch
 2014-11-21 14:52:13 -08:00
Ricardo Quesada 0f268e7aaa Merge pull request #9176 from MSOpenTech/v3-winrt-accelerometer-fix 
Fixed accelerometer for windows store apps device orientation
 2014-11-21 11:50:08 -08:00
Bartosz Duszel fbd27dff9c changed few loops for C++11 range-based for loop 2014-11-21 20:12:55 +01:00
Dale Stammen 2a86c77066 added foreground, background, lostdevice support 2014-11-21 10:31:57 -08:00
Dale Stammen 9bf15d424f added CC_PLATFORM_WINRT to enable CC_ENABLE_CACHE_TEXTURE_DATA 2014-11-21 09:52:33 -08:00
Dale Stammen ff172e0057 fixed accelerometer for windows store apps device orientation 2014-11-20 09:00:22 -08:00
Vladimir Timofeev a689fc4c7e sync with upstream 
Conflicts:
	CMakeLists.txt
 2014-11-20 12:19:00 +03:00
minggo 9fdd85a1be Merge pull request #9133 from pyrosphere/fix-wp8-back-key 
Fix Back Key behaviour and Director::getInstance()->end() on WP8
 2014-11-20 11:11:31 +08:00
Dale Stammen 5d2857b3c4 updated angle to commit 4a980d2612 2014-11-19 15:55:18 -08:00
Vladimir Timofeev 1e8aeb7fd2 Minizip 
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
 2014-11-16 22:41:37 +03:00
Filipe Lemos 0898af21ab Fix Back Key behaviour and Director::getInstance()->end() on WP8 2014-11-16 10:16:16 +00:00
Ricardo Quesada bc0c3d5a3f Merge pull request #9085 from jicheol-ryu/v3 
fix bug - potential memory leak.
 2014-11-14 14:17:13 -08:00
Dhilan007 5a8ac8f151 Fix WebView and VideoPlayer in wrong place on Android 2.3.x 2014-11-13 18:15:41 +08:00
minggo ee31273fa5 Merge pull request #9088 from Dhilan007/v3-audio-Lollipop 
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
 2014-11-13 16:02:40 +08:00
LinWenhai 48f1bd62d7 remove unrelated modification 2014-11-13 15:43:39 +08:00
LinWenhai a37549d7bc Update Cocos2dxMusic.java 2014-11-13 11:00:29 +08:00
wangqm0513 9415b2b930 Update TouchesJni.cpp 
fixed gamelist can't pull by mouse.
 2014-11-12 14:21:48 +08:00
Dhilan007 76c9accec9 Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop 2014-11-12 13:01:47 +08:00
jicheol-ryu c94a9ea01a fix bugs - potential memory leak. 
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.

So we have to use next string constructor.
string (const char* s, size_t n);

http://www.cplusplus.com/reference/string/string/string/
 2014-11-12 00:06:30 +01:00
minggo 3b8ddf1b54 Merge pull request #9005 from joshuastray/add-resource-folder-def 
Update CCFileUtils-linux.cpp
 2014-11-07 10:25:14 +08:00
minggo 7565b9b1eb Merge pull request #8969 from kaylyun/v3 
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
 2014-11-05 17:58:28 +08:00
Jialong Zhai 6e35e91642 Update CCFileUtils-linux.cpp 2014-11-04 18:23:12 +08:00
Unai Orbe cc2653d657 eaglview shouldn't be released here 2014-10-30 14:51:07 +00:00
Unai Orbe a2eb8977e0 Uncomment eaglview release CCEAGLViewImpl-ios 
This is leaking the eaglview when the Director is purged.

In our case, we are leaving the cocos environment on some views which
are implemented with cocoa, and because this eaglview is not being
released, it is getting notifications for keyboard events, and trying to
access stuff on the NULL eaglview, crashing our app.

Uncommnenting this line seems to fix the problem for us, and we haven't
been able to find any nasty side effects.
 2014-10-30 11:18:10 +00:00
kaylyun 97c076337a BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP 
Sometimes app directly at the startup on android platform.
 2014-10-30 10:21:19 +08:00
Dale Stammen 060779c138 added check for WP8_SHADER_COMPILER 2014-10-28 21:01:26 -07:00
Dale Stammen a8e0987b8d disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:59:44 -07:00
Dale Stammen af14b40ba0 must call DisplayInformation::GetForCurrentView() from main UI thread 2014-10-27 13:40:19 -07:00
Dale Stammen 5b69a55121 added check for WP8_SHADER_COMPILER 2014-10-27 11:16:14 -07:00
Dale Stammen 510c8caed7 added DPI support for universal app 2014-10-27 11:12:54 -07:00
Dale Stammen 4dd48d5020 removed mutex. use concurrent_queue for events 2014-10-27 11:08:22 -07:00
Dale Stammen 2eccd58d45 added DPI support for universal app 2014-10-27 11:07:00 -07:00
Dale Stammen 6fb69870f9 fixed compiler warnings for winrt code 2014-10-27 10:57:57 -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 042976265c updated precompiled shaders for WP8 2014-10-24 07:20:16 -07:00
Dale Stammen fa6b70cbb8 disabled xaml functions for WP8 2014-10-24 05:59:59 -07:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen c82a75d4f7 added xaml support functions 2014-10-23 19:29:38 -07:00
Dale Stammen 2ddb692628 added flyout xaml to support uieditbox on winrt 2014-10-23 19:29:18 -07:00
Dale Stammen 96054e9c29 updated headers for change in pch.h 2014-10-23 19:28:53 -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 cc3b784dd1 added windows 8.1 platform support files 2014-10-23 07:38:04 -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
minggo 78fd325ac7 Merge pull request #8889 from Dhilan007/v3-testcase-android 
Fixed line wrap error for system font on MAC
 2014-10-21 16:55:22 +08:00
Dhilan007 90b2d8464b Fixed line wrap error for system font on MAC 2014-10-21 16:46:00 +08:00
Dhilan007 b741767b37 Rolling back text color of system font on Linux 2014-10-21 14:14:08 +08:00
huanghsiwu e392bf9b17 fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify 2014-10-21 11:14:07 +08:00
Dhilan007 4765ed8494 Fix wrong text color for system font on Linux/Window 2014-10-20 14:33:33 +08:00
minggo 18ca7c936c Merge pull request #8768 from Dhilan007/v3-33rc 
Improve Android.mk
 2014-10-17 14:09:49 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08:00
minggo 8b1fe93269 Merge pull request #8762 from Dhilan007/v3-33rc 
disable warn on zero-sized structure[android].
 2014-10-17 09:34:41 +08:00
Dale Stammen 41fe4a3e17 dpi for wp8 only 2014-10-16 11:16:26 -07:00
Dhilan007 5595947dc3 disable warn on zero-sized structure[android]. 2014-10-16 21:41:52 +08:00
minggo b4867bf6e5 Merge pull request #8715 from iSevenDays/v3 
CMakes support for Mac Os X & iOS
 2014-10-16 21:16:02 +08:00
Mircea Rila 0678601f61 decrease logging verbosity - CCFileUtils-android 2014-10-16 13:03:39 +03:00
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
Anton Sokolchenko 41b51168d0 CMake fix for template projects 2014-10-15 16:33:58 +03: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
xseekerj 0bfd934d03 CCPlatformMacros.h 
Added std::nothrow for CREATE_FUNC.
 2014-09-27 19:53:44 +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
huanghsiwu 7a2a44ad88 Enable screen orientation change handling - by Teivaz 2014-09-26 16:16:34 +08:00
minggo d491d9e6db Merge pull request #8149 from andyque/fixIOS8EditBox 
fix ios8 EditBox orientation problem
 2014-09-25 13:47:23 +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
andyque 34fbca9c50 fix ios8 EditBox orientation problem 2014-09-25 11:46:42 +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
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
minggo 79446999bb Merge pull request #8116 from Dhilan007/v3-labelfix 
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
 2014-09-24 15:03:40 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04: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
Dhilan007 ac916c3027 Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7. 2014-09-22 18:01:13 +08:00
huanghsiwu 41b4ba8307 fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp 2014-09-22 09:42:33 +08:00
minggo 6569f1a7f0 Merge pull request #8108 from huangshiwu/v3_wp8test 
fix wp8 directory control bug
 2014-09-19 16:57:02 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00
Steve Kanter 05f0f71cc5 Update CCDevice-ios.mm 
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
 2014-09-17 14:52:30 -04:00
Eric Zhong ae5f6e63e5 optimize decompress jpg data and fix warnings 2014-09-16 21:55:05 +08:00
Eric Zhong 8de3657f3c optimize decompress jpg data 
it may be unnecessary copy jpg bytes one by one when decompress jpg data
 2014-09-15 23:15:01 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work 
isPopupNotify() doesn't work
 2014-09-15 14:06:04 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
Ricardo Quesada 525fecc4ce even more cmake fixes 2014-09-11 17:36:49 -07:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07: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
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 73450be715 compiles and runs in Linux 2014-09-09 17:11:06 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

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

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
oleg-akatsuki 511ee30b6e Move constructor from private to public 
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
 2014-09-09 11:34:48 +09:00
minggo 0fc1baee65 Merge pull request #7954 from huangshiwu/v3_wp8fix_pr 
fix wp8 compile error and modify default resource path
 2014-09-05 11:36:32 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
samuele3hu 61d1b67116 Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon 2014-09-04 18:17:05 +08:00
minggo cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00
minggo 83719db8d4 Merge pull request #7934 from wohaaitinciu/loc_ver 
fix: win32 cpp-tests sometimes cannot display font correctly
 2014-09-04 10:49:30 +08:00
Sergey 89ed897f47 getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
Jeff 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
andyque 8033b1f7bb Merge branch 'v3' into mergeExtensionEditBox 2014-09-02 00:03:16 -07:00
kaishiqi 8f11dd7f8b Update CCGLViewImpl.cpp 
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
 2014-09-02 11:13:30 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
minggo bb85ecf0da Merge pull request #7913 from chuanweizhang2013/v3fixed 
make debug writable path the same as release
 2014-09-01 10:15:52 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
andyque cf0baef7c0 add web view javascript support 2014-08-29 11:50:08 +08:00
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
minggo b8447baf73 Merge pull request #7893 from slackmoehrle/glview_fix 
Glview fix
 2014-08-28 10:10:17 +08:00
Ricardo Quesada 781b0bc478 properties revert back to 10 2014-08-27 16:35:13 -07:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Slack-Moehrle 1b5413d8b4 comment out [glview release]; and [eaglview release]; 2014-08-27 10:42:27 -07:00
Slack-Moehrle d4d2b8c83e comment out [glview release]; and [eaglview release]; 2014-08-27 10:26:09 -07:00
andyque 3d97ddc739 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/ui/Android.mk
 2014-08-27 14:08:16 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo d290076917 invoke nativeOnPause after onSurfaceCreated is invoked 2014-08-27 10:13:03 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
andyque 15815118a2 finish android version 2014-08-26 16:53:37 +08:00
andyque 631e1a70c4 add WebView-inl.h and refactor Android code 2014-08-26 14:26:37 +08:00
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
huangshiwu 7f57d15cb3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs 2014-08-22 11:04:13 +08:00
huangshiwu 7dec715288 OpenGL context attributions setting revise 2014-08-22 10:55:39 +08:00
minggo 4563e65427 fix compiling error on android and fix some coding style 2014-08-21 15:41:05 +08:00
minggo b349ce43ae use macro to control whether to use jpeg, tiff, webp or not 2014-08-21 15:19:26 +08:00
huangshiwu 2369a5900d merge v3 to v3_glviewattrs 2014-08-21 10:18:55 +08:00
huangshiwu 2a03bea1a4 OpenGL context attributions setting 2014-08-21 09:35:32 +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
andyque 07eb0d373c Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	cocos/ui/Android.mk
 2014-08-20 09:32:29 +08: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
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
minggo b842c57954 Merge pull request #7794 from minggo/seperate-jpg-tiff-webp 
Seperate jpg tiff webp
 2014-08-15 15:24:09 +08:00
minggo e59283343a Merge pull request #7751 from zawasp/win32_minimize 
add minimize / restore for desktop (win32, linux, mac)
 2014-08-15 15:00:13 +08:00
minggo bf75e9996a separate jpeg, tiff and webp 2014-08-15 14:29:10 +08:00
minggo 1643c29a00 Merge pull request #7782 from liang8305/v3 
mLastTickInNanoSeconds is the renderStart
 2014-08-14 18:11:41 +08:00
胖梁 3619fb943a mLastTickInNanoSeconds is the renderStart 
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;

so:
no need nanoTime() twice
 2014-08-14 17:07:04 +08:00
Mircea Rila d9a0c6a2ad replace tabs with spaces 2014-08-14 10:48:09 +03:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
Mircea Rila cfafeb1e87 add minimize / restore for win32 2014-08-12 22:22:47 +03:00
minggo bed1ccf0f3 Merge pull request #7733 from huangshiwu/v3_glviewfix 
CCGLView modefy
 2014-08-12 09:51:27 +08:00
huangshiwu 77bc3a0e60 GLView modefy additional 2014-08-11 16:55:23 +08:00
huangshiwu 1177b0d545 CCGLView modefy 2014-08-11 16:15:02 +08:00
cpascal 5e1570e36e Fix a correct onGLFWCharCallback 2014-08-10 01:42:21 +09:00
huangshiwu 6ce16546b5 winrt compile fix -addtional 2014-08-08 10:47:14 +08:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
huangshiwu b7aa046cd2 wp8 compile fix -additional 2014-08-07 14:09:22 +08:00
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
minggo a7d5b7af56 Merge pull request #7691 from Dhilan007/v3 
fixed can's set outline color for system font correctly on IOS.
 2014-08-07 10:52:59 +08:00
minggo 7b11c6a74e Merge pull request #7237 from martell/v3 
Cmake update and remove old scripts from build folder
 2014-08-07 10:36:10 +08:00
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +08:00
Dhilan007 9da4ba14f5 fixed can's set outline color for system font correctly on IOS. 2014-08-07 10:04:29 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
Kenichi Hamada 771996f9f3 Added a function getAssetManager() on CCFileUtilsAndroid 2014-08-06 13:36:04 +09:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +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
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
Ningyu aebe8317bd spaces 2014-07-29 17:22:13 +08:00
Ningyu d5242ef4fa add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 17:06:43 +08:00
minggo 191f7a57e1 Merge pull request #7078 from reckhou/v3 
Optimize FPS control algorithm under Android.
 2014-07-28 14:00:55 +08:00
minggo 9efbd6e4ef Merge pull request #7600 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Improve searchFullPathForFilename and comments
 2014-07-28 11:34:13 +08:00