Граф коммитов

33 Коммитов

Автор SHA1 Сообщение Дата
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
Ruud Arentsen a66215916e Added support for larger tilemaps in CCFastTMXTiledMap (#17006)
* Added option to use 32 bit indices for large maps

* Added option to use 32 bit indices for large maps
2016-12-15 10:01:37 +08:00
yahont e9b39a99e2 cocos2dInternal cleaned of some warnings (#16818)
* cocos2dInternal cleaned of some warnings: unused parameters and signed-unsigned comparisons

* -Werror removed

* tab fixed

* indent fixed

* more warnings fixed
2016-11-09 10:34:50 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
mogemimi be213bf306 Fix typos in documentation 2015-12-03 21:03:00 +09:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes...
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
2015-03-28 14:28:16 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
Huabing.Xu 725d107ae5 change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo 7baf873bf6 remove unneeded includes 2014-08-28 17:03:29 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
Huabing.Xu f7ad98b15b using primitve->draw in Fast_tmx on draw 2014-08-04 17:57:31 +08:00
Huabing.Xu bbf11f5d06 refactor vertex data
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
Huabing.Xu a44f4c95e1 using indexBuffer instead of raw VBO 2014-08-04 10:40:07 +08:00
Huabing.Xu 3d4bfe7780 using VertexBuffer instead of raw buffer 2014-08-01 17:50:22 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
Huabing.Xu 0214131bb2 optimise tile map rendering 2014-07-02 17:16:03 +08:00
Huabing.Xu 3771654e66 remove deprecated function
rename enum to static const member of class
remove hex tile map(we do not support it yet)
2014-06-27 18:00:06 +08:00
Huabing.Xu 1152f77ed7 clean up fast tmx code 2014-06-27 14:42:53 +08:00
Huabing.Xu 6292ed05be improvement for fast tmx rendering 2014-06-27 11:50:44 +08:00
Huabing.Xu a04b5fc5d5 use custom command for fast_tmx rendering 2014-06-27 10:30:21 +08:00
Huabing.Xu 81aa9c2c74 use custom command for rendering 2014-06-26 20:45:08 +08:00
Huabing.Xu bda9708206 clean up Fast TMX code2 2014-06-25 10:06:37 +08:00
Huabing.Xu 67f83f43b0 clean up Fast TMX code 2014-06-25 10:04:20 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
Huabing.Xu f82be936b5 Merge branch 'fast_tmx_copy' into fast_tmx
Conflicts:
	cocos/2d/CCFastTMXLayer.cpp
2014-06-19 18:10:44 +08:00
boyu0 5f10ff2c29 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00