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

580 Commits

Author SHA1 Message Date
minggo 999de9072a Merge pull request #12003 from minggo/remove-unneeded-function 
remove uneeded function
 2015-05-25 16:33:38 +08:00
minggo db0caf68c6 remove uneeded function 2015-05-25 09:50:48 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08: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
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
minggo 5e776381aa Merge pull request #11820 from Dimon4eg/v3 
Fix crash in web view if illegal character in url (Android only)
 2015-05-15 10:12:54 +08:00
Ricardo Quesada 989848a358 fixes memory leak 
improves performance a little bit
 2015-05-14 17:24:27 -07:00
minggo 0a3e6338f1 Merge pull request #11834 from pandamicro/v3_origin 
Sync fixes in Cocos2d-JS
 2015-05-14 13:38:18 +08:00
pandamicro 8577055d5a Implement localStorage.clear on Android 2015-05-14 10:40:25 +08:00
dkorchinskiy 9d7e5e5edc Fix crash in web view if illegal character in url (Android only) 2015-05-13 14:56:07 +03:00
cpascal 134355d763 Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0 
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0

But CCImage.cpp just check wheather defined or not..
 2015-05-13 20:52:32 +09:00
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015 
Add support for visual studio 2015.
 2015-05-13 09:37:12 +08:00
Dale Stammen f1fe802442 updated winrt keyboard support to support physical keyboard 2015-05-12 09:20:10 -07:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
minggo a718c11eb6 Merge pull request #11724 from andyque/fix-binding-generator 
fix upstream compile error
 2015-05-07 11:47:20 +08:00
andyque db95034798 fix android compile error 2015-05-07 10:37:19 +08:00
Jongryul Kook dfe30e159f Need JNIEXPORT for -fvisibility=hidden 2015-05-06 14:24:48 +09:00
WenhaiLin 26c9be7881 Add FileUtils::getSuitableFOpen[window-universal] 2015-05-04 16:06:04 +08:00
WenhaiLin 1839564fbb Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7 2015-05-04 10:16:47 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
minggo 2d2f0aac59 fix indent 2015-04-27 16:25:24 +08:00
minggo 8c4cecca0d fix indent and translate Chinese comment to English 2015-04-27 16:22:54 +08:00
minggo 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
WuHao 9496a48800 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-24 18:29:23 +08:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
Dale Stammen ac8755868d need to call Cleanup() if app is terminating 2015-04-22 19:13:12 -07:00
Dale Stammen b78f830ed8 cleaned up Draw() 2015-04-22 19:11:42 -07:00
Dale Stammen 4119b0f10d cleaned up Draw() 2015-04-22 19:11:29 -07:00
Dale Stammen 22daece170 made Cleanup() public 2015-04-22 19:08:11 -07:00
Dale Stammen c3335551b8 added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 2015-04-22 19:07:48 -07:00
samuele3hu 7c77bc9587 Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen 84a47000b5 rename -win to -winrt 2015-04-21 18:17:18 -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 83b68ef693 added comment on how back button event is handled 2015-04-20 18:36:58 -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 e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
htl 2476f2b52d fixed win32 application return code 2015-04-20 18:27:21 +08:00