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

625 Commits

Author SHA1 Message Date
Dale Stammen 79f312d101 call pause on correct thread 2015-04-17 09:31:02 -07:00
Dale Stammen 2ccff5671a fix for encoding images with WIC 2015-04-17 09:20:23 -07:00
andyque d3a06de6d6 remove system zlib dependency since we use our own prebuilt version of 
zlib now.
 2015-04-17 17:24:33 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 
Conflicts:
	build/cocos2d-wp8.sln
 2015-04-16 17:04:07 +08:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8 
V3 remove WP8 project files
 2015-04-16 14:32:11 +08:00
Dale Stammen b1c9c34c19 added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:19:38 -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 b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
Wenhai Lin 2dd88e8be5 Fixed JNI illegal start byte error 2015-04-15 18:20:52 +08:00
zhangbin 8c2413aa54 Add submodule js-bindings & html5. 2015-04-14 15:20:46 +08: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
minggo 4d9e376a18 Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log 
Log message can't detect image format
 2015-04-08 10:52: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
Vladimir Perminov 3931273a58 Log message can't detect image format 
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
 2015-04-04 13:19:47 +03:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
Huabing.Xu 98371e4fbb Merge pull request #11267 from WenhaiLin/v3-at01 
Disable MessageBox when the device does not have an accelerometer on WinRT.
 2015-04-03 11:53:07 +08: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 d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
Dale Stammen 957bf48790 fire foreground and background events 2015-04-02 09:07:44 -07:00
WenhaiLin aaae566b7b Performance: Fixed lag if Director::setContentScaleFactor is called frequently 2015-04-02 23:35:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file 
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
 2015-03-31 13:52:40 +03:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
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
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