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

89 Commits

Author SHA1 Message Date
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
Ricardo Quesada 995868c62e fix: Text::create() does not crash on mac/ios 
...on invalid unicode.

fixes issue #16073
 2016-07-08 16:59:44 -07:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
mogemimi a3bc979452 Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
子龙山人 51f4deee01 Add system label overflow (#15827) 
* Add system font overflow

1. currently only iOS, Mac and Android platform are supported

add mac label overflow shrink

modify system font overflow test

fix warning and possible memory leaks

add ios system label overflow support

add iOS system font overflow support

fix iOS system font overflow

fix Mac System font overflow

add android system font clamp

add Android system font shrink

cleanup iOS shrink related code

fix Android system font clamp

add core text to project template

fix iOS tests project

fix mac and iOS shrink

improve iOS and Mac clamp feature

fix header file include path

* modify the comments, make it more clearer
 2016-06-15 10:43:15 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
Steve Tranby 7c1e60f0b7 Prevent memory leak: force drain on autoreleased `data`. 2016-05-05 08:00:28 -06:00
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Mikhail Shulepov 014f8e107f fix: ensure calling opengl only when app is active 2016-02-13 11:17:55 +03:00
Mikhail Shulepov ab17455b18 fix: ensure drawing in main thread (layoutSubviews may be called in web thread due to banners) 2016-02-13 11:16:35 +03:00
mogemimi b14a3730ca Fix warning: extra tokens at end of #ifdef directive 2016-01-17 03:17:00 +09:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
Ricardo Quesada 692c0f8a0e adds tvOS support 
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
 2015-12-28 15:59:36 -08:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
肖峰 23bf815cfa Fix 3d touch compile error in lower version Xcode 2015-12-14 14:26:52 +08:00
Ricardo Quesada 0e34a864b2 Merge pull request #14528 from xiaofeng11/v3_3dtouch 
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
 2015-12-03 22:21:48 -08:00
肖峰 5dfc8f6a26 Remove default arguments 2015-12-02 11:02:27 +08:00
肖峰 bb832f8d60 Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device 2015-12-01 13:02:53 +08:00
zilongshanren 60624b8fd5 fix Keyboard fails to hide on iOS. 
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
 2015-11-28 15:37:58 +08:00
肖峰 f0cc8e7f25 Fix keyboard won't dismiss on iOS issue 2015-11-27 15:44:35 +08:00
pandamicro 8695fbe711 Merge pull request #14172 from njh0602/somefix2 
Add virtual keyword.
 2015-11-11 14:17:27 +08:00
pandamicro ac06c9f8bb Merge pull request #14260 from pyrosphere/add-app-version 
Added Application::getVersion() to get the app version.
 2015-11-11 14:13:42 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
Filipe Lemos 61ce3e8a03 Fixed warnings about missing override in CCApplication for iOS/Mac 2015-10-30 10:02:07 +00:00
Filipe Lemos 9aa1f7138d Added override keyword to getVersion 2015-10-29 08:36:03 +00:00
Filipe Lemos 04fa7a8902 Added Application::getVersion() to get the app version. 2015-10-28 17:57:57 +00:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
mogemimi 4012dd8455 Fix naming typos 2015-10-21 15:56:47 +09:00
mogemimi 34831d48ce Fix memory leak in GLViewImpl 2015-10-19 19:46:45 +09:00
남준현 f49d467465 Add virtual keyword. 2015-10-17 04:46:37 +09:00
igorzel 40a6789765 Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm) 
There was the problem when “height” and “width” were typecast to short
integer. So for values more than sizeof(short) we had integer overflow.

Steps to reproduce:
Create simple application with EditBox. Start it. Add 1000 (just
example) characters at a time to the EditBox. Method
Device::getTextureDataForText will be called and there will be integer
overflow for “height” and “width”. As a result application will crash
later.
 2015-09-22 13:25:43 +03:00
andyque 556175df1e add iOS EditBox multiline support 
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.

Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
 2015-09-15 13:52:39 +08:00
WenhaiLin a0c270234b Replace tab with spaces 2015-08-14 21:17:51 +08:00
pandamicro c81ba3c148 Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios 
Fixed: #12645 iOS: depth/stencil buffers attributes are ignored
 2015-07-29 11:09:56 +08:00
Ricardo Quesada ad1fc88fa8 compiles on Xcode 7 2015-07-06 16:30:29 -07:00
Jacky 4499b60446 Refine setAnimationInterval from double to float. 2015-07-06 14:57:42 +08:00
Michael Sotnikov 363da2beab Fixed: #12645 iOS: depth/stencil buffers attributes are ignored 2015-07-02 12:07:24 +03:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02: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
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02: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
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +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