Commit Graph

20 Commits

Author SHA1 Message Date
CocosRobot d07794052f Update license to 2017 ()
* 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
yahont 0c664ebc99 some warnings fixed: unused variables, signed-unsigned comparison () 2016-11-21 15:03:41 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes...
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
2015-03-28 15:11:51 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
lvlong 5a1e0601a7 Code Standards 2014-08-29 10:43:26 +08:00
陈广歧 8b4953bbfc fixed compile error.
```bash
# compile for android.
$ ./build_native.py
```

Error message as follow:

```
ssize_tjni/../../cocos2d/cocos/./3d/CCBundleReader.cpp:94:23: error: return type of out-of-line
      definition of 'cocos2d::BundleReader::tell' differs from that in the declaration
ssize_t BundleReader::tell()
                      ^
jni/../../cocos2d/cocos/./3d/CCBundleReader.h:90:14: note: previous declaration is here
    long int tell();
             ^
1 error generated.
```
2014-07-19 18:29:52 +08:00
lvlong ff908d771a add a space to test pushing 2014-07-01 11:26:29 +08:00
lvlong df7ab50062 modify BundleReader and the version read 2014-07-01 09:26:21 +08:00
lvlong 42aaf38468 modify reader-64bit bug 2014-06-30 17:10:07 +08:00
lvlong 9d9c1eb51a change the tab in code to space 2014-06-27 14:42:48 +08:00
lvlong ab910dfe19 reader test 2014-06-25 09:13:24 +08:00
lvlong 0ac6b8c96d 1.delete write function from bundle reader.
2.unsigned int -> size_t.
2014-06-23 11:10:03 +08:00
lvlong e4bbfad773 1. binary loader is OK.
2. add some comment.
2014-06-20 15:30:08 +08:00
lvlong 8493c4579b before switch branch save 2014-06-19 15:43:02 +08:00