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

478 Commits

Author SHA1 Message Date
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
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
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
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