Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 6, 2010, 9:35:26 PM (14 years ago)
Author:
rgrieder
Message:

Merged png2 branch back to trunk.

Location:
data/trunk
Files:
7 deleted
9 edited
7 copied

Legend:

Unmodified
Added
Removed

  • data/trunk

  • data/trunk/gui/imagesets/FairChar.imageset

    r5701 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="FairChar" Imagefile="FairChar.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
     2<Imageset Name="FairChar" Imagefile="FairChar.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
    33        <Image Name=" " XPos="0"   YPos="0"  Width="0"  Height="0" />
    44        <Image Name="A" XPos="4"   YPos="1"  Width="30" Height="30" YOffset="-30" />

  • data/trunk/gui/imagesets/PickupInventory.imageset

    r6979 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="PickupInventory" Imagefile="pickup.tga" NativeHorzRes="1600" NativeVertRes="100" AutoScaled="true">
     2<Imageset Name="PickupInventory" Imagefile="pickup.png" NativeHorzRes="1600" NativeVertRes="100" AutoScaled="true">
    33    <Image Name="Default" XPos="0" YPos="0" Width="100" Height="100"/>
    44

  • data/trunk/gui/imagesets/ReadMe.txt

    r5162 r7369  
    11The images in this directory were obtained from various sources...
    22
    3 GPN-2000-001437.tga             - From GRIN (http://grin.hq.nasa.gov/)
    4 TaharezLook.tga                 - Original Taharez imagery created by Lars "Taharez" Rinde.
    5 WindowsLook.tga                 - Windows look imagery created by Paul "CrazyEddie" Turner.
    6 vanilla.tga                             - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.
     3GPN-2000-001437.png             - From GRIN (http://grin.hq.nasa.gov/)
     4TaharezLook.png                 - Original Taharez imagery created by Lars "Taharez" Rinde.
     5WindowsLook.png                 - Windows look imagery created by Paul "CrazyEddie" Turner.
     6vanilla.png                             - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.

  • data/trunk/gui/imagesets/TaharezGreenLook.imageset

    r6573 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="TaharezGreenLook" Imagefile="TaharezGreenLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
     2<Imageset Name="TaharezGreenLook" Imagefile="TaharezGreenLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
    33    <Image Name="ClientBrush" XPos="2" YPos="2" Width="64" Height="64" />
    44    <Image Name="GenericBrush" XPos="9" YPos="71" Width="1" Height="1" />

  • data/trunk/gui/imagesets/TaharezLook.imageset

    r5701 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="TaharezLook" Imagefile="TaharezLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
     2<Imageset Name="TaharezLook" Imagefile="TaharezLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
    33    <Image Name="ClientBrush" XPos="2" YPos="2" Width="64" Height="64" />
    44    <Image Name="GenericBrush" XPos="9" YPos="71" Width="1" Height="1" />

  • data/trunk/gui/imagesets/Vanilla.imageset

    r5701 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="Vanilla-Images" Imagefile="vanilla.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
     2<Imageset Name="Vanilla-Images" Imagefile="vanilla.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
    33        <Image Name="GenericBrush" XPos="46" YPos="46" Width="3" Height="3" />
    44        <Image Name="FrameTopLeft" XPos="1" YPos="1" Width="6" Height="6" />

  • data/trunk/gui/imagesets/WindowsLook.imageset

    r5701 r7369  
    11<?xml version="1.0" ?>
    2 <Imageset Name="WindowsLook" Imagefile="WindowsLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
     2<Imageset Name="WindowsLook" Imagefile="WindowsLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
    33        <Image Name="Background" XPos="9" YPos="9" Width="2" Height="2" />
    44        <Image Name="WindowFrameLeft" XPos="2" YPos="9" Width="4" Height="2" />

  • data/trunk/gui/imagesets/main_menu_1.jpg

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.