[Orxonox-commit 2769] r7473 - in data/branches/cleanup: . gui/imagesets images images/gui
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Sep 21 21:50:41 CEST 2010
Author: rgrieder
Date: 2010-09-21 21:50:41 +0200 (Tue, 21 Sep 2010)
New Revision: 7473
Added:
data/branches/cleanup/images/FairChar.png
data/branches/cleanup/images/GPN-2000-001437.png
data/branches/cleanup/images/gui/
data/branches/cleanup/images/gui/DriveIcons.png
data/branches/cleanup/images/gui/ReadMe.txt
data/branches/cleanup/images/gui/SleekSpace.png
data/branches/cleanup/images/gui/TaharezGreenLook.png
data/branches/cleanup/images/gui/TaharezLook.png
data/branches/cleanup/images/gui/WindowsLook.png
data/branches/cleanup/images/gui/pickup.png
data/branches/cleanup/images/gui/vanilla.png
data/branches/cleanup/images/main_menu_1.jpg
Removed:
data/branches/cleanup/gui/imagesets/DriveIcons.png
data/branches/cleanup/gui/imagesets/FairChar.png
data/branches/cleanup/gui/imagesets/GPN-2000-001437.png
data/branches/cleanup/gui/imagesets/ReadMe.txt
data/branches/cleanup/gui/imagesets/SleekSpace.png
data/branches/cleanup/gui/imagesets/TaharezGreenLook.png
data/branches/cleanup/gui/imagesets/TaharezLook.png
data/branches/cleanup/gui/imagesets/WindowsLook.png
data/branches/cleanup/gui/imagesets/main_menu_1.jpg
data/branches/cleanup/gui/imagesets/pickup.png
data/branches/cleanup/gui/imagesets/vanilla.png
Modified:
data/branches/cleanup/resources.oxr
Log:
Moved images in gui/imagesets and adjusted resources.oxr
Deleted: data/branches/cleanup/gui/imagesets/DriveIcons.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/FairChar.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/GPN-2000-001437.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/ReadMe.txt
===================================================================
--- data/branches/cleanup/gui/imagesets/ReadMe.txt 2010-09-21 16:46:19 UTC (rev 7472)
+++ data/branches/cleanup/gui/imagesets/ReadMe.txt 2010-09-21 19:50:41 UTC (rev 7473)
@@ -1,6 +0,0 @@
-The images in this directory were obtained from various sources...
-
-GPN-2000-001437.png - From GRIN (http://grin.hq.nasa.gov/)
-TaharezLook.png - Original Taharez imagery created by Lars "Taharez" Rinde.
-WindowsLook.png - Windows look imagery created by Paul "CrazyEddie" Turner.
-vanilla.png - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.
Deleted: data/branches/cleanup/gui/imagesets/SleekSpace.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/TaharezGreenLook.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/TaharezLook.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/WindowsLook.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/main_menu_1.jpg
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/pickup.png
===================================================================
(Binary files differ)
Deleted: data/branches/cleanup/gui/imagesets/vanilla.png
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/FairChar.png (from rev 7472, data/branches/cleanup/gui/imagesets/FairChar.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/GPN-2000-001437.png (from rev 7472, data/branches/cleanup/gui/imagesets/GPN-2000-001437.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/DriveIcons.png (from rev 7472, data/branches/cleanup/gui/imagesets/DriveIcons.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/ReadMe.txt (from rev 7472, data/branches/cleanup/gui/imagesets/ReadMe.txt)
===================================================================
--- data/branches/cleanup/images/gui/ReadMe.txt (rev 0)
+++ data/branches/cleanup/images/gui/ReadMe.txt 2010-09-21 19:50:41 UTC (rev 7473)
@@ -0,0 +1,6 @@
+The images in this directory were obtained from various sources...
+
+GPN-2000-001437.png - From GRIN (http://grin.hq.nasa.gov/)
+TaharezLook.png - Original Taharez imagery created by Lars "Taharez" Rinde.
+WindowsLook.png - Windows look imagery created by Paul "CrazyEddie" Turner.
+vanilla.png - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.
Copied: data/branches/cleanup/images/gui/SleekSpace.png (from rev 7472, data/branches/cleanup/gui/imagesets/SleekSpace.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/TaharezGreenLook.png (from rev 7472, data/branches/cleanup/gui/imagesets/TaharezGreenLook.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/TaharezLook.png (from rev 7472, data/branches/cleanup/gui/imagesets/TaharezLook.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/WindowsLook.png (from rev 7472, data/branches/cleanup/gui/imagesets/WindowsLook.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/pickup.png (from rev 7472, data/branches/cleanup/gui/imagesets/pickup.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/gui/vanilla.png (from rev 7472, data/branches/cleanup/gui/imagesets/vanilla.png)
===================================================================
(Binary files differ)
Copied: data/branches/cleanup/images/main_menu_1.jpg (from rev 7472, data/branches/cleanup/gui/imagesets/main_menu_1.jpg)
===================================================================
(Binary files differ)
Modified: data/branches/cleanup/resources.oxr
===================================================================
--- data/branches/cleanup/resources.oxr 2010-09-21 16:46:19 UTC (rev 7472)
+++ data/branches/cleanup/resources.oxr 2010-09-21 19:50:41 UTC (rev 7473)
@@ -1,19 +1,22 @@
<ResourceCollection resourceGroup = "General" >
- <ResourceLocation path = "audio" />
- <ResourceLocation path = "fonts" />
- <ResourceLocation path = "gui/fonts" />
- <ResourceLocation path = "images/overlay" />
- <ResourceLocation path = "images/skyboxes" />
- <ResourceLocation path = "images/textures" />
- <ResourceLocation path = "materials" />
- <ResourceLocation path = "models" />
- <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
- <ResourceLocation path = "packs/skybox.zip" archiveType = "Zip" />
- <ResourceLocation path = "programs" />
-</ResourceCollection>
+ <ResourceLocation path = "audio" />
+ <ResourceLocation path = "fonts" />
+ <ResourceLocation path = "images" />
+ <ResourceLocation path = "images/bumpmaps" />
+ <ResourceLocation path = "images/decals" />
+ <ResourceLocation path = "images/effects" />
+ <ResourceLocation path = "images/gui" />
+ <ResourceLocation path = "images/overlay" />
+ <ResourceLocation path = "images/skyboxes" />
+ <ResourceLocation path = "images/textures" />
+ <ResourceLocation path = "images/textures/seamless"/>
+ <ResourceLocation path = "materials" />
+ <ResourceLocation path = "models" />
+ <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip"/>
+ <ResourceLocation path = "packs/skybox.zip" archiveType = "Zip"/>
+ <ResourceLocation path = "programs" />
-<ResourceCollection resourceGroup = "GUI" >
- <ResourceLocation path = "gui/fonts" />
- <ResourceLocation path = "gui/imagesets" />
- <ResourceLocation path = "gui/looknfeel" />
+ <ResourceLocation path = "gui/fonts" />
+ <ResourceLocation path = "gui/imagesets" />
+ <ResourceLocation path = "gui/looknfeel" />
</ResourceCollection>
More information about the Orxonox-commit
mailing list