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

25 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
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
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
pandamicro 485dd1f7da Update #3897: Refactor missed protected constructors 2014-08-21 15:40:22 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
andyque 54e93f6c41 fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
zhangcheng f564c4e34a 1. Spirte -> Sprite. 
2. _EMPTYNODE -> EMPTY_NODE.
 2014-03-26 17:55:35 +08:00
zhangcheng c1ff610277 use capital letters for enum. 2014-03-26 17:21:09 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
James Chen ef5ab1b9be sharedXXX -> getInstance, purgeXXX -> destroyInstance. 2014-01-04 14:23:40 +08:00
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
chengstory 46c7338008 fixed #3480 
1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
 2014-01-03 19:30:47 +08:00
chengstory 6892d8cf6a issue #3480 
1.  add SceneReader Tests.
                  2.  Modify class member name.
 2014-01-03 01:14:12 +08:00
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
zhangcheng 2c6f95ecea issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00