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

125 Commits

Author SHA1 Message Date
James Chen 90403fc632 Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +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
Wilson E. Alvarez b672b94edc Removed unnecessary assignments (#17328) 2017-02-09 10:57:01 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812) 
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
 2016-11-16 09:48:37 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +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
mogemimi 2a8d84e7f9 Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
mogemimi 44d2a161dc Remove unnecessary c_str() calls 2016-02-04 11:52:14 +09:00
fjut 4c3d0c62bb remove duplicate include 
duplicate include: #include "ui/CocosGUI.h"
 2015-10-16 21:41:40 +08:00
XiaoFeng 935b0f006b Fix https://github.com/cocos2d/cocos2d-x/issues/10205 2015-08-20 10:55:30 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
andyque 0c1ee8b26a fix studio json reader percentage mode bug 2015-06-25 16:14:22 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug 
fix a bug which will cause anchor point config not work
 2015-03-09 14:30:41 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
andyque d4b2e8d154 remove deprecated warning 2014-09-12 17:06:13 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
lite3 2b6bdac05d Merge branch 'v3' into customguireader 2014-08-28 15:13:10 +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
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
lite3 8f59d8ac93 add GUIReader::registerTypeAndCallBack for std::function 2014-08-12 17:19:52 +08:00
lite3 69e2b815ed fix: copy map when getParseCallBackMap() and getParseObjectMap() 2014-08-12 17:05:23 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
andyque 9398395de8 fix custom property 2014-06-18 16:19:24 +08:00
andyque 1533374bd1 add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
andyque aa5df68b96 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	cocos/3d/CCAnimationCurve.h
	cocos/3d/CCAnimationCurve.inl
 2014-06-18 15:13:34 +08:00
2youyou2 aa06fab776 support relative path for reading json 2014-06-11 21:11:22 +08:00
andyque 5515c43bb2 improve lasers 2014-06-11 15:16:08 +08:00
andyque f50263402a improve parser 2014-06-11 14:56:12 +08:00
andyque 2f6f1b7151 improve binary format 2014-06-11 14:45:35 +08:00
andyque 7a8f27ee0b remove unused parser code 2014-06-11 14:15:34 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
andyque c96a6086c3 improve parsing code 2014-06-05 11:43:43 +08:00