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

49 Commits

Author SHA1 Message Date
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
zilongshanren fd8cfd8ccb don't change Text's dimension when label scale. 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
 2015-09-21 17:03:29 +08:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +08:00
andyque be62b3a8e2 Copy missing text color property of ui::Text. 2015-05-15 16:04:34 +08:00
andyque 10c90b06aa fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
Liam e8fa6597df fix uitext size error 2015-01-19 17:02:28 +08:00
andyque 0f49bb977d improve ui::Text and ui::TextField creation performance 2015-01-07 17:21:41 +08:00
andyque 16cf396ed7 refactor Button restrict capInsetSize logic and cleanup ui coding style 2014-12-16 16:44:04 +08:00
Edward Zhou 1ca92411fc Fix UIText miss copy contentSize for clone 2014-12-11 13:33:28 +08:00
andyque a2883aa097 fix UIText dimension error when set ignoreContentSize to false 2014-11-26 13:41:24 +08:00
Haneol Park d25fdca4af Unnecessary set dirty of ui widget 2014-11-25 17:50:46 +09:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
andyque 294271682b change return const value to value 2014-09-12 14:39:22 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08: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
dzl-ian b8248a165b Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
dzl-ian bc30519812 Add missing space in function definition 2014-07-27 08:23:16 +09:00
dzl-ian 7048bc515b Remove update of content size as it won't change 2014-07-25 15:52:35 +09:00
dzl-ian 3ad0d981c4 Add getter and setter for TextColor to Text Widget 2014-07-25 14:46:25 +09:00
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
andyque 585ccf2c71 issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
andyque a52532c3c5 Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText 
Conflicts:
	cocos/ui/UIText.cpp
 2014-06-09 14:17:57 +08:00
zhouxiaoxiaoxujian fabc4d03ee Update UIText.cpp 2014-06-06 16:50:25 +08:00
zhouxiaoxiaoxujian 03eeb2cade Remove unnecessary Type::TTF Check 
Remove unnecessary TTF type check on enableOutline or enableGlow function。
 2014-06-06 16:41:45 +08:00
andyque a37a6737ca refactor Text setColor & setOpacity 2014-06-06 16:08:31 +08:00
Frank.Xu 7ece807a63 Add shadow, outline, glow filter support for UITextField 2014-06-05 19:21:06 +08:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
andyque 5da1f1f78c add constness to UIText 2014-05-27 11:30:36 +08:00
hyq 11dcf1e1dd fix UIText's fontSize 
if set fontsize before setting font family, fontsize was wrong
 2014-05-19 11:38:45 +08:00
minggo db0ea94b8a Merge pull request #6730 from andyque/refactor5110 
refactor ui framework
 2014-05-14 17:47:47 +08:00
andyque 9d5c2ba773 closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque 31a2194dcb closed #4900, add TTF font to UIText 2014-05-13 17:45:15 +08:00
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
Dhilan007 390685ae93 Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
andyque 4b6aa2a22c closed #4636. remove Hungary style 2014-04-04 18:26:53 +08:00
andyque 9bcfea2279 issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
andyque 0875b4e51f closed #4636. Done 2014-04-03 15:56:45 +08:00
andyque 92945715eb issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00