Skip to content
This repository has been archived by the owner on Feb 4, 2018. It is now read-only.

Commit

Permalink
updated: Multiplex -> Multiplex Mk 2 (initial commit)
Browse files Browse the repository at this point in the history 
Feature-wise, the same as the original but with a consistent Aeon style and colour scheme. Old Multiplex isn't available with this update, though that may change. Watched/Unwatched overlays haven't been added yet, though they'll arrive soon. This is something of a rush release so expect a problem or two.
  • Loading branch information
@deadendthrills
deadendthrills committed May 31, 2009
1 parent 2cdcb52 commit 8963c8e
Show file tree
Hide file tree
Showing 44 changed files with 551 additions and 812 deletions.
2 changes: 1 addition & 1 deletion 720p/Customisation.xml
View file
Expand Up @@ -79,7 +79,7 @@
<label>UNLOCK ALL VIEWS FOR TV SHOWS</label>
<onclick>Skin.ToggleSetting(unlockTVviews)</onclick>
<selected>Skin.HasSetting(unlockTVviews)</selected>
</control>
</control>

</control>

Expand Down
12 changes: 6 additions & 6 deletions 720p/Font.xml
View file
Expand Up @@ -352,21 +352,21 @@

<font>
<name>Font_MultiplexPlot</name>
<filename>aeon_sublist_cy.ttf</filename>
<filename>aeon_player.ttf</filename>
<size>19</size>
<linespacing>1</linespacing>
<linespacing>1.28</linespacing>
</font>

<font>
<name>Font_MultiplexInfoLabel</name>
<filename>aeon_multiplex.ttf</filename>
<size>16</size>
<filename>aeon_rss.ttf</filename>
<size>15</size>
</font>

<font>
<name>Font_MultiplexInfoValue</name>
<filename>aeon_multiplex.ttf</filename>
<size>17</size>
<filename>aeon_rss.ttf</filename>
<size>16</size>
</font>

<!-- Fullscreen Info pages -->
Expand Down
20 changes: 18 additions & 2 deletions 720p/Includes_Animations.xml
View file
Expand Up @@ -206,8 +206,8 @@
</include>

<include name="Animation_BackgroundFade">
<animation effect="fade" time="500" condition="!Window.Previous(4)">WindowOpen</animation>
<animation effect="fade" time="200" condition="!Window.Next(4)">WindowClose</animation>
<animation effect="fade" time="500" condition="![Window.Previous(4) + Container(300).HasFocus(9)]">WindowOpen</animation>
<animation effect="fade" time="200" condition="![Window.Next(4) + Container(300).HasFocus(9)]">WindowClose</animation>
<animation effect="fade" time="800">Visible</animation>
<animation effect="fade" delay = "300" time="800" condition="![Window.IsActive(2001) | Window.IsActive(2003)]">Hidden</animation>
</include>
Expand Down Expand Up @@ -271,5 +271,21 @@
<animation effect="fade" time="200">Visible</animation>
<animation effect="fade" time="200">Hidden</animation>
</include>

<include name="Animation_MultiplexFocusZoom">
<animation effect="zoom" center="56,80" start="100" end="110" time="200" tween="cubic" easing="inout">Focus</animation>
<animation effect="zoom" center="56,80" start="110" end="100" time="200" tween="cubic" easing="inout">Unfocus</animation>
</include>

<include name="Animation_MultiplexTVFocusZoom">
<animation effect="zoom" center="106,50" start="100" end="110" time="200" tween="cubic" easing="inout">Focus</animation>
</include>

<include name="Animation_MultiplexTVFocusZoomLabel">
<animation type="Focus">
<effect type="zoom" center="106,50" start="100" end="110" time="200" tween="cubic" easing="inout" />
<effect type="fade" start="100" end="0" time="100" />
</animation>
</include>

</includes>
42 changes: 40 additions & 2 deletions 720p/Includes_Furniture.xml
View file
Expand Up @@ -685,6 +685,43 @@
<visible>Control.IsVisible(57)</visible>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
<include>Animation_HideMultiplex</include>
</control>

<control type="image">
<posx>0</posx>
<posy>315</posy>
<width>1280</width>
<height>405</height>
<texture>showcase/lite/showcase_floor.png</texture>
<visible>Control.IsVisible(52)</visible>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
<include>Animation_HideMultiplex</include>
</control>

<control type="image">
<posx>144</posx>
<posy>583</posy>
<width>993</width>
<height>137</height>
<include condition="!Skin.HasSetting(darkshowcase)">ShowcaseSpotLight</include>
<include condition="Skin.HasSetting(darkshowcase)">ShowcaseSpotNight</include>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
<include>Animation_HideMultiplex</include>
<visible>Control.IsVisible(57) | Control.IsVisible(52)</visible>
</control>

<control type="image">
<posx>144</posx>
<posy>583</posy>
<width>993</width>
<height>137</height>
<include>ShowcaseSpotLight</include>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
<visible>Control.IsVisible(50)</visible>
</control>

<control type="image">
Expand All @@ -697,6 +734,7 @@
<colordiffuse>c7FFFFFF</colordiffuse>
<include>Animation_CommonFade</include>
<include>Animation_HideShowcase</include>
<include>Animation_HideMultiplex</include>
</control>

<control type="image">
Expand All @@ -705,7 +743,7 @@
<width>464</width>
<height>720</height>
<texture>showcase/showcase_vignette.png</texture>
<visible>[Control.IsVisible(57) | Control.IsVisible(50)] + ![Control.HasFocus(94) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<visible>[Control.IsVisible(57) | Control.IsVisible(50) | Control.IsVisible(52)] + ![Control.HasFocus(94) | Control.HasFocus(197) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<animation type="Visible">
<effect type="fade" start="0" end="100" time="400" easing="inout" tween="cubic" />
<effect type="slide" start="-464,0" end="0,0" time="400" easing="inout" tween="cubic" />
Expand All @@ -730,7 +768,7 @@
<width>464</width>
<height>720</height>
<texture flipx="true">showcase/showcase_vignette.png</texture>
<visible>[Control.IsVisible(57) | Control.IsVisible(50)] + ![Control.HasFocus(94) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<visible>[Control.IsVisible(57) | Control.IsVisible(50) | Control.IsVisible(52)] + ![Control.HasFocus(94) | Control.HasFocus(197) | Control.HasFocus(320) | Control.HasFocus(321) | Control.HasFocus(322)]</visible>
<animation type="Visible">
<effect type="fade" start="0" end="100" time="400" easing="inout" tween="cubic" />
<effect type="slide" start="464,0" end="0,0" time="400" easing="inout" tween="cubic" />
Expand Down

0 comments on commit 8963c8e

Please sign in to comment.