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

46 Commits

Author SHA1 Message Date
leeda 18a6d8241d update Copyright. might need manual fix later (#18659) 
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
 2018-01-29 16:25:32 +08:00
newnon 58077edc00 Add blend function to Text (#18631) 2018-01-19 09:19:36 +08:00
CocosRobot d07794052f Update license to 2017 (#17362) 
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
 2017-02-14 14:36:57 +08:00
newnon 61c856679e getLetter function for Text (#17178) 2017-01-13 18:06:01 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
Liam 4c5c6e6d9b update for code format 2015-12-11 12:04:54 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +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
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
andyque e118b085b8 add UIText bug fix tests 2014-11-26 15:05:20 +08:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +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
dzl-ian b8248a165b Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
dzl-ian 3ad0d981c4 Add getter and setter for TextColor to Text Widget 2014-07-25 14:46:25 +09:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
andyque b7c8759f3b modify outline size parameter 2014-06-09 14:37:56 +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 e0cc5153fa Remove misleading comment, add new comment 
Remove misleading comment, add new comment for enableOutline
 2014-06-06 16:54:51 +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
favorcode 5ed9e781e4 Update UIText.h 
Update the doxygen comment
 2014-05-20 13:05:20 +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 09fce798f0 closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque ca4a7a7e53 issue #4900, refactor 2014-05-14 09:55:55 +08:00
andyque 92d9120967 issue #4900, refactor 2014-05-14 09:37:21 +08:00
andyque 2a25afbb76 closed #4900. add comment 2014-05-13 18:15:53 +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
andyque 92945715eb issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: Uses new label instead of LabelTTF in engine.
 2014-03-25 13:46:17 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 
Thank @pandamicro.
 2014-03-21 13:44:29 +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