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

247 Commits

Author SHA1 Message Date
minggo ef3263e80d [ci skip] 2014-05-16 22:09:30 +08:00
minggo 39c76d8a9e [ci skip] 2014-05-16 17:13:17 +08:00
minggo d3853e3f8b [ci skip] 2014-05-16 14:11:26 +08:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
minggo e6fe882963 [ci skip] 2014-05-15 15:50:12 +08:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
minggo 89bb56e829 [ci skip] 2014-05-14 09:59:38 +08:00
minggo ac22dc236a [ci skip] 2014-05-13 18:45:41 +08:00
minggo 4bb9fb2396 [ci skip] 2014-05-13 13:56:42 +08:00
minggo cbf2629bf0 [ci skip] 2014-05-12 16:54:18 +08:00
minggo f5055548ac [ci skip] 2014-05-12 14:00:11 +08:00
minggo 8ceb26532a [ci skip] 2014-05-12 13:43:47 +08:00
Ricardo Quesada 91d1883e15 updated changelog 2014-05-11 11:19:11 -07:00
minggo 8a74f83ad0 [ci skip] 2014-05-08 18:46:34 +08:00
minggo 0ae859e3e1 [ci skip] 2014-05-08 18:00:01 +08:00
minggo 5291bbc377 [ci skip] 2014-05-08 17:25:41 +08:00
minggo 2571767907 [ci skip] 2014-05-08 17:13:21 +08:00
minggo b22fe211de [ci skip] 2014-05-08 15:42:05 +08:00
minggo 4defe28f1f [ci skip] 2014-05-08 13:47:04 +08:00
James Chen 37cb91fdc0 Update CHANGELOG [ci skip] 2014-05-08 10:52:15 +08:00
James Chen c6fd98d5f1 Update CHANGELOG [ci skip] 2014-05-07 16:27:35 +08:00
minggo 1caa7ece9a [ci skip] 2014-05-06 11:56:00 +08:00
minggo 07df728919 [ci skip] 2014-05-06 11:51:34 +08:00
minggo 9634da6ce7 [ci skip] 2014-05-06 11:47:53 +08:00
Ricardo Quesada 0e6dd9afe5 Particles can be created without texture 
Needed for complex particles like in EarthWarrior3D
 2014-05-05 15:50:08 -07:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 066a6a3577 Update CHANGELOG [ci skip] 2014-03-04 22:11:50 +08:00
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
James Chen aeecee86a4 Update CHANGELOG [ci skip] 2014-03-03 17:14:16 +08:00
James Chen e0178ae886 Update CHANGELOG [ci skip] 2014-03-03 10:08:47 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer 
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
 2014-03-01 08:26:54 -08:00
Ricardo Quesada 3bacd45240 indentation fix in CHANGELOG 2014-02-28 21:47:11 -08:00
Ricardo Quesada 5a2697816f Updates CHANGELOG 2014-02-28 16:41:37 -08:00
James Chen 2995f91b59 Update CHANGELOG [ci skip] 2014-02-28 16:38:05 +08:00
James Chen 7bfd180743 Update CHANGELOG [ci skip] 2014-02-28 10:19:37 +08:00
James Chen 5454a2db62 Update CHANGELOG [ci skip] 2014-02-27 21:56:31 +08:00
James Chen cd35bc17e8 Update CHANGELOG [ci skip] 2014-02-27 21:53:31 +08:00
James Chen c994b4ac72 Update CHANGELOG [ci skip] 2014-02-27 10:09:56 +08:00
James Chen c86aeda15e Update CHANGELOG [ci skip] 2014-02-26 11:59:08 +08:00
James Chen f97f109fbc Update CHANGELOG [ci skip] 2014-02-26 11:44:05 +08:00
James Chen 67361fc834 Update CHANGELOG [ci skip] 2014-02-26 11:41:20 +08:00
James Chen 364a6f8ef6 Update CHANGELOG [ci skip] 2014-02-25 18:32:18 +08:00
James Chen 304ccb73f1 Update CHANGELOG [ci skip] 2014-02-25 12:59:30 +08:00
James Chen 1823e890ac Update CHANGELOG [ci skip] 2014-02-25 11:18:02 +08:00
James Chen 3a652fcaf5 Update CHANGELOG [ci skip] 2014-02-24 22:25:55 +08:00
James Chen e310734af1 Update CHANGELOG [ci skip] 2014-02-24 21:50:17 +08:00
James Chen 618104d056 Update CHANGELOG [ci skip] 2014-02-24 20:14:55 +08:00
James Chen 8437e5f08b Update CHANGELOG [ci skip] 2014-02-24 17:02:38 +08:00
Ricardo Quesada 04460750b8 culling working for both 2d and 3d projections 2014-02-23 01:09:52 -08:00
James Chen e133556268 Update CHANGELOG [ci skip] 2014-02-21 19:18:24 +08:00