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

36840 Commits

Author SHA1 Message Date
minggo f5380f8efe
Merge pull request #19506 from minggo/rectangleclipping 
ClippingRectangleNode works
 2019-03-13 15:50:31 +08:00
minggo 7bae208166
Merge pull request #19505 from minggo/fix-todo 
Fix todo
 2019-03-13 15:24:49 +08:00
minggo 1d9bde0520 ClippingRectangleNode works 2019-03-13 14:27:47 +08:00
minggo 7ebea45168 fix some todo 2019-03-13 14:11:40 +08:00
minggo 2795427a38 fix todo in CCGrid.cpp 2019-03-13 11:25:46 +08:00
minggo fd679e3c3b
Merge pull request #19501 from CocosRobot/update_lua_bindings_1552443257 
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2019-03-13 10:20:09 +08:00
CocosRobot#Set 0ee2dc8c78 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2019-03-13 02:14:20 +00:00
minggo d61ad70826
[Feature] update attribute setting (#19499) 2019-03-13 10:09:38 +08:00
coulsonwang 8d566bb8a7 [Feature] update 3rd-part libs build version (#19492) 2019-03-13 09:18:45 +08:00
coulsonwang a8e54b9b53 [Feature] update attribute setting 2019-03-12 21:05:03 +08:00
minggo 509fd2f70d
enable windows ci (#19497) 
* enable windows ci

* build with cmake

* fix default project name
 2019-03-12 18:21:02 +08:00
Arnold 475b6e63a5 [bugfix] ClippingNode & CameraBackgroundBrush render order (#19496) 
* add groupcommand as a barrier to reorder clipping node renderring

* add comments
 2019-03-12 15:41:32 +08:00
minggo ac6d3f10f0
enable new project build (#19494) 2019-03-12 15:28:39 +08:00
CocosRobot a2b50f8c57 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19495) 2019-03-12 14:13:48 +08:00
minggo ed1e8c2c2f
make new project work (#19493) 2019-03-12 13:59:29 +08:00
CocosRobot feb1f7575e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19490) 2019-03-12 10:52:45 +08:00
Arnold a384e38e16 [bugfix] GL vertex attribute layout incorrect (#19484) 
* collect OpenGL enum convertion methods

* add testcase for lots of nots

* fix andorid compile error

* move more function to UtilsGL

* use shared pointer

* naming stuff

* move VertexLayouts to CommandBuffer

* fix android compile error

* fix android headers

* add comment

* add comment, fix
 2019-03-12 10:37:52 +08:00
CocosRobot 4b292b4e42 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19485) 2019-03-11 15:50:54 +08:00
minggo 262c9e5aec
print more message (#19483) 2019-03-11 10:28:32 +08:00
Arnold 64f3f1d356 ProgressTimer cache uniforms (#19482) 
* cache uniform

* release fix

* reorder vertex attributes
 2019-03-11 10:15:33 +08:00
minggo 34631bf02c
print more message (#19481) 2019-03-11 09:34:15 +08:00
coulsonwang c5c6fa3396 Feature/update sprite3 d test (#19475) 
* [BugFix] fix crashed test in metal

* [Feature] add comments

* [Feature] modify ways to get max_vertex_attribute

* [Feature] make it crashed in debug mode
 2019-03-08 18:48:12 +08:00
minggo de6612f416
comment generating JSB currently (#19479) 2019-03-08 17:10:24 +08:00
minggo 4854f1c3e7
make travis work (#19478) 
* make travis work

* don't compile ios as needing team id
 2019-03-08 15:24:47 +08:00
Arnold 0f1e70ac8b [bugfix] add mesh command callbacks (#19477) 2019-03-08 11:06:03 +08:00
minggo e63c4d1ba6
make lua binding work (#19474) 2019-03-07 18:29:06 +08:00
Arnold 8caade49e6 [3d] add meshcommand (#19472) 2019-03-07 17:30:11 +08:00
minggo 0138db855f
make lua-tests work (#19471) 2019-03-07 11:34:02 +08:00
coulsonwang e69e7e0b30 [Feature] support cubeMapping in metal (#19469) 2019-03-07 11:08:12 +08:00
Arnold f7496948fd [3d] support particle3d (#19464) 
* first commit

* fix matrix

* remove used comments

* fix compile error on mac

* self review fix 1

* litte refactor

* use reference:
 2019-03-06 17:03:16 +08:00
minggo c040a2d49b
Cocos console (#19466) 
* modify to work for new console

* fix for windows

* update cocos console
 2019-03-06 17:01:26 +08:00
coulsonwang 175fb5f9b1 [Feature] update 3rd-party lib tag (#19465) 2019-03-06 11:46:03 +08:00
coulsonwang 776ab98e0b [BugFix] fix fill UnifromBuffer issues (#19462) 2019-03-05 11:19:52 +08:00
coulsonwang c18564cc44 fix depth/stencil validation failed in iPhoneX (#19458) 2019-03-04 15:09:34 +08:00
Arnold 3a55fa3dd6 [3d] add CameraBackgroundBrush (#19454) 2019-03-04 09:14:45 +08:00
Arnold 1e00f50266
reorder sprite3d testscase (#19449) 2019-02-28 15:25:41 +08:00
Arnold b4f2ed0376 [3d] Sprite3DTest enable test cases (#19447) 2019-02-28 15:20:23 +08:00
minggo 10f7790069
remove build folder (#19448) 2019-02-28 15:01:59 +08:00
minggo a6be522601
make hello lua work 2019-02-28 11:17:05 +08:00
Arnold 7fd82997ef [3d] terrain impl & test case (#19442) 2019-02-27 17:16:25 +08:00
coulsonwang f4170ea89a [Feature] set default scissor rectangle for metal when scissor test disabled (#19441) 2019-02-27 15:02:28 +08:00
coulsonwang cba56e5da7 Feature/save image issue (#19435) 2019-02-27 11:29:20 +08:00
minggo 301b6c5028
skeleton node adaption (#19434) 2019-02-26 14:57:12 +08:00
minggo 1e7a6f7fcf
Issue19416 (#19427) 
* use more meaningful names

* remove unneeded types
 2019-02-22 14:06:26 +08:00
Arnold 4d06b847ee fix mac compile error (#19417) 2019-02-20 17:18:14 +08:00
minggo 2ed60f72cf
Remove gl codes (#19415) 2019-02-20 17:07:31 +08:00
Arnold edf3687af5 [3d] add motionstreak3d (#19414) 2019-02-20 16:56:35 +08:00
minggo 06d7e4eda7
remove CCGLProgram related files (#19408) 
* remove CCGLProgram related files

* remove CCGLProgram related header files
 2019-02-19 16:06:17 +08:00
Arnold bfc98c6f21 [3d] add billboard (#19407) 2019-02-19 14:56:21 +08:00
minggo 480d964039
removed duplicated shaders (#19406) 2019-02-19 11:57:13 +08:00