diff options
author | da-anda <da-anda@xbmc.org> | 2014-11-24 01:53:13 +0100 |
---|---|---|
committer | da-anda <da-anda@xbmc.org> | 2014-11-24 01:53:13 +0100 |
commit | 4f6618ae0a62e58c418f74e5e3e4c2c5dd37cd7f (patch) | |
tree | de3c9c3d81c3ffcc11449bd8967ecd0166434f3d /addons | |
parent | 42f4ac2555b2ccf5eea88e69f019b45a5c18bc3e (diff) | |
parent | 1b3c67b1f893a8ee1296781ec3c6c10970c615bc (diff) |
Merge pull request #5796 from da-anda/all-your-base
[rebrand] replace all XBMC artwork with new logo
Diffstat (limited to 'addons')
-rw-r--r-- | addons/repository.pvr-android.xbmc.org/icon.png | bin | 26829 -> 11304 bytes | |||
-rw-r--r-- | addons/repository.pvr-ios.xbmc.org/icon.png | bin | 26829 -> 11304 bytes | |||
-rw-r--r-- | addons/repository.pvr-osx32.xbmc.org/icon.png | bin | 26829 -> 11304 bytes | |||
-rw-r--r-- | addons/repository.pvr-osx64.xbmc.org/icon.png | bin | 26829 -> 11304 bytes | |||
-rw-r--r-- | addons/repository.pvr-win32.xbmc.org/icon.png | bin | 26829 -> 11304 bytes | |||
-rw-r--r-- | addons/repository.xbmc.org/icon.png | bin | 26829 -> 10250 bytes | |||
-rw-r--r-- | addons/service.xbmc.versioncheck/icon.png | bin | 33618 -> 15866 bytes | |||
-rw-r--r-- | addons/skin.confluence/720p/Home.xml | 6 | ||||
-rw-r--r-- | addons/skin.confluence/media/kodi-logo.png | bin | 12154 -> 4499 bytes | |||
-rw-r--r-- | addons/visualization.vortex/resources/Presets/XBMCRain.vtx | 95 | ||||
-rw-r--r-- | addons/visualization.vortex/resources/Textures/splash_original.dds | bin | 34688 -> 0 bytes | |||
-rw-r--r-- | addons/visualization.vortex/resources/Textures/xbmc_icon.png | bin | 40059 -> 0 bytes |
12 files changed, 3 insertions, 98 deletions
diff --git a/addons/repository.pvr-android.xbmc.org/icon.png b/addons/repository.pvr-android.xbmc.org/icon.png Binary files differindex a7ad3ebb84..01149a50a8 100644 --- a/addons/repository.pvr-android.xbmc.org/icon.png +++ b/addons/repository.pvr-android.xbmc.org/icon.png diff --git a/addons/repository.pvr-ios.xbmc.org/icon.png b/addons/repository.pvr-ios.xbmc.org/icon.png Binary files differindex a7ad3ebb84..01149a50a8 100644 --- a/addons/repository.pvr-ios.xbmc.org/icon.png +++ b/addons/repository.pvr-ios.xbmc.org/icon.png diff --git a/addons/repository.pvr-osx32.xbmc.org/icon.png b/addons/repository.pvr-osx32.xbmc.org/icon.png Binary files differindex a7ad3ebb84..01149a50a8 100644 --- a/addons/repository.pvr-osx32.xbmc.org/icon.png +++ b/addons/repository.pvr-osx32.xbmc.org/icon.png diff --git a/addons/repository.pvr-osx64.xbmc.org/icon.png b/addons/repository.pvr-osx64.xbmc.org/icon.png Binary files differindex a7ad3ebb84..01149a50a8 100644 --- a/addons/repository.pvr-osx64.xbmc.org/icon.png +++ b/addons/repository.pvr-osx64.xbmc.org/icon.png diff --git a/addons/repository.pvr-win32.xbmc.org/icon.png b/addons/repository.pvr-win32.xbmc.org/icon.png Binary files differindex a7ad3ebb84..01149a50a8 100644 --- a/addons/repository.pvr-win32.xbmc.org/icon.png +++ b/addons/repository.pvr-win32.xbmc.org/icon.png diff --git a/addons/repository.xbmc.org/icon.png b/addons/repository.xbmc.org/icon.png Binary files differindex a7ad3ebb84..58a2772c26 100644 --- a/addons/repository.xbmc.org/icon.png +++ b/addons/repository.xbmc.org/icon.png diff --git a/addons/service.xbmc.versioncheck/icon.png b/addons/service.xbmc.versioncheck/icon.png Binary files differindex 8eb53e5994..02476a62b6 100644 --- a/addons/service.xbmc.versioncheck/icon.png +++ b/addons/service.xbmc.versioncheck/icon.png diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 93faff9319..3646412526 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -18,9 +18,9 @@ <control type="image"> <description>LOGO</description> <left>10</left> - <top>10</top> - <width>100</width> - <height>50</height> + <top>5</top> + <width>120</width> + <height>49</height> <aspectratio aligny="top" align="left">keep</aspectratio> <texture>kodi-logo.png</texture> <include>VisibleFadeEffect</include> diff --git a/addons/skin.confluence/media/kodi-logo.png b/addons/skin.confluence/media/kodi-logo.png Binary files differindex cd9906d02b..011bf1c6d8 100644 --- a/addons/skin.confluence/media/kodi-logo.png +++ b/addons/skin.confluence/media/kodi-logo.png diff --git a/addons/visualization.vortex/resources/Presets/XBMCRain.vtx b/addons/visualization.vortex/resources/Presets/XBMCRain.vtx deleted file mode 100644 index 224b4e1891..0000000000 --- a/addons/visualization.vortex/resources/Presets/XBMCRain.vtx +++ /dev/null @@ -1,95 +0,0 @@ -// Author - MrC -// Based on R4Rain.r4 by Gordon Williams - -int x,y, t; -float c,tm,tn,td, s; -float[] c_x(64),c_y(64),c_z(64),c_vz(64),c_rx(64),c_ry(64),c_sx(64),c_sy(64),c_sz(64); -float d; - -Texture texture; -Texture sky; - -void MakeNew(int n) -{ - c_x[n]=c_y[n]=0; - while (Mag(c_x[n],c_y[n])<1) - { - c_x[n] = (Rand()*6.0)-3.0; - c_y[n] = (Rand()*6.0)-3.0; - } - - c_z[n] = 10; - c_vz[n] = (1.0+Rand())*4; - c_rx[n] = (1.0+Rand())*80; - c_ry[n] = (1.0+Rand())*80; - c_sx[n] = (0.5+Rand())*0.5; - c_sy[n] = (0.5+Rand())*0.5; - c_sz[n] = (1.0+Rand())*0.05; -} - - -void Init() -{ - texture.LoadTexture("splash_original.dds"); - sky.LoadTexture("skybox.dds"); - - for (x=0;x<64;x=x+1) - { - MakeNew(x); - c_z[x] = Rand()*10; - } - tm = tn = 0; -} - -void mything(float x,float y,float z) -{ - gfxBegin(PRIM_QUADLIST); - for (t=0; t<1; t++) - { - s = z*((t/2.0f)-1.0); - gfxTexCoord(0,0); - gfxVertex(-x,y,s); - gfxTexCoord(1,0); - gfxVertex(x,y,s); - gfxTexCoord(1,1); - gfxVertex(x,-y,s); - gfxTexCoord(0,1); - gfxVertex(-x,-y,s); - - } - gfxEnd(); -} - -void Render() -{ - td = ((TREBLE+1.5f)*TIMEPASS); - tm = tm + td; - tn = tn + ((BASS+1.0)*TIMEPASS*2); - - gfxTranslate(Cos(tn * 1.23f) * 0.5f, Sin(tn) * 0.5f, 0.0f); - gfxRotate(Cos(tn*0.6734f)*20.0f, 1.0f, 0.0f, 0.0f); - gfxRotate(Sin(tn*0.2143f)*20.0f, 0.0f, 1.0f, 0.0f); - - gfxSetTexture(sky); - gfxCube(-100,-100,-100,100,100,100); - - gfxSetTexture(texture); - - gfxSetBlendMode(BLEND_ADD); - - for (x=0;x<64;x++) - { - c_z[x] = c_z[x] - (td*c_vz[x]); - if (c_z[x]<0) MakeNew(x); - - c = (10.0-c_z[x])*0.11; - gfxColour(c,c,c,1); - gfxPushMatrix(); - gfxTranslate(c_x[x],c_y[x],c_z[x]); - gfxRotate(c_rx[x]*tm,1.0f,0.0f,0.0f); - gfxRotate(c_ry[x]*tm,0.0f,1.0f,0.0f); - mything(c_sx[x],c_sy[x],c_sz[x]); - gfxPopMatrix(); - } - -}
\ No newline at end of file diff --git a/addons/visualization.vortex/resources/Textures/splash_original.dds b/addons/visualization.vortex/resources/Textures/splash_original.dds Binary files differdeleted file mode 100644 index bed53fafb9..0000000000 --- a/addons/visualization.vortex/resources/Textures/splash_original.dds +++ /dev/null diff --git a/addons/visualization.vortex/resources/Textures/xbmc_icon.png b/addons/visualization.vortex/resources/Textures/xbmc_icon.png Binary files differdeleted file mode 100644 index f011789ad4..0000000000 --- a/addons/visualization.vortex/resources/Textures/xbmc_icon.png +++ /dev/null |