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

875 Commits

Author SHA1 Message Date
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
halx99 bf996c5bac Add ETC1 builtin alpha support. (#16118) 
* Add ETC1 builtin alpha support.

* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix

* Check whether etc1 alpha suffix is empty

* fix Code ident & Add etc1 alpha test case to SpriteTest.

* Remove unused ETC1AA shader programs

* Fix all review issues and endl issues

* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID

* #fix issues
 2016-07-25 17:31:54 +08:00
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
mogemimi 7531c5156b Fix documentation when compile with -Wdocumentation and Clang 2016-07-10 17:38:32 +09:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
 2016-06-15 15:01:26 +08:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
Ricardo Quesada 1a7c22bd97 Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug 
CCSprite::createNode bug fix.
 2016-05-26 08:59:46 -03:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
Huabing.Xu e8acf38212 fix animate 3d bug 2016-05-09 15:21:19 +08:00
TAKEDA Yutaka d17fdfe3cc CCSprite::createNode bug fix. 2016-05-09 15:42:39 +09:00
minggo 86df9b535a Merge pull request #15493 from njh0602/somefix 
Renamed ignoreAnchorPointForPosition()
 2016-04-26 11:41:09 +08:00
mogemimi d2c46167c3 Fix compiler warning C4804 under Visual Studio 2016-04-25 10:46:33 +09:00
NamJunHyone 401f3a84ac Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
tomi-payne fbadcf188a Update CCSprite3D.cpp 
Fixed Sprite3DCache::removeSprite3DData error
 2016-04-19 10:11:29 +08:00
Steve Tranby 24fd25e143 Iterator erase pattern 2016-04-01 18:29:21 -06:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +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
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
James Chen b04e4754d7 Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now. 2016-01-15 00:55:10 +08:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
XiaoYang 593a619dc8 Merge pull request #14715 from liamcindy/v3_textureCache 
update for 3D object render, revert old changes
 2015-12-18 21:22:31 +08:00
Liam fb312a761c update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
XiaoYang d904246aa8 Merge pull request #14613 from super626/v3 
fix 3d model bug
 2015-12-14 10:04:25 +08:00
mogemimi f280a31323 Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
yangxiao 6e1f38fdc4 fxi model bug 2015-12-08 16:32:06 +08:00
pandamicro 6ff2586f26 Merge pull request #14574 from super626/v3 
Fix Sprite3D::setMaterial when multiple meshes exist
 2015-12-04 17:38:56 +08:00
Ricardo Quesada f6c2758801 Merge pull request #14409 from xiaofeng11/v3_combine_opengl 
Combine Studio change for openGL related operation
 2015-12-03 23:03:40 -08:00
yangxiao 8d546828f4 fix Sprite3D::setMaterial 2015-12-04 10:54:43 +08:00
Shun Lin d0ce2473a1 Merge pull request #14499 from xiaofeng11/v3_combine_safety 
Change ASSERT to safety mode
 2015-12-04 00:04:36 +08:00
Liam 07bc48c1b8 revert glprogram 2015-12-03 16:29:02 +08:00
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
xiaofeng11 18666a9b41 Merge pull request #14393 from xiaofeng11/v3_combine_3d 
Combine Studio change for 3d components
 2015-12-02 09:47:12 +08:00
yangxiao 54e13c3acd update comment 2015-12-01 17:47:34 +08:00
yangxiao 23f03bc65f update comment 2015-12-01 10:47:25 +08:00
yangxiao 11f1bd6e28 builtin material normal map support 2015-12-01 10:37:53 +08:00
Liam 4d379ed9bd revert ccplane 2015-11-30 14:53:37 +08:00
Liam e0349ae975 update sprite 3d test 2015-11-30 14:48:19 +08:00
XiaoFeng 71871bacf9 Add aabb dirty mark when load from file 2015-11-27 15:53:26 +08:00
XiaoFeng 2d28b78e41 Add 3 missing class export 
Change clearShader logic.
 2015-11-27 14:58:18 +08:00
XiaoFeng a61fe711e2 Update 2015-11-27 14:01:43 +08:00
XiaoFeng f5f09133e6 Change ASSERT to safety mode 2015-11-26 16:49:01 +08:00
XiaoFeng 09606e96cd Add comment for new function 2015-11-25 11:33:24 +08:00
XiaoFeng d0cd640ac8 Update 2015-11-25 11:15:17 +08:00