vision
|
33fb1dd050
|
Make the API more extendable
|
2014-06-13 15:27:59 +08:00 |
vision
|
7e99121af7
|
Change the default pixel format from RGB to RGBA for render texture when saving as PNG.
|
2014-06-13 13:35:18 +08:00 |
minggo
|
1b24af95f1
|
[ci skip]
|
2014-06-12 18:23:31 +08:00 |
minggo
|
cf7c603d79
|
Merge pull request #7036 from visiblelight/new_blur_shader
New shader for the blur effect
|
2014-06-12 18:20:38 +08:00 |
minggo
|
1187cfff6d
|
[ci skip]
|
2014-06-12 16:19:05 +08:00 |
minggo
|
d1ca81634a
|
[ci skip]
|
2014-06-12 16:18:22 +08:00 |
minggo
|
eb21bf1ad1
|
Merge pull request #7030 from Rumist/v3
#5506 bug fix
|
2014-06-12 16:16:13 +08:00 |
minggo
|
f6913fc931
|
[ci skip]
|
2014-06-12 16:12:03 +08:00 |
minggo
|
bb5471ca8b
|
[ci skip]
|
2014-06-12 15:07:29 +08:00 |
minggo
|
77fdd124a1
|
[ci skip]
|
2014-06-12 15:05:31 +08:00 |
minggo
|
5a28ba68b4
|
Merge pull request #7031 from sachingarg05/GLProgramNoAbort
GLProgram should not abort() if shader compilation fails, returning false is better.
|
2014-06-12 15:03:29 +08:00 |
minggo
|
22f445d56f
|
[ci skip]
|
2014-06-12 14:47:42 +08:00 |
minggo
|
ed14108ab1
|
Merge pull request #7042 from Dhilan007/v3-systemfont-ios
LinWenhai fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-12 14:44:26 +08:00 |
minggo
|
85a9e85dfd
|
Merge pull request #7045 from heliclei/commit-status-desc
[ci skip] Set github commit status context & description
|
2014-06-12 14:40:55 +08:00 |
minggo
|
cc683ff00f
|
[ci skip]
|
2014-06-12 11:40:41 +08:00 |
minggo
|
5c718e27da
|
Merge pull request #7044 from Dhilan007/v3-label-improve
Ensuring release cache texture in timely.
|
2014-06-12 11:39:36 +08:00 |
minggo
|
70147e9a20
|
[ci skip]
|
2014-06-12 11:38:28 +08:00 |
minggo
|
c5a8ba3a2c
|
Merge pull request #7043 from Dhilan007/v3-texturecachefix
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:35:34 +08:00 |
heliclei
|
87ac4c660d
|
[ci skip] Set github commit status context & description
|
2014-06-12 11:30:37 +08:00 |
Dhilan007
|
d755b7ffcb
|
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:21:42 +08:00 |
vision
|
dc4cdc9c0f
|
remove the comments
|
2014-06-12 10:19:08 +08:00 |
vision
|
97b578185d
|
new parameter for setting blur shader effect
|
2014-06-12 09:49:48 +08:00 |
LinWenhai
|
b268536385
|
fixed typo.
|
2014-06-12 09:46:18 +08:00 |
minggo
|
e68c01eda9
|
Merge pull request #7041 from MSOpenTech/wp8-v3-update
added missing ObjectFactory files
|
2014-06-12 09:42:59 +08:00 |
Dale Stammen
|
775832a710
|
added missing files
|
2014-06-11 13:18:10 -07:00 |
Dhilan007
|
7cc3879257
|
Ensuring release cache texture in timely.
|
2014-06-11 22:03:10 +08:00 |
Dhilan007
|
63a68632a5
|
fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-11 21:49:08 +08:00 |
vision
|
e2c75c1f11
|
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
|
2014-06-11 14:54:14 +08:00 |
minggo
|
0ad57bdde7
|
[ci skip]
|
2014-06-11 14:50:33 +08:00 |
minggo
|
ccb24abf52
|
Merge pull request #7028 from heliclei/cocos-version
[ccconsole]Add version command.
|
2014-06-11 14:49:47 +08:00 |
minggo
|
14ea582fbc
|
Merge pull request #7035 from samuele3hu/v3_keypad_fix
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
|
2014-06-11 11:35:31 +08:00 |
minggo
|
11d8663f2b
|
Merge pull request #7034 from CocosRobot/update_lua_bindings_1402453768
[AUTO]: updating luabinding automatically
|
2014-06-11 11:31:33 +08:00 |
samuele3hu
|
1a3cb575d2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-11 11:26:44 +08:00 |
samuele3hu
|
54379f48a9
|
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
|
2014-06-11 11:24:17 +08:00 |
CocosRobot
|
818c478224
|
[AUTO]: updating luabinding automatically
|
2014-06-11 02:30:38 +00:00 |
minggo
|
c6b7ec2769
|
Merge pull request #7033 from samuele3hu/v3_keypad_fix
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:27:00 +08:00 |
samuele3hu
|
2d50df8b01
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:19:07 +08:00 |
samuele3hu
|
d200dd83a4
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:15:38 +08:00 |
samuele3hu
|
2252bc271b
|
Update the KeyCodeTest in the NewEventDispatcherTest
|
2014-06-11 10:14:24 +08:00 |
samuele3hu
|
4ce2d7f193
|
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:10:11 +08:00 |
Sachin Garg
|
8ba4c7a083
|
GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device).
|
2014-06-10 17:59:15 +05:30 |
elsanide
|
2e73f63156
|
#5506 bug fix
when Director->convertToUI() called, returned wrong value.
kazmath code (under 3.0 version.)
//********************************************************
kmVec3* kmVec3TransformCoord(kmVec3* pOut, const kmVec3* pV, const kmMat4* pM)
{
/*
a = (Vx, Vy, Vz, 1)
b = (a×M)T
Out = 1 ⁄ bw(bx, by, bz)
*/
kmVec4 v;
kmVec4 inV;
kmVec4Fill(&inV, pV->x, pV->y, pV->z, 1.0);
kmVec4Transform(&v, &inV,pM);
pOut->x = v.x / v.w;
pOut->y = v.y / v.w;
pOut->z = v.z / v.w;
return pOut;
}
//********************************************************
Mat4.h & MathUtil version (3.1 or later)
//********************************************************
inline void MathUtil::transformVec4(const float* m, const float* v, float* dst)
{
// Handle case where v == dst.
float x = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
float y = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
float z = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
float w = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];
dst[0] = x;
dst[1] = y;
dst[2] = z;
dst[3] = w;
}
//****************************************************
Transforms 3-D vector or an array of 3-D vectors using a given matrix, projecting the result back into w = 1.
but, it is not apply w = 1.
|
2014-06-10 18:15:07 +09:00 |
heliclei
|
d4a9640a5e
|
[ccconsole]Add version command.
|
2014-06-10 16:29:06 +08:00 |
minggo
|
8222cdd8aa
|
[ci skip]
|
2014-06-10 13:53:41 +08:00 |
minggo
|
d7af5eccd4
|
Merge pull request #7024 from pandamicro/SpriteFrame_Ctor
Issue #5533: Add SpriteFrame's constructor
|
2014-06-10 13:38:27 +08:00 |
pandamicro
|
8bc531a0fb
|
Fixed #5533: Fix usage of new SpriteFrame in engine
|
2014-06-10 12:04:20 +08:00 |
pandamicro
|
92a33225ff
|
Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues
|
2014-06-10 11:39:48 +08:00 |
minggo
|
2ab54a0da9
|
Merge pull request #7023 from samuele3hu/v3_lua_ui_fix
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:37:18 +08:00 |
samuele3hu
|
aa877f2b50
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-10 11:31:08 +08:00 |
samuele3hu
|
5a80b4da2e
|
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:30:39 +08:00 |