You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ult...@us...> - 2007-06-27 03:26:12
|
Revision: 601 http://svn.sourceforge.net/opengate/?rev=601&view=rev Author: ultrasick Date: 2007-06-26 20:26:07 -0700 (Tue, 26 Jun 2007) Log Message: ----------- ups, forgot the new image *g* Modified Paths: -------------- trunk/data/ships/tauseti/lady_kickstart/21_+_22.png trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend Modified: trunk/data/ships/tauseti/lady_kickstart/21_+_22.png =================================================================== (Binary files differ) Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-27 03:21:30
|
Revision: 600 http://svn.sourceforge.net/opengate/?rev=600&view=rev Author: ultrasick Date: 2007-06-26 20:19:23 -0700 (Tue, 26 Jun 2007) Log Message: ----------- added gun points in the texture Modified Paths: -------------- trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend trunk/templates/data/ships/tauseti/lady_kickstart/parts/21_+_22.pspimage trunk/templates/data/ships/tauseti/lady_kickstart/viewable_area.7z Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend =================================================================== (Binary files differ) Modified: trunk/templates/data/ships/tauseti/lady_kickstart/parts/21_+_22.pspimage =================================================================== (Binary files differ) Modified: trunk/templates/data/ships/tauseti/lady_kickstart/viewable_area.7z =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-27 03:00:27
|
Revision: 599 http://svn.sourceforge.net/opengate/?rev=599&view=rev Author: ultrasick Date: 2007-06-26 20:00:25 -0700 (Tue, 26 Jun 2007) Log Message: ----------- adding length, width, and height carsten can you use these values to scale the ship in game? If we would scale it in blender we would run into the problem that I loose all my absolute coordinates for the texturing. Modified Paths: -------------- trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-27 02:26:33
|
Revision: 598 http://svn.sourceforge.net/opengate/?rev=598&view=rev Author: ultrasick Date: 2007-06-26 19:26:32 -0700 (Tue, 26 Jun 2007) Log Message: ----------- added gun points (as new objects on the second layer named "GunPointLeft" and "GunPointRight") Modified Paths: -------------- trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-25 20:02:04
|
Revision: 597 http://svn.sourceforge.net/opengate/?rev=597&view=rev Author: ultrasick Date: 2007-06-25 13:02:02 -0700 (Mon, 25 Jun 2007) Log Message: ----------- uploading unfinished beacon/Leitstrahl Added Paths: ----------- trunk/data/misc/beacon.blend Added: trunk/data/misc/beacon.blend =================================================================== (Binary files differ) Property changes on: trunk/data/misc/beacon.blend ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-24 04:00:32
|
Revision: 596 http://svn.sourceforge.net/opengate/?rev=596&view=rev Author: ultrasick Date: 2007-06-23 21:00:29 -0700 (Sat, 23 Jun 2007) Log Message: ----------- uploading commodity: zinc Added Paths: ----------- trunk/data/commodities/zinc.blend trunk/data/commodities/zinc.xml trunk/data/commodities/zinc_290x290.png trunk/data/commodities/zinc_76x76.png Added: trunk/data/commodities/zinc.blend =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/zinc.blend ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/zinc.xml =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/zinc.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:eol-style + native Added: trunk/data/commodities/zinc_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/zinc_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/zinc_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/zinc_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 22:25:12
|
Revision: 595 http://svn.sourceforge.net/opengate/?rev=595&view=rev Author: ultrasick Date: 2007-06-23 15:25:14 -0700 (Sat, 23 Jun 2007) Log Message: ----------- making the xml file opengate compatible is the flux activity information correct?? Modified Paths: -------------- trunk/data/misc/jgdata.xml Modified: trunk/data/misc/jgdata.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 21:00:35
|
Revision: 594 http://svn.sourceforge.net/opengate/?rev=594&view=rev Author: ultrasick Date: 2007-06-23 14:00:18 -0700 (Sat, 23 Jun 2007) Log Message: ----------- uploading commodity: uranium old image format (also of the plutonium commodity till a bug in blender is fixed) Added Paths: ----------- trunk/data/commodities/uranium.blend trunk/data/commodities/uranium.png trunk/data/commodities/uranium.xml Added: trunk/data/commodities/uranium.blend =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/uranium.blend ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/uranium.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/uranium.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/uranium.xml =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/uranium.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 17:21:13
|
Revision: 593 http://svn.sourceforge.net/opengate/?rev=593&view=rev Author: ultrasick Date: 2007-06-23 10:21:13 -0700 (Sat, 23 Jun 2007) Log Message: ----------- deleting file with old image format + uploading new image format + camera adjustments Modified Paths: -------------- trunk/data/commodities/xenon.blend Added Paths: ----------- trunk/data/commodities/xenon_290x290.png trunk/data/commodities/xenon_76x76.png Removed Paths: ------------- trunk/data/commodities/xenon.png Modified: trunk/data/commodities/xenon.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/xenon.png =================================================================== (Binary files differ) Added: trunk/data/commodities/xenon_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/xenon_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/xenon_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/xenon_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 16:53:54
|
Revision: 592 http://svn.sourceforge.net/opengate/?rev=592&view=rev Author: ultrasick Date: 2007-06-23 09:53:51 -0700 (Sat, 23 Jun 2007) Log Message: ----------- deleting files with old image format + uploading new image format + camera adjustments + activated file compression + slight material changes Modified Paths: -------------- trunk/data/commodities/rubber.blend Added Paths: ----------- trunk/data/commodities/rubber_290x290.png trunk/data/commodities/rubber_76x76.png Removed Paths: ------------- trunk/data/commodities/rubber.png Modified: trunk/data/commodities/rubber.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/rubber.png =================================================================== (Binary files differ) Added: trunk/data/commodities/rubber_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/rubber_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/rubber_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/rubber_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 16:32:28
|
Revision: 591 http://svn.sourceforge.net/opengate/?rev=591&view=rev Author: ultrasick Date: 2007-06-23 09:32:30 -0700 (Sat, 23 Jun 2007) Log Message: ----------- deleting files with old image format + uploading new image format + camera adjustments Modified Paths: -------------- trunk/data/commodities/chromium.blend Added Paths: ----------- trunk/data/commodities/chromium_290x290.png trunk/data/commodities/chromium_76x76.png Removed Paths: ------------- trunk/data/commodities/chromium.png Modified: trunk/data/commodities/chromium.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/chromium.png =================================================================== (Binary files differ) Added: trunk/data/commodities/chromium_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/chromium_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/chromium_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/chromium_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 05:19:49
|
Revision: 590 http://svn.sourceforge.net/opengate/?rev=590&view=rev Author: ultrasick Date: 2007-06-22 22:19:46 -0700 (Fri, 22 Jun 2007) Log Message: ----------- renaming commodity "CPU" to "CPUs" Added Paths: ----------- trunk/data/commodities/cpus.blend trunk/data/commodities/cpus.xml trunk/data/commodities/cpus_290x290.png trunk/data/commodities/cpus_76x76.png Removed Paths: ------------- trunk/data/commodities/cpu.blend trunk/data/commodities/cpu.xml trunk/data/commodities/cpu_290x290.png trunk/data/commodities/cpu_76x76.png Deleted: trunk/data/commodities/cpu.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/cpu.xml =================================================================== (Binary files differ) Deleted: trunk/data/commodities/cpu_290x290.png =================================================================== (Binary files differ) Deleted: trunk/data/commodities/cpu_76x76.png =================================================================== (Binary files differ) Added: trunk/data/commodities/cpus.blend =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpus.blend ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/cpus.xml =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpus.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:eol-style + native Added: trunk/data/commodities/cpus_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpus_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/cpus_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpus_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 05:16:08
|
Revision: 589 http://svn.sourceforge.net/opengate/?rev=589&view=rev Author: ultrasick Date: 2007-06-22 22:16:11 -0700 (Fri, 22 Jun 2007) Log Message: ----------- renaming a material for easier use in other blender files Modified Paths: -------------- trunk/data/commodities/cesium.blend Modified: trunk/data/commodities/cesium.blend =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 05:10:14
|
Revision: 588 http://svn.sourceforge.net/opengate/?rev=588&view=rev Author: ultrasick Date: 2007-06-22 22:10:14 -0700 (Fri, 22 Jun 2007) Log Message: ----------- giving the asteroids correct names. otherwise I had problems identifing the astros Modified Paths: -------------- trunk/data/misc/testsector.xml Modified: trunk/data/misc/testsector.xml =================================================================== --- trunk/data/misc/testsector.xml 2007-06-23 05:09:13 UTC (rev 587) +++ trunk/data/misc/testsector.xml 2007-06-23 05:10:14 UTC (rev 588) @@ -11,7 +11,7 @@ <!-- Mandatory --> <!-- <name>object-name</name> --> <!-- <mesh>object-ogre-mesh</mesh> --> -<!-- <position>Position of tis object</position> --> +<!-- <position>position of this object</position> --> <!-- Optional --> <!-- <size>desired size of this object</size> --> <!-- <scale>scaling factor for the ogre mesh</size> --> @@ -39,70 +39,70 @@ <direction>1,0,0</direction> </sectorobject> <sectorobject> - <name>astro1</name> + <name>astro6</name> <mesh>ice_oval_6</mesh> <position>0.0, -10, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro2</name> + <name>astro7</name> <mesh>ice_oval_7</mesh> <position>10.0, 0, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro3</name> + <name>astro8</name> <mesh>ice_oval_8</mesh> <position>20.0, 0, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro4</name> + <name>astro9</name> <mesh>ice_oval_9</mesh> <position>30.0, 0, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro5</name> + <name>astro10</name> <mesh>ice_oval_10</mesh> <position>40.0, 0, 0.0</position> <scale>1, 1, 1</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro6</name> + <name>astro1</name> <mesh>normal_oval_1</mesh> <position>0.0, 10, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro7</name> + <name>astro2</name> <mesh>normal_oval_2</mesh> <position>10.0, 10, 0.0</position> <scale>4, 4, 4</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro8</name> + <name>astro3</name> <mesh>normal_oval_3</mesh> <position>20.0, 10, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro9</name> + <name>astro4</name> <mesh>normal_oval_4</mesh> <position>30.0, 10, 0.0</position> <scale>3, 3, 3</scale> <direction>0,0,1</direction> </sectorobject> <sectorobject> - <name>astro10</name> + <name>astro5</name> <mesh>normal_oval_5</mesh> <position>40.0, 10, 0.0</position> <scale>1, 1, 1</scale> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-23 05:09:11
|
Revision: 587 http://svn.sourceforge.net/opengate/?rev=587&view=rev Author: ultrasick Date: 2007-06-22 22:09:13 -0700 (Fri, 22 Jun 2007) Log Message: ----------- deleting files with old image format + uploading new image format + replacing the colorful shape with a more realistic cesium object (generally I agree with sticking to the original but sometimes I prefer something more eye catchy) + renaming name_de from "Caesium" to "C?\195?\164sium". Both names a correct but in my oppinion "C?\195?\164sium" should be used instead Modified Paths: -------------- trunk/data/commodities/cesium.blend trunk/data/commodities/cesium.xml Added Paths: ----------- trunk/data/commodities/cesium_290x290.png trunk/data/commodities/cesium_76x76.png Removed Paths: ------------- trunk/data/commodities/cesium.png Modified: trunk/data/commodities/cesium.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/cesium.png =================================================================== (Binary files differ) Modified: trunk/data/commodities/cesium.xml =================================================================== (Binary files differ) Added: trunk/data/commodities/cesium_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cesium_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/cesium_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cesium_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-21 04:23:13
|
Revision: 586 http://svn.sourceforge.net/opengate/?rev=586&view=rev Author: ultrasick Date: 2007-06-20 21:23:13 -0700 (Wed, 20 Jun 2007) Log Message: ----------- deleting files with old image format + uploading new image format + camera adjustments Modified Paths: -------------- trunk/data/commodities/water.blend Added Paths: ----------- trunk/data/commodities/water_290x290.png trunk/data/commodities/water_76x76.png Removed Paths: ------------- trunk/data/commodities/water.png Modified: trunk/data/commodities/water.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/water.png =================================================================== (Binary files differ) Added: trunk/data/commodities/water_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/water_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/water_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/water_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-21 04:08:57
|
Revision: 585 http://svn.sourceforge.net/opengate/?rev=585&view=rev Author: ultrasick Date: 2007-06-20 21:08:59 -0700 (Wed, 20 Jun 2007) Log Message: ----------- deleteing files with old image format + uploading new image format + camera adjustments + activated file compression + gave the antimony object a new material Modified Paths: -------------- trunk/data/commodities/antimony.blend trunk/data/commodities/laser_components.blend Added Paths: ----------- trunk/data/commodities/antimony_290x290.png trunk/data/commodities/antimony_76x76.png trunk/data/commodities/laser_components_290x290.png trunk/data/commodities/laser_components_76x76.png Removed Paths: ------------- trunk/data/commodities/antimony.png trunk/data/commodities/laser_components.png Modified: trunk/data/commodities/antimony.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/antimony.png =================================================================== (Binary files differ) Added: trunk/data/commodities/antimony_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/antimony_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/antimony_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/antimony_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/data/commodities/laser_components.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/laser_components.png =================================================================== (Binary files differ) Added: trunk/data/commodities/laser_components_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/laser_components_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/laser_components_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/laser_components_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-20 03:53:33
|
Revision: 584 http://svn.sourceforge.net/opengate/?rev=584&view=rev Author: ultrasick Date: 2007-06-19 20:53:34 -0700 (Tue, 19 Jun 2007) Log Message: ----------- deleteing files with old image format + uploading new image format + camera adjustments Modified Paths: -------------- trunk/data/commodities/aluminium.blend Added Paths: ----------- trunk/data/commodities/aluminium_290x290.png trunk/data/commodities/aluminium_76x76.png Removed Paths: ------------- trunk/data/commodities/aluminium.png Modified: trunk/data/commodities/aluminium.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/aluminium.png =================================================================== (Binary files differ) Added: trunk/data/commodities/aluminium_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/aluminium_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/aluminium_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/aluminium_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spo...@us...> - 2007-06-19 22:30:48
|
Revision: 583 http://svn.sourceforge.net/opengate/?rev=583&view=rev Author: spom_spom Date: 2007-06-19 15:30:49 -0700 (Tue, 19 Jun 2007) Log Message: ----------- win compatibility commit Modified Paths: -------------- branches/ogsector/src/common.h branches/ogsector/src/opengateclient.cpp branches/ogsector/win32/ogsectorclient/ogsectorclient.exe branches/ogsector/win32/ogsectorclient/resources.cfg Modified: branches/ogsector/src/common.h =================================================================== --- branches/ogsector/src/common.h 2007-06-19 21:59:30 UTC (rev 582) +++ branches/ogsector/src/common.h 2007-06-19 22:30:49 UTC (rev 583) @@ -52,19 +52,22 @@ typedef unsigned char Uint8; typedef unsigned short Uint16; typedef int Uint32; + #ifdef WIN32 -#define PATHSEPARATOR "\\" +#define PATHSEPARATOR "\\" +typedef unsigned int uint; + #include <windows.h> #else #define PATHSEPARATOR "/" #endif #define MAXUSERID 1000000 -#define BIND_CEGUI_EVENT(window, event, method) window->subscribeEvent(event, CEGUI::Event::Subscriber(&method, this)); +#define BIND_CEGUI_EVENT(window, event, method) window->subscribeEvent(event, CEGUI::Event::Subscriber(&method, this)); -// template< typename T > struct CMD_Ptr { -// typedef void (T::*Type)( const std::vector< std::string > &); +// template< typename T > struct CMD_Ptr { +// typedef void (T::*Type)( const std::vector< std::string > &); // }; long createGlobalID( int userId, int childId ); Modified: branches/ogsector/src/opengateclient.cpp =================================================================== --- branches/ogsector/src/opengateclient.cpp 2007-06-19 21:59:30 UTC (rev 582) +++ branches/ogsector/src/opengateclient.cpp 2007-06-19 22:30:49 UTC (rev 583) @@ -83,9 +83,9 @@ try { OpenGate::GameStateManager gameStateMgr( nw, dialog ); -// OpenGate::DockedState::create( &gameStateMgr, "DockedState" ); + OpenGate::DockedState::create( &gameStateMgr, "DockedState" ); OpenGate::UnDockedState::create( &gameStateMgr, "UnDockedState" ); - gameStateMgr.start( gameStateMgr.findByName( "UnDockedState" ) ); + gameStateMgr.start( gameStateMgr.findByName( "DockedState" ) ); } catch( Ogre::Exception& e ) { #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe =================================================================== (Binary files differ) Modified: branches/ogsector/win32/ogsectorclient/resources.cfg =================================================================== --- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-19 21:59:30 UTC (rev 582) +++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-19 22:30:49 UTC (rev 583) @@ -17,6 +17,8 @@ Zip=../../data/fonts.zip FileSystem=../../../../trunk/data/ +FileSystem=../../../../trunk/data/misc +FileSystem=../../../../trunk/data/misc/asteroids FileSystem=../../../../trunk/data/commodities FileSystem=../../../../trunk/data/ships/octavius/apteryx FileSystem=../../../../trunk/data/ships/quantar/storm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spo...@us...> - 2007-06-19 21:59:33
|
Revision: 582 http://svn.sourceforge.net/opengate/?rev=582&view=rev Author: spom_spom Date: 2007-06-19 14:59:30 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Add: basic xml support for sector content, see: misc/testsector.xml. Add: very simple credits field in config dialog Modified Paths: -------------- branches/ogsector/data/gui/layouts/dialogs/ConfigDialog.layout branches/ogsector/resources.cfg branches/ogsector/src/ConfigDialog.cpp branches/ogsector/src/ConfigDialog.h branches/ogsector/src/DeviceManager.cpp branches/ogsector/src/DeviceManager.h branches/ogsector/src/GameStateManager.cpp branches/ogsector/src/GameStateManager.h branches/ogsector/src/Sector.cpp branches/ogsector/src/Sector.h branches/ogsector/src/SectorObjects.cpp branches/ogsector/src/SectorObjects.h branches/ogsector/src/common.cpp branches/ogsector/src/common.h branches/ogsector/src/opengateclient.cpp trunk/current/src/Client.cpp trunk/current/src/client/GameStateManager.cpp trunk/current/src/client/Global.h trunk/current/src/client/GraphicsSetup.cpp trunk/current/src/client/InputManager.cpp trunk/current/src/client/OpenGateApp.cpp trunk/data/engines/money.xml trunk/data/engines/t-e-15.xml trunk/data/misc/credits.txt Added Paths: ----------- trunk/data/misc/testsector.xml Removed Paths: ------------- branches/ogsector/data/ships/ Modified: branches/ogsector/data/gui/layouts/dialogs/ConfigDialog.layout =================================================================== --- branches/ogsector/data/gui/layouts/dialogs/ConfigDialog.layout 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/data/gui/layouts/dialogs/ConfigDialog.layout 2007-06-19 21:59:30 UTC (rev 582) @@ -21,51 +21,61 @@ <Property Name="Text" Value="Connect" /> <Property Name="Disabled" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,10},{0,90},{0,58}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,10},{0,80},{0,40}}" /> </Window> <Window Type="opengate/Button" Name="Config/GraphicButton" > <Property Name="Font" Value="BlueHighway-12" /> <Property Name="Text" Value="Graphic" /> <Property Name="Disabled" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,60},{0,90},{0,108}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,60},{0,80},{0,90}}" /> </Window> <Window Type="opengate/Button" Name="Config/SoundButton" > <Property Name="Text" Value="Sound" /> <Property Name="Disabled" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,110},{0,90},{0,158}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,110},{0,80},{0,140}}" /> </Window> <Window Type="opengate/Button" Name="Config/ControlsButton" > <Property Name="Font" Value="BlueHighway-12" /> <Property Name="Text" Value="Controls" /> <Property Name="Disabled" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,160},{0,90},{0,208}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,160},{0,80},{0,190}}" /> </Window> <Window Type="opengate/Button" Name="Config/CreditsButton" > <Property Name="Font" Value="BlueHighway-12" /> <Property Name="Text" Value="Credits" /> - <Property Name="Disabled" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,210},{0,90},{0,258}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,210},{0,80},{0,240}}" /> </Window> <Window Type="opengate/Button" Name="Config/QuitButton" > <Property Name="Font" Value="BlueHighway-12" /> - <Property Name="Text" Value="Quit Opengate" /> + <Property Name="Text" Value="Quit" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{0,260},{0,90},{0,308}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{0,260},{0,80},{0,290}}" /> </Window> <Window Type="opengate/Button" Name="Config/BackButton" > <Property Name="Text" Value="Back" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,10},{1,-38},{0,90},{1,-14}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,10},{1,-40},{0,80},{1,-10}}" /> </Window> <Window Type="opengate/StaticImage" Name="Config/SubFrame" > <Property Name="Font" Value="BlueHighway-12" /> + <Property Name="FrameEnabled" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> - <Property Name="UnifiedAreaRect" Value="{{0,100},{0,10},{1,-10},{1,-10}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,90},{0,10},{1,-10},{1,-10}}" /> <Property Name="BackgroundEnabled" Value="False" /> + <Window Type="opengate/StaticLabel" Name="Config/SubFrame/Title" > + <Property Name="Font" Value="BlueHighway-18" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{0,30}}" /> + </Window> + <Window Type="opengate/ConsoleListbox" Name="Config/SubFrame/CreditsText" > + <Property Name="Font" Value="BlueHighway-12" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,0},{0,30},{1,0},{1,0}}" /> + </Window> </Window> </Window> </Window> Modified: branches/ogsector/resources.cfg =================================================================== --- branches/ogsector/resources.cfg 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/resources.cfg 2007-06-19 21:59:30 UTC (rev 582) @@ -16,6 +16,7 @@ FileSystem=../../trunk/data/ships/quantar/storm FileSystem=../../trunk/data/ships/tauseti/lady_kickstart FileSystem=../../trunk/data/stations/tauseti +FileSystem=../../trunk/data/misc/asteroids FileSystem=./data FileSystem=./data/materials Modified: branches/ogsector/src/ConfigDialog.cpp =================================================================== --- branches/ogsector/src/ConfigDialog.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/ConfigDialog.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -22,12 +22,24 @@ #include "common.h" #include "GameStateManager.h" #include <CEGUI/elements/CEGUIPushButton.h> +#include <CEGUI/elements/CEGUIListbox.h> +#include <CEGUI/elements/CEGUIListboxTextItem.h> +#include <OgreArchiveManager.h> +#include <OgreFileSystem.h> + +#include <fstream> + namespace OpenGate{ ConfigDialog::ConfigDialog( ) : BaseDialog( "dialogs/ConfigDialog.layout" ){ setupEventHandlers(); + + creditsListBox_ = static_cast<CEGUI::Listbox*> (CEGUI::WindowManager::getSingleton().getWindow( "Config/SubFrame/CreditsText" ) ); + + fillCreditsWindow(); + creditsListBox_->hide(); } ConfigDialog::~ConfigDialog(){ @@ -38,6 +50,8 @@ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"Config/QuitButton" ), CEGUI::PushButton::EventClicked, ConfigDialog::handleQuitButton ); + BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"Config/CreditsButton" ), + CEGUI::PushButton::EventClicked, ConfigDialog::handleCreditsButton ); } bool ConfigDialog::handleQuitButton( const CEGUI::EventArgs & e ){ @@ -45,4 +59,34 @@ return true; } +void ConfigDialog::fillCreditsWindow( ){ + std::string fileName = devices_->findFullFileName( "credits.txt" ); + + std::fstream file; file.open( fileName.c_str() ); + + std::vector < std::string > row; + while( !file.eof() ){ + row = getRowSubstrings( file ); + + CEGUI::String str; + for ( uint i = 0; i < row.size(); i ++ ){ + str += row[ i ] + " "; + } + CEGUI::ListboxTextItem * item = new CEGUI::ListboxTextItem( str ); + creditsListBox_->addItem ( item ); + } + creditsListBox_->ensureItemIsVisible( creditsListBox_->getItemCount() ); + file.close(); + + +} + +bool ConfigDialog::handleCreditsButton( const CEGUI::EventArgs & e ){ + CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/SubFrame/Title" ) + ->setProperty("Text", "Credits" ); + creditsListBox_->show(); + + return true; +} + } // namespace OpenGate Modified: branches/ogsector/src/ConfigDialog.h =================================================================== --- branches/ogsector/src/ConfigDialog.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/ConfigDialog.h 2007-06-19 21:59:30 UTC (rev 582) @@ -23,6 +23,10 @@ #include "BaseDialog.h" +namespace CEGUI{ + class Listbox; +} + namespace OpenGate{ class ConfigDialog : public BaseDialog{ @@ -34,9 +38,14 @@ virtual void setupEventHandlers(); protected: + void fillCreditsWindow(); + bool handleQuitButton( const CEGUI::EventArgs & e ); bool handleBackButton( const CEGUI::EventArgs & e ); + bool handleCreditsButton( const CEGUI::EventArgs & e ); + CEGUI::Listbox * creditsListBox_; + }; } //namespace OpenGate Modified: branches/ogsector/src/DeviceManager.cpp =================================================================== --- branches/ogsector/src/DeviceManager.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/DeviceManager.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -53,22 +53,22 @@ return "unknown"; } -void DeviceManager::loadGlobalIDs(const std::set < std::string > & resourcePaths, const std::string & fileName ){ +void DeviceManager::loadGlobalIDs( const std::string & fileName ){ - Ogre::FileSystemArchive * pArch = new Ogre::FileSystemArchive( (*resourcePaths.begin()), "FileSystem" ); - Ogre::StringVectorPtr file = pArch->find( fileName, true, false); +// Ogre::FileSystemArchive * pArch = new Ogre::FileSystemArchive( (*resourcePaths_.begin()), "FileSystem" ); +// Ogre::StringVectorPtr file = pArch->find( fileName, true, false); - std::string fileFullName( fileName ); - if ( (*file).size() > 0 ){ - fileFullName = (*resourcePaths.begin() ) + "/" + (*file)[ 0 ] ; - } +// std::string fileFullName( fileName ); +// if ( (*file).size() > 0 ){ +// fileFullName = (*resourcePaths_.begin() ) + "/" + (*file)[ 0 ] ; +// } - for ( unsigned int i = 0; i < (*file).size(); i ++ ){ - log_->info( std::string( "Found ressource: " ) + (*resourcePaths.begin() ) + "/" + (*file)[ i ] ); - } - delete pArch; +// for ( unsigned int i = 0; i < (*file).size(); i ++ ){ +// log_->info( std::string( "Found ressource: " ) + (*resourcePaths_.begin() ) + "/" + (*file)[ i ] ); +// } +// delete pArch; - TiXmlDocument doc( fileFullName ); + TiXmlDocument doc( findFullFileName( fileName ) ); bool loadOkay = doc.LoadFile(); if ( !loadOkay ) { @@ -102,8 +102,22 @@ } } +std::string DeviceManager::findFullFileName( const std::string & fileName ){ + Ogre::FileSystemArchive pArch = Ogre::FileSystemArchive( (*resourcePaths_.begin()), "FileSystem" ); + Ogre::StringVectorPtr file = pArch.find( fileName, true, false); + + if ( (*file).size() > 0 ){ + return (*resourcePaths_.begin() ) + "/" + (*file)[ 0 ] ; + } +// for ( unsigned int i = 0; i < (*file).size(); i ++ ){ +// log_->info( std::string( "Found ressource: " ) + (*resourcePaths_.begin() ) + "/" + (*file)[ i ] ); +// } + return "unknown"; +} + + DeviceManager & DeviceManager::getSingleton( ){ assert( ms_Singleton ); return ( *ms_Singleton ); Modified: branches/ogsector/src/DeviceManager.h =================================================================== --- branches/ogsector/src/DeviceManager.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/DeviceManager.h 2007-06-19 21:59:30 UTC (rev 582) @@ -67,7 +67,7 @@ std::string languageSuffix() const { return languageSuffix_; } std::string className( int id ) const { return "unknown"; } - void loadGlobalIDs(const std::set < std::string > & resourcePaths, const std::string & fileName ); + void loadGlobalIDs( const std::string & fileName ); std::string factionName( int id ); @@ -98,6 +98,11 @@ GameStateManager * gameStateRoot; Avatar * avatar; + /*! Find file in resources and returns full name */ + std::string findFullFileName( const std::string & fileName ); + + std::set < std::string > & resourcePaths() { return resourcePaths_; } + protected: LogManager * log_; @@ -105,6 +110,8 @@ std::string languageSuffix_; std::map< int, std::string > factionIDs_; + std::set < std::string > resourcePaths_; + }; } //namespace OpenGate Modified: branches/ogsector/src/GameStateManager.cpp =================================================================== --- branches/ogsector/src/GameStateManager.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/GameStateManager.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -319,20 +319,20 @@ devices_.console->addCommand( "/time", &GameStateManager::CMD_printTime, "Show current system time" ); devices_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." ); - devices_.loadGlobalIDs( resourcePaths_, "ids.xml" ); + devices_.loadGlobalIDs( "ids.xml" ); vesselManager_ = new VesselManager( ); - vesselManager_->load( resourcePaths_, "ships" ); + vesselManager_->load( devices_.resourcePaths(), "ships" ); commodityManager_ = new CommodityManager( ); - commodityManager_->load( resourcePaths_, "commodities" ); + commodityManager_->load( devices_.resourcePaths(), "commodities" ); equipmentManager_ = new EquipmentManager( ); - equipmentManager_->load( resourcePaths_, "engines" ); - equipmentManager_->load( resourcePaths_, "capacitors" ); - equipmentManager_->load( resourcePaths_, "radars" ); - equipmentManager_->load( resourcePaths_, "shields" ); - equipmentManager_->load( resourcePaths_, "power_plants" ); + equipmentManager_->load( devices_.resourcePaths(), "engines" ); + equipmentManager_->load( devices_.resourcePaths(), "capacitors" ); + equipmentManager_->load( devices_.resourcePaths(), "radars" ); + equipmentManager_->load( devices_.resourcePaths(), "shields" ); + equipmentManager_->load( devices_.resourcePaths(), "power_plants" ); devices_.gameStateRoot = this; @@ -381,7 +381,7 @@ typeName = i->first; archName = i->second; Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName ); - resourcePaths_.insert( archName ); + devices_.resourcePaths().insert( archName ); } } Modified: branches/ogsector/src/GameStateManager.h =================================================================== --- branches/ogsector/src/GameStateManager.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/GameStateManager.h 2007-06-19 21:59:30 UTC (rev 582) @@ -116,7 +116,6 @@ EquipmentManager * equipmentManager_; CommodityManager * commodityManager_; - std::set < std::string > resourcePaths_; std::vector< GameState * > stateStack_; std::vector< StateInfo > states_; Modified: branches/ogsector/src/Sector.cpp =================================================================== --- branches/ogsector/src/Sector.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/Sector.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -21,6 +21,8 @@ #include "Sector.h" #include "Avatar.h" #include "OpcodeWrapper.h" +#include "tinyxml/tinyxml.h" +#include "DeviceManager.h" namespace OpenGate{ @@ -51,7 +53,6 @@ log_ = LogManager::getSingletonPtr(); radar_ = true; - sectorname_ = "Testsector"; planetNode_ = NULL; starsNode_ = NULL; avatar_ = NULL; @@ -59,20 +60,8 @@ avatarDeathSequenceTime_ = 0.0; sceneMgr_->setAmbientLight( Ogre::ColourValue(0.9, 0.9, 0.9 ) ); - //** Create a light; - // Ogre::Light * l = sceneMgr_->createLight("MainLight"); - - // Accept default settings: point light, white diffuse, just set position - // NB I could attach the light to a SceneNode if I wanted it to move automatically with - // the avatar, but I don't - // l->setPosition( 50, 0, 300 ); - - collsionDetection_ = new OpcodeCollisionDetection( sceneMgr_ ); - //** Create a skybox; - sceneMgr_->setSkyBox( true, "OpenGate/SimpleSkyBox3" ); - //*** starfield test 1 // Ogre::ManualObject* myManualObject = sceneMgr_->createManualObject("manual1"); // Ogre::SceneNode* myManualObjectNode = sceneMgr_->getRootSceneNode()->createChildSceneNode("manual1_node"); @@ -133,12 +122,6 @@ planetNode_->setPosition( Ogre::Vector3( 20000.0, 10000.0, 50000 ) ); } -// Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "astro/Sphere.mesh", -// Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, -// Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY, -// Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY, -// true, true); -// // so we can still read it // // Build tangent vectors, all our meshes use only 1 texture coordset // // Note we can build into VES_TANGENT now (SM2+) @@ -157,46 +140,9 @@ // entity->setMaterialName("Examples/OffsetMapping/Specular"); // entity->setVisible( true ); - createStaticObject( Ogre::String("ogrehead.mesh"), - "-100 0 0", - Ogre::Vector3( -100, 0, 0 ), - Ogre::Real( 10.0 ), - Ogre::Degree( 0.0 ) ); - createStaticObject( Ogre::String("ogrehead.mesh"), - "100 0 0", - Ogre::Vector3( 100, 0, 0 ), - Ogre::Real( 10.0 ), - Ogre::Degree( 0.0 ) ); - - createStaticObject( Ogre::String("ogrehead.mesh"), - "ogreheadStation", - Ogre::Vector3( 5000, 0, 0 ), - Ogre::Real( 500.0 ), - Ogre::Degree( 0.0 ) ); - -// createStaticObject( Ogre::String("asteroid.mesh"), -// "Asteroid01", -// Ogre::Vector3( 0, 0, 300 ), -// Ogre::Real( 50.0 ), -// Ogre::Degree( 0.0 ) ); - - std::set < std::string > factions = VesselManager::getSingleton().factionNames(); - int factionCounter = 0; - for ( std::set < std::string >::iterator factIt = factions.begin(); factIt != factions.end(); factIt ++ ){ - std::set < Vessel * > vessels( VesselManager::getSingleton().factionVessels( (*factIt) ) ); - int vesselCounter = 0; - for ( std::set < Vessel * >::iterator it = vessels.begin(); it != vessels.end(); it ++ ){ - createStaticObject( (*it)->meshPtr().get()->getName(), (*it)->factionName() + "/" + (*it)->name(), - Ogre::Vector3( -1000.0, 50 * factionCounter, -100.0 + 100 * vesselCounter ), - Ogre::Real( (*it)->baseSize() ), Ogre::Degree( (*it)->baseYaw() ) ); - vesselCounter++; - } - factionCounter++; - } - + populate( "testsector.xml" ); itTarget_ = sectorObjects_.begin(); - } Sector::~Sector( ){ @@ -228,6 +174,128 @@ delete collsionDetection_; } +void Sector::populate( const std::string & fileName ){ + TiXmlDocument doc( DeviceManager::getSingleton().findFullFileName( fileName ) ); + bool loadOkay = doc.LoadFile(); + + if ( !loadOkay ) { + log_->fatal( std::string( "Failed to load sector file: " + fileName ) ); + return; + } + + TiXmlHandle docHandle( &doc ); + TiXmlElement *pElem, *pSubElem; + TiXmlHandle hRoot( 0 ); + + pElem = docHandle.FirstChildElement().Element(); + hRoot = TiXmlHandle( pElem ); + + if ( !pElem ) { + log_->fatal( fileName + " cannot read first node." ); + return; + } + + if ( strcmp( "sector", pElem->Value() ) != 0 ) { + log_->fatal( fileName + " is no sector description" ); + return; + } + + pElem = hRoot.ChildElement( "name_en", 0 ).Element(); + if ( pElem ){ + sectorname_ = pElem->FirstChild()->Value(); + } else { + sectorname_ = "Testsector"; + } + + pElem = hRoot.ChildElement( "skybox", 0 ).Element(); + if ( pElem ){ + sceneMgr_->setSkyBox( true, pElem->FirstChild()->Value() ); + } else{ + sceneMgr_->setSkyBox( true, "OpenGate/SimpleSkyBox1" ); + } + + pElem = hRoot.ChildElement( "vesselschool", 0 ).Element(); + if ( pElem ){ + std::string schoolclass( pElem->FirstChild()->Value() ); + + if ( schoolclass == "all" ){ + std::set < std::string > factions = VesselManager::getSingleton().factionNames(); + int factionCounter = 0; + for ( std::set < std::string >::iterator factIt = factions.begin(); factIt != factions.end(); factIt ++ ){ + std::set < Vessel * > vessels( VesselManager::getSingleton().factionVessels( (*factIt) ) ); + int vesselCounter = 0; + for ( std::set < Vessel * >::iterator it = vessels.begin(); it != vessels.end(); it ++ ){ + createStaticObject( (*it)->meshPtr().get()->getName(), (*it)->factionName() + "/" + (*it)->name(), + Ogre::Vector3( -1000.0, 50 * factionCounter, -100.0 + 100 * vesselCounter ), + Ogre::Real( (*it)->baseSize() ), Ogre::Degree( (*it)->baseYaw() ) ); + vesselCounter++; + } + factionCounter++; + } + } + } + + + for ( pElem = hRoot.FirstChild( "sectorobject" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) { + std::string name; + pSubElem = pElem->FirstChildElement( "name" ); + if ( pSubElem ){ + name = pSubElem->FirstChild()->Value(); + } else { + log_->warn( "missing name for sectorobject " ); + continue; + } + + std::string mesh; + pSubElem = pElem->FirstChildElement( "mesh" ); + if ( pSubElem ){ + mesh = std::string( pSubElem->FirstChild()->Value() ) + ".mesh"; + } else { + log_->warn( "missing mesh for sectorobject " + name ); + continue; + } + + Ogre::Vector3 pos( 0.0, 0.0, 0.0); + pSubElem = pElem->FirstChildElement( "position" ); + if ( pSubElem ){ + pos = toVector3( pSubElem->FirstChild()->Value(), ',' ); + } else { + log_->warn( "missing pos for sectorobject " + name ); + continue; + } + + Ogre::Vector3 scale( 1.0, 1.0, 1.0) ; + pSubElem = pElem->FirstChildElement( "scale" ); + if ( pSubElem ){ + scale = toVector3( pSubElem->FirstChild()->Value(), ',' ); + } + + Ogre::Vector3 direction( 0.0, 0.0, 0.0 ); + pSubElem = pElem->FirstChildElement( "direction" ); + if ( pSubElem ){ + direction = toVector3( pSubElem->FirstChild()->Value(), ',' ); + } + + Ogre::Vector3 size( 0.0, 0.0, 0.0) ; + pSubElem = pElem->FirstChildElement( "size" ); + if ( pSubElem ){ + size = toVector3( pSubElem->FirstChild()->Value(), ',' ); + } + + SectorObject * obj = createStaticObject( mesh, name, pos ); + if ( size.length() > 0 ) { + obj->setBaseSize( size ); + } else{ + obj->scale( scale ); + } + + if ( direction.length() > 0 ){ + obj->mainNode()->lookAt( Ogre::Vector3( obj->mainNode()->getPosition() * direction), Ogre::Node::TS_WORLD ); + } + } + +} + void Sector::update( Ogre::Real elapsedTime ){ collsionDetection_->update( elapsedTime ); @@ -377,7 +445,18 @@ } } -void Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, +SectorObject * Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, + const Ogre::Vector3 & pos ){ + SectorObject * obj = new SectorObject( objectname, this ); + + obj->setShape( meshname ); + obj->mainNode()->setPosition( pos ); + + sectorObjects_.insert( obj ); + return obj; +} + +SectorObject * Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw ){ SectorObject * obj = new SectorObject( objectname, this ); @@ -389,6 +468,7 @@ obj->mainNode()->setPosition( pos ); sectorObjects_.insert( obj ); + return obj; } Modified: branches/ogsector/src/Sector.h =================================================================== --- branches/ogsector/src/Sector.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/Sector.h 2007-06-19 21:59:30 UTC (rev 582) @@ -40,13 +40,17 @@ Ogre::SceneManager * sceneManager() { return sceneMgr_; } + void populate( const std::string & fileName ); + void setListener( UnDockedState * listener ){ listener_ = listener; } UnDockedState * listener( ){ return listener_; } void update( Ogre::Real elapsedTime ); - void createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, + SectorObject * createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, const Ogre::Vector3 & pos ); + + SectorObject * createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw ); SectorObjectMoveable * createMoveableObject( const Ogre::String & name, int userId, int childId, Vessel & vessel ); Modified: branches/ogsector/src/SectorObjects.cpp =================================================================== --- branches/ogsector/src/SectorObjects.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/SectorObjects.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -225,7 +225,25 @@ collObj_ = OpcodeCollisionDetection::getSingleton().createObject( this ); } +void SectorObject::scale( const Ogre::Vector3 & scale ){ + baseSize_ = scale[ 0 ] * ( entity_->getBoundingBox().getMaximum()[ 0 ] + - entity_->getBoundingBox().getMinimum()[ 0 ] ); + mainNodeEntity_->scale( scale ); +} + +void SectorObject::setBaseSize( const Ogre::Vector3 & size ){ + Ogre::Real scaleX = size[ 0 ] / ( entity_->getBoundingBox().getMaximum()[ 0 ] + - entity_->getBoundingBox().getMinimum()[ 0 ] ); + Ogre::Real scaleY = size[ 1 ] / ( entity_->getBoundingBox().getMaximum()[ 1 ] + - entity_->getBoundingBox().getMinimum()[ 1 ] ); + Ogre::Real scaleZ = size[ 2 ] / ( entity_->getBoundingBox().getMaximum()[ 2 ] + - entity_->getBoundingBox().getMinimum()[ 2 ] ); + mainNodeEntity_->scale( scaleX, scaleY, scaleZ ); + baseSize_ = size[ 0 ]; +} + void SectorObject::setBaseSize( Ogre::Real targetSize ){ + Ogre::Real scale = targetSize / ( entity_->getBoundingBox().getMaximum()[ 0 ] - entity_->getBoundingBox().getMinimum()[ 0 ] ); mainNodeEntity_->scale( scale, scale, scale ); Modified: branches/ogsector/src/SectorObjects.h =================================================================== --- branches/ogsector/src/SectorObjects.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/SectorObjects.h 2007-06-19 21:59:30 UTC (rev 582) @@ -150,6 +150,10 @@ Ogre::Entity * shape(){ return entity_; } + void scale( const Ogre::Vector3 & scale ); + + void setBaseSize( const Ogre::Vector3 & targetSize ); + void setBaseSize( Ogre::Real targetSize ); Ogre::Real baseSize( ) const { return baseSize_; } Modified: branches/ogsector/src/common.cpp =================================================================== --- branches/ogsector/src/common.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/common.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -20,6 +20,7 @@ #include "common.h" #include <OgreSceneNode.h> +#include <OgreVector3.h> #include <OgreMovableObject.h> long createGlobalID( int userId, int childId ) { return childId * MAXUSERID + userId; } @@ -40,6 +41,37 @@ return subStrings; } +std::vector < std::string > getRowSubstrings( std::fstream & file, char comment ){ + std::vector < std::string > subStrings; + std::string str, tmp; + getline( file, str ); + + std::istringstream is( str.substr( 0, str.find( comment ) ) ); + while ( is >> tmp ) subStrings.push_back( tmp ); + return subStrings; +} + +Ogre::Vector3 toVector3( const std::string & vecStr, const char sep ){ + Ogre::Vector3 vect( 0.0, 0.0, 0.0 ); + int pos = 0, nextPos = 0, count = 0; + std::string str; + + while ( ( nextPos = vecStr.find( sep, pos ) ) != std::string::npos ){ + str = vecStr.substr( pos, nextPos-pos ); + if ( str.size() > 0 ){ + vect[ count ] = toDouble( str ); + count ++; + } + if ( count > 2 ) return vect; + + pos = nextPos + 1; + } + str = vecStr.substr( pos, vecStr.length()-pos ); + if ( str.size() > 0 ) vect[ count ] = toDouble( str ); + return vect; +} + + void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level ) { for ( int i = 0; i < level; i++ ) { ss << " "; Modified: branches/ogsector/src/common.h =================================================================== --- branches/ogsector/src/common.h 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/common.h 2007-06-19 21:59:30 UTC (rev 582) @@ -37,6 +37,7 @@ #endif #include <sstream> +#include <fstream> #include <iostream> #include <vector> #include <string> @@ -45,6 +46,7 @@ namespace Ogre{ class Node; +class Vector3; } typedef unsigned char Uint8; @@ -95,6 +97,9 @@ */ std::vector < std::string > getSubstrings( const std::string & str ); +/*! Read one line from a file stream and return a vector of strings. */ +std::vector < std::string > getRowSubstrings( std::fstream & file, char comment = '#' ); + /*! * \brief This method compares two values and returns the smaller one * \param a One of the values to compare @@ -119,6 +124,9 @@ return streamOut.str(); } +/*! Convert string to OgreVector3, Example: ToVector3( "3.3, 4.45, 5.23", ',' ) */ +Ogre::Vector3 toVector3( const std::string & vecStr, const char sep = ',' ); + /*! * \brief This method converts a string to int * \param str The string you want to convert Modified: branches/ogsector/src/opengateclient.cpp =================================================================== --- branches/ogsector/src/opengateclient.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ branches/ogsector/src/opengateclient.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -83,9 +83,9 @@ try { OpenGate::GameStateManager gameStateMgr( nw, dialog ); - OpenGate::DockedState::create( &gameStateMgr, "DockedState" ); +// OpenGate::DockedState::create( &gameStateMgr, "DockedState" ); OpenGate::UnDockedState::create( &gameStateMgr, "UnDockedState" ); - gameStateMgr.start( gameStateMgr.findByName( "DockedState" ) ); + gameStateMgr.start( gameStateMgr.findByName( "UnDockedState" ) ); } catch( Ogre::Exception& e ) { #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 Modified: trunk/current/src/Client.cpp =================================================================== --- trunk/current/src/Client.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/Client.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -38,5 +38,6 @@ // Launch app.go(); + std::cout << "Finish:" << std::endl; return EXIT_SUCCESS; } Modified: trunk/current/src/client/GameStateManager.cpp =================================================================== --- trunk/current/src/client/GameStateManager.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/client/GameStateManager.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -83,13 +83,23 @@ { changeGameState(state); + std::cout << "mesg: " << mShutdown << std::endl; + // mShutdown = false; + + mFramework->ogreRoot->renderOneFrame(); +// mFramework->ogreRoot->_fireFrameStarted(); +// mFramework->renderWindow->update(); +// mFramework->ogreRoot->_fireFrameEnded(); + while (!mShutdown) { + // std::cout << "mesg: " << mShutdown << std::endl; // HACK: For some reason renderOneFrame() does not work, // manually updating the window. mFramework->ogreRoot->_fireFrameStarted(); // Run the message pump + #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 { MSG msg; Modified: trunk/current/src/client/Global.h =================================================================== --- trunk/current/src/client/Global.h 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/client/Global.h 2007-06-19 21:59:30 UTC (rev 582) @@ -21,6 +21,7 @@ #ifndef GLOBAL_H #define GLOBAL_H +#include <iostream> #include <OGRE/Ogre.h> #include "InputManager.h" Modified: trunk/current/src/client/GraphicsSetup.cpp =================================================================== --- trunk/current/src/client/GraphicsSetup.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/client/GraphicsSetup.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -35,7 +35,7 @@ bool GraphicsSetup::initGraphics(framework_info* mFramework) { // Create root object and store a pointer to it in mFramework - mFramework->ogreRoot = new Ogre::Root("", "", "OpenGate.log"); + mFramework->ogreRoot = new Ogre::Root("", "", "OpenGateOgre.log"); // Load the render system (Linux only has OpenGL) mFramework->ogreRoot->loadPlugin("/usr/local/lib/OGRE/RenderSystem_GL.so"); Modified: trunk/current/src/client/InputManager.cpp =================================================================== --- trunk/current/src/client/InputManager.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/client/InputManager.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -56,7 +56,8 @@ mJoysticks.clear(); } - mInputSystem->destroyInputSystem(); + mInputSystem->destroyInputSystem( mInputSystem ); + //mInputSystem->destroyInputSystem( ); mInputSystem = 0; // Clear Listeners Modified: trunk/current/src/client/OpenGateApp.cpp =================================================================== --- trunk/current/src/client/OpenGateApp.cpp 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/current/src/client/OpenGateApp.cpp 2007-06-19 21:59:30 UTC (rev 582) @@ -50,7 +50,7 @@ { // Initialise Ogre and CEGUI if (!initGraphics(&mFramework)) - return; + return; // Start the input manager mFramework.inputMgr = InputManager::getSingletonPtr(); Modified: trunk/data/engines/money.xml =================================================================== (Binary files differ) Modified: trunk/data/engines/t-e-15.xml =================================================================== (Binary files differ) Modified: trunk/data/misc/credits.txt =================================================================== --- trunk/data/misc/credits.txt 2007-06-19 14:22:24 UTC (rev 581) +++ trunk/data/misc/credits.txt 2007-06-19 21:59:30 UTC (rev 582) @@ -1,23 +1,33 @@ Project leader: ---------------- +------------------------------------------------------------ - eGore Regular contributors: ---------------------- - +------------------------------------------------------------ - eGore (source code, 3d models) - Spom (source code) -- Ultrasick (graphics, website, 3d models) +- Ultrasick (graphics, website, + 3d models) Other contributors: -------------------- - +------------------------------------------------------------ - AFK_ (source code) Special thanks to ... ---------------------- +------------------------------------------------------------ +... Delwin for providing his super fast + computer to do blender renderings + for a dozen times! -... Delwin for providing his super fast computer to do blender renderings for a dozen times! -... LordOtter for his great webradio which I (Ultrasick) listened to for hours while I was working on Opengate! :-) -... Ramiel (www.jagthesite.com) for providing nice base textures for the Lady Kickstart! -... www.a1freesoundeffects.com for the sonar ping sound file we used in the open source splash screen! \ No newline at end of file +... LordOtter for his great webradio + which I (Ultrasick) listened to for + hours while I was working on + Opengate! :-) + +... Ramiel (www.jagthesite.com) for + providing nice base textures for + the Lady Kickstart! + +... www.a1freesoundeffects.com for + the sonar ping sound file we used + in the open source splash screen! Added: trunk/data/misc/testsector.xml =================================================================== --- trunk/data/misc/testsector.xml (rev 0) +++ trunk/data/misc/testsector.xml 2007-06-19 21:59:30 UTC (rev 582) @@ -0,0 +1,111 @@ +<?xml version="1.0"?> + +<sector> + <name>Testsector</name> + <skybox>OpenGate/SimpleSkyBox3</skybox> + +<!-- show all vessels --> + <vesselschool>all</vesselschool> + +<!-- <sectorobject> --> +<!-- Mandatory --> +<!-- <name>object-name</name> --> +<!-- <mesh>object-ogre-mesh</mesh> --> +<!-- <position>Position of tis object</position> --> +<!-- Optional --> +<!-- <size>desired size of this object</size> --> +<!-- <scale>scaling factor for the ogre mesh</size> --> +<!-- <direction>desired front direction</direction> --> +<!-- </sectorobject> --> + + <sectorobject> + <name>ogreheadStation1</name> + <mesh>ogrehead</mesh> + <position>5000.0, 1000.0, 0.0</position> + <size>500, 500, 500</size> + </sectorobject> + <sectorobject> + <name>ogrehead1</name> + <mesh>ogrehead</mesh> + <position>100,0,0</position> + <size>10, 10, 10</size> + <direction>1,0,0</direction> + </sectorobject> + <sectorobject> + <name>ogrehead2</name> + <mesh>ogrehead</mesh> + <position>-100.0, 0, 0.0</position> + <size>10, 10, 10</size> + <direction>1,0,0</direction> + </sectorobject> + <sectorobject> + <name>astro1</name> + <mesh>ice_oval_6</mesh> + <position>0.0, -10, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro2</name> + <mesh>ice_oval_7</mesh> + <position>10.0, 0, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro3</name> + <mesh>ice_oval_8</mesh> + <position>20.0, 0, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro4</name> + <mesh>ice_oval_9</mesh> + <position>30.0, 0, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro5</name> + <mesh>ice_oval_10</mesh> + <position>40.0, 0, 0.0</position> + <scale>1, 1, 1</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro6</name> + <mesh>normal_oval_1</mesh> + <position>0.0, 10, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro7</name> + <mesh>normal_oval_2</mesh> + <position>10.0, 10, 0.0</position> + <scale>4, 4, 4</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro8</name> + <mesh>normal_oval_3</mesh> + <position>20.0, 10, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro9</name> + <mesh>normal_oval_4</mesh> + <position>30.0, 10, 0.0</position> + <scale>3, 3, 3</scale> + <direction>0,0,1</direction> + </sectorobject> + <sectorobject> + <name>astro10</name> + <mesh>normal_oval_5</mesh> + <position>40.0, 10, 0.0</position> + <scale>1, 1, 1</scale> + <direction>0,0,1</direction> + </sectorobject> +</sector> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spo...@us...> - 2007-06-19 14:22:23
|
Revision: 581 http://svn.sourceforge.net/opengate/?rev=581&view=rev Author: spom_spom Date: 2007-06-19 07:22:24 -0700 (Tue, 19 Jun 2007) Log Message: ----------- delete some unused file Modified Paths: -------------- branches/ogsector/win32/ogsectorclient/resources.cfg Added Paths: ----------- branches/ogsector/data/gui/GUILayout.xsd Removed Paths: ------------- branches/ogsector/data/gui/layouts/GUILayout.xsd branches/ogsector/data/gui/schemes/Falagard.xsd branches/ogsector/data/gui/schemes/Falagard.xsx branches/ogsector/data/gui/schemes/Font.xsd branches/ogsector/data/gui/schemes/GUIScheme.xsd branches/ogsector/data/gui/schemes/Imageset.xsd Added: branches/ogsector/data/gui/GUILayout.xsd =================================================================== --- branches/ogsector/data/gui/GUILayout.xsd (rev 0) +++ branches/ogsector/data/gui/GUILayout.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + + <xsd:element name="GUILayout" type="GUILayoutType"/> + + <xsd:complexType name="GUILayoutType"> + <xsd:sequence> + <xsd:element name="Window" type="WindowType" /> + </xsd:sequence> + <xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/> + </xsd:complexType> + + <xsd:complexType name="WindowType"> + <xsd:sequence> + <xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="Window" type="WindowType" /> + <xsd:element name="AutoWindow" type="AutoWindowType" /> + </xsd:choice> + <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="Type" type="xsd:string" use="required"/> + <xsd:attribute name="Name" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + + <xsd:complexType name="AutoWindowType"> + <xsd:sequence> + <xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="Window" type="WindowType" /> + <xsd:element name="AutoWindow" type="AutoWindowType" /> + </xsd:choice> + <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="NameSuffix" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="PropertyType"> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="Name" type="xsd:string" use="required"/> + <xsd:attribute name="Value" type="xsd:string" use="optional"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + + <xsd:complexType name="LayoutImportType"> + <xsd:attribute name="Filename" type="xsd:string" use="required"/> + <xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + + <xsd:complexType name="EventType"> + <xsd:attribute name="Name" type="xsd:string" use="required"/> + <xsd:attribute name="Function" type="xsd:string" use="required"/> + </xsd:complexType> + +</xsd:schema> + Deleted: branches/ogsector/data/gui/layouts/GUILayout.xsd =================================================================== --- branches/ogsector/data/gui/layouts/GUILayout.xsd 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/layouts/GUILayout.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -1,63 +0,0 @@ -<?xml version="1.0"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - - <xsd:element name="GUILayout" type="GUILayoutType"/> - - <xsd:complexType name="GUILayoutType"> - <xsd:sequence> - <xsd:element name="Window" type="WindowType" /> - </xsd:sequence> - <xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/> - </xsd:complexType> - - <xsd:complexType name="WindowType"> - <xsd:sequence> - <xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="Window" type="WindowType" /> - <xsd:element name="AutoWindow" type="AutoWindowType" /> - </xsd:choice> - <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="Type" type="xsd:string" use="required"/> - <xsd:attribute name="Name" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - - <xsd:complexType name="AutoWindowType"> - <xsd:sequence> - <xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="Window" type="WindowType" /> - <xsd:element name="AutoWindow" type="AutoWindowType" /> - </xsd:choice> - <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="NameSuffix" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="PropertyType"> - <xsd:simpleContent> - <xsd:extension base="xsd:string"> - <xsd:attribute name="Name" type="xsd:string" use="required"/> - <xsd:attribute name="Value" type="xsd:string" use="optional"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - - <xsd:complexType name="LayoutImportType"> - <xsd:attribute name="Filename" type="xsd:string" use="required"/> - <xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - - <xsd:complexType name="EventType"> - <xsd:attribute name="Name" type="xsd:string" use="required"/> - <xsd:attribute name="Function" type="xsd:string" use="required"/> - </xsd:complexType> - -</xsd:schema> - Deleted: branches/ogsector/data/gui/schemes/Falagard.xsd =================================================================== --- branches/ogsector/data/gui/schemes/Falagard.xsd 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/schemes/Falagard.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -1,383 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <xsd:element name="Falagard" type="falagardSpecificationType" /> - <xsd:complexType name="falagardSpecificationType"> - <xsd:sequence> - <xsd:element name="WidgetLook" type="widgetLookType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="widgetLookType"> - <xsd:sequence> - <xsd:element name="PropertyDefinition" type="propertyDefinitionType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="PropertyLinkDefinition" type="propertyLinkDefinitionType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="NamedArea" type="namedAreaType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="Child" type="widgetComponentType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ImagerySection" type="imagerySectionType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="StateImagery" type="stateType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="propertyDefinitionType"> - <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" /> - <xsd:attribute name="name" type="xsd:string" use="required" /> - <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" /> - <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" /> - </xsd:complexType> - <xsd:complexType name="propertyLinkDefinitionType"> - <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" /> - <xsd:attribute name="name" type="xsd:string" use="required" /> - <xsd:attribute name="widget" type="xsd:string" use="required" /> - <xsd:attribute name="targetProperty" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" /> - <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" /> - </xsd:complexType> - <xsd:complexType name="namedAreaType"> - <xsd:sequence> - <xsd:element name="Area" type="componentAreaType" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="stateType"> - <xsd:sequence> - <xsd:element name="Layer" type="layerType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - <xsd:attribute name="clipped" type="xsd:boolean" use="optional" default="true" /> - </xsd:complexType> - <xsd:complexType name="layerType"> - <xsd:sequence> - <xsd:element name="Section" type="sectionSpecType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="priority" type="xsd:integer" use="optional" default="0" /> - </xsd:complexType> - <xsd:complexType name="sectionSpecType"> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="Colours" type="colourRectType" /> - <xsd:element name="ColourProperty" type="settingByPropertyType" /> - <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:attribute name="look" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="section" type="xsd:string" use="required" /> - <xsd:attribute name="controlProperty" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - <xsd:complexType name="imagerySectionType"> - <xsd:sequence> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="Colours" type="colourRectType" /> - <xsd:element name="ColourProperty" type="settingByPropertyType" /> - <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:element name="FrameComponent" type="frameComponentType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="ImageryComponent" type="imageryComponentType" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="TextComponent" type="textComponentType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="frameComponentType"> - <xsd:sequence> - <xsd:element name="Area" type="componentAreaType" /> - <xsd:element name="Image" type="frameImageType" minOccurs="0" maxOccurs="9" /> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="Colours" type="colourRectType" /> - <xsd:element name="ColourProperty" type="settingByPropertyType" /> - <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="VertFormat" type="vertFormatType" /> - <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="HorzFormat" type="horzFormatType" /> - <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="textComponentType"> - <xsd:sequence> - <xsd:element name="Area" type="componentAreaType" /> - <xsd:element name="Text" type="textStringType" minOccurs="0" maxOccurs="1" /> - <xsd:element name="TextProperty" type="textPropertyType" minOccurs="0" maxOccurs="1" /> - <xsd:element name="FontProperty" type="fontPropertyType" minOccurs="0" maxOccurs="1" /> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="Colours" type="colourRectType" /> - <xsd:element name="ColourProperty" type="settingByPropertyType" /> - <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="VertFormat" type="vertTextFormatType" /> - <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="HorzFormat" type="horzTextFormatType" /> - <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="imageryComponentType"> - <xsd:sequence> - <xsd:element name="Area" type="componentAreaType" /> - <xsd:choice> - <xsd:element name="Image" type="imageType" /> - <xsd:element name="ImageProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="Colours" type="colourRectType" /> - <xsd:element name="ColourProperty" type="settingByPropertyType" /> - <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="VertFormat" type="vertFormatType" /> - <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="HorzFormat" type="horzFormatType" /> - <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="widgetComponentType"> - <xsd:sequence> - <xsd:element name="Area" type="componentAreaType" /> - <xsd:element name="VertAlignment" type="vertAlignmentType" minOccurs="0" maxOccurs="1" /> - <xsd:element name="HorzAlignment" type="horzAlignmentType" minOccurs="0" maxOccurs="1" /> - <xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="type" type="xsd:string" use="required" /> - <xsd:attribute name="nameSuffix" type="xsd:string" use="required" /> - <xsd:attribute name="renderer" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="look" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - <xsd:complexType name="horzFormatType"> - <xsd:attribute name="type" type="horzFormatEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="vertFormatType"> - <xsd:attribute name="type" type="vertFormatEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="horzTextFormatType"> - <xsd:attribute name="type" type="horzTextFormatEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="vertTextFormatType"> - <xsd:attribute name="type" type="vertTextFormatEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="horzAlignmentType"> - <xsd:attribute name="type" type="horzAlignmentEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="vertAlignmentType"> - <xsd:attribute name="type" type="vertAlignmentEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="propertyType"> - <xsd:attribute name="name" type="xsd:string" use="required" /> - <xsd:attribute name="value" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="imageType"> - <xsd:attribute name="imageset" type="xsd:string" use="required" /> - <xsd:attribute name="image" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="frameImageType"> - <xsd:attribute name="type" type="frameImageComponentEnum" use="required" /> - <xsd:attribute name="imageset" type="xsd:string" use="required" /> - <xsd:attribute name="image" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="componentAreaType"> - <xsd:choice> - <xsd:sequence> - <xsd:element name="Dim" type="dimensionType" minOccurs="4" maxOccurs="4" /> - </xsd:sequence> - <xsd:element name="AreaProperty" type="settingByPropertyType" /> - </xsd:choice> - </xsd:complexType> - <xsd:complexType name="dimensionType"> - <xsd:choice> - <xsd:element name="UnifiedDim" type="unifiedDimType" /> - <xsd:element name="AbsoluteDim" type="absoluteDimType" /> - <xsd:element name="ImageDim" type="imageDimType" /> - <xsd:element name="WidgetDim" type="widgetDimType" /> - <xsd:element name="FontDim" type="fontDimType" /> - <xsd:element name="PropertyDim" type="propertyDimType" /> - </xsd:choice> - <xsd:attribute name="type" type="dimensionTypeEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="fontDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="font" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="string" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="type" type="fontMetricTypeEnum" use="required" /> - <xsd:attribute name="padding" type="xsd:decimal" use="optional" default="0" /> - </xsd:complexType> - <xsd:complexType name="propertyDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="unifiedDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="scale" type="xsd:decimal" use="optional" default="0" /> - <xsd:attribute name="offset" type="xsd:integer" use="optional" default="0" /> - <xsd:attribute name="type" type="dimensionTypeEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="absoluteDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="value" type="xsd:decimal" use="optional" default="0" /> - </xsd:complexType> - <xsd:complexType name="imageDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="imageset" type="xsd:string" use="required" /> - <xsd:attribute name="image" type="xsd:string" use="required" /> - <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="widgetDimType"> - <xsd:sequence> - <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> - </xsd:sequence> - <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" /> - </xsd:complexType> - <xsd:complexType name="settingByPropertyType"> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="colourRectType"> - <xsd:attribute name="topLeft" type="colourValType" use="required" /> - <xsd:attribute name="topRight" type="colourValType" use="required" /> - <xsd:attribute name="bottomLeft" type="colourValType" use="required" /> - <xsd:attribute name="bottomRight" type="colourValType" use="required" /> - </xsd:complexType> - <xsd:simpleType name="colourValType"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[a-fA-F0-9]{8}" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:complexType name="textStringType"> - <xsd:attribute name="string" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="font" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - <xsd:complexType name="textPropertyType"> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="fontPropertyType"> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="dimensionOperatorType"> - <xsd:choice> - <xsd:element name="UnifiedDim" type="unifiedDimType" /> - <xsd:element name="AbsoluteDim" type="absoluteDimType" /> - <xsd:element name="ImageDim" type="imageDimType" /> - <xsd:element name="WidgetDim" type="widgetDimType" /> - <xsd:element name="FontDim" type="fontDimType" /> - <xsd:element name="PropertyDim" type="propertyDimType" /> - </xsd:choice> - <xsd:attribute name="op" type="dimensionOperatorEnum" use="required" /> - </xsd:complexType> - <xsd:simpleType name="dimensionTypeEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LeftEdge" /> - <xsd:enumeration value="TopEdge" /> - <xsd:enumeration value="RightEdge" /> - <xsd:enumeration value="BottomEdge" /> - <xsd:enumeration value="XPosition" /> - <xsd:enumeration value="YPosition" /> - <xsd:enumeration value="Width" /> - <xsd:enumeration value="Height" /> - <xsd:enumeration value="XOffset" /> - <xsd:enumeration value="YOffset" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="vertFormatEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="TopAligned" /> - <xsd:enumeration value="CentreAligned" /> - <xsd:enumeration value="BottomAligned" /> - <xsd:enumeration value="Stretched" /> - <xsd:enumeration value="Tiled" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="horzFormatEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LeftAligned" /> - <xsd:enumeration value="CentreAligned" /> - <xsd:enumeration value="RightAligned" /> - <xsd:enumeration value="Stretched" /> - <xsd:enumeration value="Tiled" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="vertAlignmentEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="TopAligned" /> - <xsd:enumeration value="CentreAligned" /> - <xsd:enumeration value="BottomAligned" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="horzAlignmentEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LeftAligned" /> - <xsd:enumeration value="CentreAligned" /> - <xsd:enumeration value="RightAligned" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="horzTextFormatEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LeftAligned" /> - <xsd:enumeration value="RightAligned" /> - <xsd:enumeration value="CentreAligned" /> - <xsd:enumeration value="Justified" /> - <xsd:enumeration value="WordWrapLeftAligned" /> - <xsd:enumeration value="WordWrapRightAligned" /> - <xsd:enumeration value="WordWrapCentreAligned" /> - <xsd:enumeration value="WordWrapJustified" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="vertTextFormatEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="TopAligned" /> - <xsd:enumeration value="BottomAligned" /> - <xsd:enumeration value="CentreAligned" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="propertyTypeEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Generic" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="fontMetricTypeEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LineSpacing" /> - <xsd:enumeration value="Baseline" /> - <xsd:enumeration value="HorzExtent" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="dimensionOperatorEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Noop" /> - <xsd:enumeration value="Add" /> - <xsd:enumeration value="Subtract" /> - <xsd:enumeration value="Multiply" /> - <xsd:enumeration value="Divide" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="frameImageComponentEnum"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Background" /> - <xsd:enumeration value="TopLeftCorner" /> - <xsd:enumeration value="TopRightCorner" /> - <xsd:enumeration value="BottomLeftCorner" /> - <xsd:enumeration value="BottomRightCorner" /> - <xsd:enumeration value="LeftEdge" /> - <xsd:enumeration value="RightEdge" /> - <xsd:enumeration value="TopEdge" /> - <xsd:enumeration value="BottomEdge" /> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Deleted: branches/ogsector/data/gui/schemes/Falagard.xsx =================================================================== --- branches/ogsector/data/gui/schemes/Falagard.xsx 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/schemes/Falagard.xsx 2007-06-19 14:22:24 UTC (rev 581) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.--> -<XSDDesignerLayout /> \ No newline at end of file Deleted: branches/ogsector/data/gui/schemes/Font.xsd =================================================================== --- branches/ogsector/data/gui/schemes/Font.xsd 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/schemes/Font.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -1,34 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <xsd:element name="Font" type="FontType" /> - - <xsd:complexType name="FontType"> - <xsd:sequence> - <xsd:element name="Mapping" type="MapType" maxOccurs="unbounded" minOccurs="0" /> - </xsd:sequence> - <xsd:attributeGroup ref="FontAttrs" /> - </xsd:complexType> - <xsd:complexType name="MapType"> - <xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" /> - <xsd:attribute name="Image" type="xsd:string" use="required" /> - <xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" /> - </xsd:complexType> - <xsd:attributeGroup name="FontAttrs"> - <xsd:attribute name="Name" type="xsd:string" use="required" /> - <xsd:attribute name="Filename" type="xsd:string" use="required" /> - <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="Type" use="required"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="FreeType" /> - <xsd:enumeration value="Pixmap" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" /> - <xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" /> - <xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" /> - <xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" /> - <xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" /> - </xsd:attributeGroup> -</xsd:schema> Deleted: branches/ogsector/data/gui/schemes/GUIScheme.xsd =================================================================== --- branches/ogsector/data/gui/schemes/GUIScheme.xsd 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/schemes/GUIScheme.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -1,54 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <xsd:element name="GUIScheme" type="SchemeType" /> - <xsd:complexType name="SchemeType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="Imageset" type="NamedDataType" /> - <xsd:element name="ImagesetFromImage" type="NamedDataType" /> - <xsd:element name="Font" type="NamedDataType" /> - <xsd:element name="LookNFeel" type="FileDataType" /> - <xsd:element name="WindowSet" type="WindowSetType" /> - <xsd:element name="WindowRendererSet" type="WindowRendererSetType" /> - <xsd:element name="WindowAlias" type="WindowAliasType" /> - <xsd:element name="FalagardMapping" type="FalagardMapType" /> - </xsd:choice> - <xsd:attribute name="Name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="WindowSetType"> - <xsd:sequence> - <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="Filename" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="WindowRendererSetType"> - <xsd:sequence> - <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="Filename" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="FileDataType"> - <xsd:attribute name="Filename" type="xsd:string" use="required" /> - <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - <xsd:complexType name="NamedDataType"> - <xsd:attribute name="Name" type="xsd:string" use="required" /> - <xsd:attribute name="Filename" type="xsd:string" use="required" /> - <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> - </xsd:complexType> - <xsd:complexType name="WindowFactoryType"> - <xsd:attribute name="Name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="WindowRendererFactoryType"> - <xsd:attribute name="Name" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="WindowAliasType"> - <xsd:attribute name="Alias" type="xsd:string" use="required" /> - <xsd:attribute name="Target" type="xsd:string" use="required" /> - </xsd:complexType> - <xsd:complexType name="FalagardMapType"> - <xsd:attribute name="WindowType" type="xsd:string" use="required" /> - <xsd:attribute name="TargetType" type="xsd:string" use="required" /> - <xsd:attribute name="Renderer" type="xsd:string" use="required" /> - <xsd:attribute name="LookNFeel" type="xsd:string" use="required" /> - </xsd:complexType> -</xsd:schema> Deleted: branches/ogsector/data/gui/schemes/Imageset.xsd =================================================================== --- branches/ogsector/data/gui/schemes/Imageset.xsd 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/data/gui/schemes/Imageset.xsd 2007-06-19 14:22:24 UTC (rev 581) @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - - <xsd:element name="Imageset" type="ImagesetType"/> - - <xsd:complexType name="ImagesetType"> - <xsd:sequence> - <xsd:element name="Image" type="ImageType" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="Imagefile" type="xsd:string" use="required"/> - <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> - <xsd:attribute name="Name" type="xsd:string" use="required"/> - <xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" /> - <xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" /> - <xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" /> - </xsd:complexType> - - <xsd:complexType name="ImageType"> - <xsd:attribute name="Name" type="xsd:string" use="required"/> - <xsd:attribute name="XPos" type="xsd:nonNegativeInteger" use="required"/> - <xsd:attribute name="YPos" type="xsd:nonNegativeInteger" use="required"/> - <xsd:attribute name="Width" type="xsd:nonNegativeInteger" use="required"/> - <xsd:attribute name="Height" type="xsd:nonNegativeInteger" use="required"/> - <xsd:attribute name="XOffset" type="xsd:integer" use="optional" default="0"/> - <xsd:attribute name="YOffset" type="xsd:integer" use="optional" default="0"/> - </xsd:complexType> - -</xsd:schema> Modified: branches/ogsector/win32/ogsectorclient/resources.cfg =================================================================== --- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-19 14:12:03 UTC (rev 580) +++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-19 14:22:24 UTC (rev 581) @@ -9,9 +9,12 @@ Zip=../../data/simpleSkybox.zip FileSystem=../../data/MediaFromOgre FileSystem=../../data/gui +FileSystem=../../data/gui/fonts/ +FileSystem=../../data/gui/layouts/ +FileSystem=../../data/gui/imagesets/ FileSystem=../../data/gui/schemes/ -FileSystem=../../data/gui/schemes/opengate -FileSystem=../../data/gui/layouts/ +FileSystem=../../data/gui/looknfeel/ + Zip=../../data/fonts.zip FileSystem=../../../../trunk/data/ FileSystem=../../../../trunk/data/commodities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spo...@us...> - 2007-06-19 14:12:01
|
Revision: 580 http://svn.sourceforge.net/opengate/?rev=580&view=rev Author: spom_spom Date: 2007-06-19 07:12:03 -0700 (Tue, 19 Jun 2007) Log Message: ----------- changed gui filestructure, so we can use the CELayoutEditor Modified Paths: -------------- branches/ogsector/data/gui/layouts/dialogs/ConfigDialog.layout branches/ogsector/data/gui/layouts/opengateDocked.layout branches/ogsector/resources.cfg branches/ogsector/src/GameStateManager.cpp branches/ogsector/src/SectorObjects.cpp branches/ogsector/src/SectorObjects.h branches/ogsector/src/UnDockedState.cpp Added Paths: ----------- branches/ogsector/data/gui/Falagard.xsd branches/ogsector/data/gui/Falagard.xsx branches/ogsector/data/gui/GUIScheme.xsd branches/ogsector/data/gui/Imageset.xsd branches/ogsector/data/gui/fonts/ branches/ogsector/data/gui/fonts/BlueHighway-10.font branches/ogsector/data/gui/fonts/BlueHighway-12.font branches/ogsector/data/gui/fonts/BlueHighway-14.font branches/ogsector/data/gui/fonts/BlueHighway-16.font branches/ogsector/data/gui/fonts/BlueHighway-18.font branches/ogsector/data/gui/fonts/BlueHighway-8.font branches/ogsector/data/gui/fonts/BlueHighway.ttf branches/ogsector/data/gui/imagesets/ branches/ogsector/data/gui/imagesets/configMain.tga branches/ogsector/data/gui/imagesets/defaultHUD.imageset branches/ogsector/data/gui/imagesets/defaultHUD.tga branches/ogsector/data/gui/imagesets/mainBottomLeft.tga branches/ogsector/data/gui/imagesets/mainBottomMiddle.tga branches/ogsector/data/gui/imagesets/mainBottomRight.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomLeft.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomRight.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalMiddle.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalSide.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalMiddle.tga branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalSide.tga branches/ogsector/data/gui/imagesets/mainLeftLogo90.tga branches/ogsector/data/gui/imagesets/mainRedLine.tga branches/ogsector/data/gui/imagesets/mainRedLineBottom.tga branches/ogsector/data/gui/imagesets/mainRedLineTop.tga branches/ogsector/data/gui/imagesets/mainTopLeft.tga branches/ogsector/data/gui/imagesets/mainTopRight.tga branches/ogsector/data/gui/imagesets/opengate.imageset branches/ogsector/data/gui/imagesets/opengate.tga branches/ogsector/data/gui/looknfeel/ branches/ogsector/data/gui/looknfeel/opengate.looknfeel branches/ogsector/data/gui/looknfeel/opengateButtons.looknfeel branches/ogsector/data/gui/looknfeel/opengateContainers.looknfeel branches/ogsector/data/gui/looknfeel/opengateLists.looknfeel branches/ogsector/data/gui/looknfeel/opengateScroll.looknfeel branches/ogsector/data/gui/looknfeel/opengateStatic.looknfeel branches/ogsector/data/gui/schemes/opengate.scheme Removed Paths: ------------- branches/ogsector/data/gui/schemes/opengate/ Added: branches/ogsector/data/gui/Falagard.xsd =================================================================== --- branches/ogsector/data/gui/Falagard.xsd (rev 0) +++ branches/ogsector/data/gui/Falagard.xsd 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,383 @@ +<?xml version="1.0" ?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xsd:element name="Falagard" type="falagardSpecificationType" /> + <xsd:complexType name="falagardSpecificationType"> + <xsd:sequence> + <xsd:element name="WidgetLook" type="widgetLookType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="widgetLookType"> + <xsd:sequence> + <xsd:element name="PropertyDefinition" type="propertyDefinitionType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="PropertyLinkDefinition" type="propertyLinkDefinitionType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="NamedArea" type="namedAreaType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="Child" type="widgetComponentType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="ImagerySection" type="imagerySectionType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="StateImagery" type="stateType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="propertyDefinitionType"> + <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" /> + <xsd:attribute name="name" type="xsd:string" use="required" /> + <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" /> + <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" /> + </xsd:complexType> + <xsd:complexType name="propertyLinkDefinitionType"> + <xsd:attribute name="type" type="propertyTypeEnum" use="optional" default="Generic" /> + <xsd:attribute name="name" type="xsd:string" use="required" /> + <xsd:attribute name="widget" type="xsd:string" use="required" /> + <xsd:attribute name="targetProperty" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="initialValue" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="layoutOnWrite" type="xsd:boolean" use="optional" default="false" /> + <xsd:attribute name="redrawOnWrite" type="xsd:boolean" use="optional" default="false" /> + </xsd:complexType> + <xsd:complexType name="namedAreaType"> + <xsd:sequence> + <xsd:element name="Area" type="componentAreaType" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="stateType"> + <xsd:sequence> + <xsd:element name="Layer" type="layerType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + <xsd:attribute name="clipped" type="xsd:boolean" use="optional" default="true" /> + </xsd:complexType> + <xsd:complexType name="layerType"> + <xsd:sequence> + <xsd:element name="Section" type="sectionSpecType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="priority" type="xsd:integer" use="optional" default="0" /> + </xsd:complexType> + <xsd:complexType name="sectionSpecType"> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="Colours" type="colourRectType" /> + <xsd:element name="ColourProperty" type="settingByPropertyType" /> + <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:attribute name="look" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="section" type="xsd:string" use="required" /> + <xsd:attribute name="controlProperty" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + <xsd:complexType name="imagerySectionType"> + <xsd:sequence> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="Colours" type="colourRectType" /> + <xsd:element name="ColourProperty" type="settingByPropertyType" /> + <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:element name="FrameComponent" type="frameComponentType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="ImageryComponent" type="imageryComponentType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="TextComponent" type="textComponentType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="frameComponentType"> + <xsd:sequence> + <xsd:element name="Area" type="componentAreaType" /> + <xsd:element name="Image" type="frameImageType" minOccurs="0" maxOccurs="9" /> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="Colours" type="colourRectType" /> + <xsd:element name="ColourProperty" type="settingByPropertyType" /> + <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="VertFormat" type="vertFormatType" /> + <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="HorzFormat" type="horzFormatType" /> + <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="textComponentType"> + <xsd:sequence> + <xsd:element name="Area" type="componentAreaType" /> + <xsd:element name="Text" type="textStringType" minOccurs="0" maxOccurs="1" /> + <xsd:element name="TextProperty" type="textPropertyType" minOccurs="0" maxOccurs="1" /> + <xsd:element name="FontProperty" type="fontPropertyType" minOccurs="0" maxOccurs="1" /> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="Colours" type="colourRectType" /> + <xsd:element name="ColourProperty" type="settingByPropertyType" /> + <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="VertFormat" type="vertTextFormatType" /> + <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="HorzFormat" type="horzTextFormatType" /> + <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="imageryComponentType"> + <xsd:sequence> + <xsd:element name="Area" type="componentAreaType" /> + <xsd:choice> + <xsd:element name="Image" type="imageType" /> + <xsd:element name="ImageProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="Colours" type="colourRectType" /> + <xsd:element name="ColourProperty" type="settingByPropertyType" /> + <xsd:element name="ColourRectProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="VertFormat" type="vertFormatType" /> + <xsd:element name="VertFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="HorzFormat" type="horzFormatType" /> + <xsd:element name="HorzFormatProperty" type="settingByPropertyType" /> + </xsd:choice> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="widgetComponentType"> + <xsd:sequence> + <xsd:element name="Area" type="componentAreaType" /> + <xsd:element name="VertAlignment" type="vertAlignmentType" minOccurs="0" maxOccurs="1" /> + <xsd:element name="HorzAlignment" type="horzAlignmentType" minOccurs="0" maxOccurs="1" /> + <xsd:element name="Property" type="propertyType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="type" type="xsd:string" use="required" /> + <xsd:attribute name="nameSuffix" type="xsd:string" use="required" /> + <xsd:attribute name="renderer" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="look" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + <xsd:complexType name="horzFormatType"> + <xsd:attribute name="type" type="horzFormatEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="vertFormatType"> + <xsd:attribute name="type" type="vertFormatEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="horzTextFormatType"> + <xsd:attribute name="type" type="horzTextFormatEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="vertTextFormatType"> + <xsd:attribute name="type" type="vertTextFormatEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="horzAlignmentType"> + <xsd:attribute name="type" type="horzAlignmentEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="vertAlignmentType"> + <xsd:attribute name="type" type="vertAlignmentEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="propertyType"> + <xsd:attribute name="name" type="xsd:string" use="required" /> + <xsd:attribute name="value" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="imageType"> + <xsd:attribute name="imageset" type="xsd:string" use="required" /> + <xsd:attribute name="image" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="frameImageType"> + <xsd:attribute name="type" type="frameImageComponentEnum" use="required" /> + <xsd:attribute name="imageset" type="xsd:string" use="required" /> + <xsd:attribute name="image" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="componentAreaType"> + <xsd:choice> + <xsd:sequence> + <xsd:element name="Dim" type="dimensionType" minOccurs="4" maxOccurs="4" /> + </xsd:sequence> + <xsd:element name="AreaProperty" type="settingByPropertyType" /> + </xsd:choice> + </xsd:complexType> + <xsd:complexType name="dimensionType"> + <xsd:choice> + <xsd:element name="UnifiedDim" type="unifiedDimType" /> + <xsd:element name="AbsoluteDim" type="absoluteDimType" /> + <xsd:element name="ImageDim" type="imageDimType" /> + <xsd:element name="WidgetDim" type="widgetDimType" /> + <xsd:element name="FontDim" type="fontDimType" /> + <xsd:element name="PropertyDim" type="propertyDimType" /> + </xsd:choice> + <xsd:attribute name="type" type="dimensionTypeEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="fontDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="font" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="string" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="type" type="fontMetricTypeEnum" use="required" /> + <xsd:attribute name="padding" type="xsd:decimal" use="optional" default="0" /> + </xsd:complexType> + <xsd:complexType name="propertyDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="unifiedDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="scale" type="xsd:decimal" use="optional" default="0" /> + <xsd:attribute name="offset" type="xsd:integer" use="optional" default="0" /> + <xsd:attribute name="type" type="dimensionTypeEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="absoluteDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="value" type="xsd:decimal" use="optional" default="0" /> + </xsd:complexType> + <xsd:complexType name="imageDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="imageset" type="xsd:string" use="required" /> + <xsd:attribute name="image" type="xsd:string" use="required" /> + <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="widgetDimType"> + <xsd:sequence> + <xsd:element name="DimOperator" type="dimensionOperatorType" minOccurs="0" maxOccurs="1" /> + </xsd:sequence> + <xsd:attribute name="widget" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="dimension" type="dimensionTypeEnum" use="required" /> + </xsd:complexType> + <xsd:complexType name="settingByPropertyType"> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="colourRectType"> + <xsd:attribute name="topLeft" type="colourValType" use="required" /> + <xsd:attribute name="topRight" type="colourValType" use="required" /> + <xsd:attribute name="bottomLeft" type="colourValType" use="required" /> + <xsd:attribute name="bottomRight" type="colourValType" use="required" /> + </xsd:complexType> + <xsd:simpleType name="colourValType"> + <xsd:restriction base="xsd:string"> + <xsd:pattern value="[a-fA-F0-9]{8}" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:complexType name="textStringType"> + <xsd:attribute name="string" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="font" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + <xsd:complexType name="textPropertyType"> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="fontPropertyType"> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="dimensionOperatorType"> + <xsd:choice> + <xsd:element name="UnifiedDim" type="unifiedDimType" /> + <xsd:element name="AbsoluteDim" type="absoluteDimType" /> + <xsd:element name="ImageDim" type="imageDimType" /> + <xsd:element name="WidgetDim" type="widgetDimType" /> + <xsd:element name="FontDim" type="fontDimType" /> + <xsd:element name="PropertyDim" type="propertyDimType" /> + </xsd:choice> + <xsd:attribute name="op" type="dimensionOperatorEnum" use="required" /> + </xsd:complexType> + <xsd:simpleType name="dimensionTypeEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LeftEdge" /> + <xsd:enumeration value="TopEdge" /> + <xsd:enumeration value="RightEdge" /> + <xsd:enumeration value="BottomEdge" /> + <xsd:enumeration value="XPosition" /> + <xsd:enumeration value="YPosition" /> + <xsd:enumeration value="Width" /> + <xsd:enumeration value="Height" /> + <xsd:enumeration value="XOffset" /> + <xsd:enumeration value="YOffset" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="vertFormatEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="TopAligned" /> + <xsd:enumeration value="CentreAligned" /> + <xsd:enumeration value="BottomAligned" /> + <xsd:enumeration value="Stretched" /> + <xsd:enumeration value="Tiled" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="horzFormatEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LeftAligned" /> + <xsd:enumeration value="CentreAligned" /> + <xsd:enumeration value="RightAligned" /> + <xsd:enumeration value="Stretched" /> + <xsd:enumeration value="Tiled" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="vertAlignmentEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="TopAligned" /> + <xsd:enumeration value="CentreAligned" /> + <xsd:enumeration value="BottomAligned" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="horzAlignmentEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LeftAligned" /> + <xsd:enumeration value="CentreAligned" /> + <xsd:enumeration value="RightAligned" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="horzTextFormatEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LeftAligned" /> + <xsd:enumeration value="RightAligned" /> + <xsd:enumeration value="CentreAligned" /> + <xsd:enumeration value="Justified" /> + <xsd:enumeration value="WordWrapLeftAligned" /> + <xsd:enumeration value="WordWrapRightAligned" /> + <xsd:enumeration value="WordWrapCentreAligned" /> + <xsd:enumeration value="WordWrapJustified" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="vertTextFormatEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="TopAligned" /> + <xsd:enumeration value="BottomAligned" /> + <xsd:enumeration value="CentreAligned" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="propertyTypeEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="Generic" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="fontMetricTypeEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LineSpacing" /> + <xsd:enumeration value="Baseline" /> + <xsd:enumeration value="HorzExtent" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="dimensionOperatorEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="Noop" /> + <xsd:enumeration value="Add" /> + <xsd:enumeration value="Subtract" /> + <xsd:enumeration value="Multiply" /> + <xsd:enumeration value="Divide" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="frameImageComponentEnum"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="Background" /> + <xsd:enumeration value="TopLeftCorner" /> + <xsd:enumeration value="TopRightCorner" /> + <xsd:enumeration value="BottomLeftCorner" /> + <xsd:enumeration value="BottomRightCorner" /> + <xsd:enumeration value="LeftEdge" /> + <xsd:enumeration value="RightEdge" /> + <xsd:enumeration value="TopEdge" /> + <xsd:enumeration value="BottomEdge" /> + </xsd:restriction> + </xsd:simpleType> +</xsd:schema> Added: branches/ogsector/data/gui/Falagard.xsx =================================================================== --- branches/ogsector/data/gui/Falagard.xsx (rev 0) +++ branches/ogsector/data/gui/Falagard.xsx 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.--> +<XSDDesignerLayout /> \ No newline at end of file Added: branches/ogsector/data/gui/GUIScheme.xsd =================================================================== --- branches/ogsector/data/gui/GUIScheme.xsd (rev 0) +++ branches/ogsector/data/gui/GUIScheme.xsd 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,54 @@ +<?xml version="1.0" ?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + <xsd:element name="GUIScheme" type="SchemeType" /> + <xsd:complexType name="SchemeType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="Imageset" type="NamedDataType" /> + <xsd:element name="ImagesetFromImage" type="NamedDataType" /> + <xsd:element name="Font" type="NamedDataType" /> + <xsd:element name="LookNFeel" type="FileDataType" /> + <xsd:element name="WindowSet" type="WindowSetType" /> + <xsd:element name="WindowRendererSet" type="WindowRendererSetType" /> + <xsd:element name="WindowAlias" type="WindowAliasType" /> + <xsd:element name="FalagardMapping" type="FalagardMapType" /> + </xsd:choice> + <xsd:attribute name="Name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="WindowSetType"> + <xsd:sequence> + <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="Filename" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="WindowRendererSetType"> + <xsd:sequence> + <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + <xsd:attribute name="Filename" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="FileDataType"> + <xsd:attribute name="Filename" type="xsd:string" use="required" /> + <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + <xsd:complexType name="NamedDataType"> + <xsd:attribute name="Name" type="xsd:string" use="required" /> + <xsd:attribute name="Filename" type="xsd:string" use="required" /> + <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> + </xsd:complexType> + <xsd:complexType name="WindowFactoryType"> + <xsd:attribute name="Name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="WindowRendererFactoryType"> + <xsd:attribute name="Name" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="WindowAliasType"> + <xsd:attribute name="Alias" type="xsd:string" use="required" /> + <xsd:attribute name="Target" type="xsd:string" use="required" /> + </xsd:complexType> + <xsd:complexType name="FalagardMapType"> + <xsd:attribute name="WindowType" type="xsd:string" use="required" /> + <xsd:attribute name="TargetType" type="xsd:string" use="required" /> + <xsd:attribute name="Renderer" type="xsd:string" use="required" /> + <xsd:attribute name="LookNFeel" type="xsd:string" use="required" /> + </xsd:complexType> +</xsd:schema> Added: branches/ogsector/data/gui/Imageset.xsd =================================================================== --- branches/ogsector/data/gui/Imageset.xsd (rev 0) +++ branches/ogsector/data/gui/Imageset.xsd 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> + + <xsd:element name="Imageset" type="ImagesetType"/> + + <xsd:complexType name="ImagesetType"> + <xsd:sequence> + <xsd:element name="Image" type="ImageType" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="Imagefile" type="xsd:string" use="required"/> + <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" /> + <xsd:attribute name="Name" type="xsd:string" use="required"/> + <xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" /> + <xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" /> + <xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" /> + </xsd:complexType> + + <xsd:complexType name="ImageType"> + <xsd:attribute name="Name" type="xsd:string" use="required"/> + <xsd:attribute name="XPos" type="xsd:nonNegativeInteger" use="required"/> + <xsd:attribute name="YPos" type="xsd:nonNegativeInteger" use="required"/> + <xsd:attribute name="Width" type="xsd:nonNegativeInteger" use="required"/> + <xsd:attribute name="Height" type="xsd:nonNegativeInteger" use="required"/> + <xsd:attribute name="XOffset" type="xsd:integer" use="optional" default="0"/> + <xsd:attribute name="YOffset" type="xsd:integer" use="optional" default="0"/> + </xsd:complexType> + +</xsd:schema> Added: branches/ogsector/data/gui/fonts/BlueHighway-10.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-10.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-10.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="FreeType" Size="10" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway-12.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-12.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-12.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="FreeType" Size="12" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway-14.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-14.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-14.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-14" Filename="BlueHighway.ttf" Type="FreeType" Size="14" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway-16.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-16.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-16.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-16" Filename="BlueHighway.ttf" Type="FreeType" Size="16" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway-18.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-18.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-18.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-18" Filename="BlueHighway.ttf" Type="FreeType" Size="18" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway-8.font =================================================================== --- branches/ogsector/data/gui/fonts/BlueHighway-8.font (rev 0) +++ branches/ogsector/data/gui/fonts/BlueHighway-8.font 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,2 @@ +<?xml version="1.0" ?> +<Font Name="BlueHighway-8" Filename="BlueHighway.ttf" Type="FreeType" Size="8" NativeHorzRes="1024" NativeVertRes="768" AutoScaled="true" /> Added: branches/ogsector/data/gui/fonts/BlueHighway.ttf =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/fonts/BlueHighway.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/configMain.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/configMain.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/defaultHUD.imageset =================================================================== --- branches/ogsector/data/gui/imagesets/defaultHUD.imageset (rev 0) +++ branches/ogsector/data/gui/imagesets/defaultHUD.imageset 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Imageset Name="opengateHUD" Imagefile="defaultHUD.tga"> + <Image Name="FlightCurser" XPos="3" YPos="4" Width="20" Height="20" /> + <Image Name="Center" XPos="0" YPos="30" Width="40" Height="40" /> + <Image Name="TargetCurser" XPos="0" YPos="71" Width="40" Height="40" /> + <Image Name="PilotFlightCurser" XPos="26" YPos="4" Width="20" Height="20" /> + <Image Name="TargetFlightCurser" XPos="45" YPos="71" Width="40" Height="40" /> + <Image Name="GreenShieldLeft" XPos="4" YPos="135" Width="98" Height="280" /> + <Image Name="Velocity" XPos="170" YPos="55" Width="40" Height="146" /> + <Image Name="Capacitor" XPos="213" YPos="55" Width="40" Height="146" /> + <Image Name="CenterUp" XPos="276" YPos="88" Width="162" Height="50" /> + <Image Name="CenterDown" XPos="276" YPos="37" Width="162" Height="50" /> + <Image Name="Thrust" XPos="444" YPos="14" Width="27" Height="124" /> + <Image Name="Fuel" XPos="481" YPos="14" Width="27" Height="124" /> + <Image Name="ArmorRight" XPos="432" YPos="138" Width="39" Height="149" /> + <Image Name="ArmorLeft" XPos="472" YPos="138" Width="39" Height="149" /> + <Image Name="ShieldLeft" XPos="334" YPos="139" Width="48" Height="160" /> + <Image Name="ShieldRight" XPos="384" YPos="139" Width="48" Height="160" /> +</Imageset> Added: branches/ogsector/data/gui/imagesets/defaultHUD.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/defaultHUD.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainBottomLeft.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainBottomLeft.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainBottomMiddle.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainBottomMiddle.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainBottomRight.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainBottomRight.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomLeft.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomLeft.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomRight.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameBottomRight.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalMiddle.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalMiddle.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalSide.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameHorizontalSide.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalMiddle.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalMiddle.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalSide.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainConsoleFrameVerticalSide.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainLeftLogo90.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainLeftLogo90.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainRedLine.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainRedLine.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainRedLineBottom.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainRedLineBottom.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainRedLineTop.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainRedLineTop.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainTopLeft.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainTopLeft.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/mainTopRight.tga =================================================================== (Binary files differ) Property changes on: branches/ogsector/data/gui/imagesets/mainTopRight.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/ogsector/data/gui/imagesets/opengate.imageset =================================================================== --- branches/ogsector/data/gui/imagesets/opengate.imageset (rev 0) +++ branches/ogsector/data/gui/imagesets/opengate.imageset 2007-06-19 14:12:03 UTC (rev 580) @@ -0,0 +1,428 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Imageset Name="opengate" Imagefile="opengate.tga"> + <Image Name="Blank" XPos="492" YPos="6" Width="1" Height="1" /> + <Image Name="ConsoleBackground50" XPos="265" YPos="13" Width="10" Height="10" /> + <Image Name="ConsoleLeftEdge50" XPos="256" YPos="34" Width="3" Height="30" /> + <Image Name="ConsoleRightEdge50" XPos="321" YPos="34" Width="3" Height="30" /> + <Image Name="ConsoleTopEdge50" XPos="277" YPos="5" Width="30" Height="3" /> + <Image Name="ConsoleBottomEdge50" XPos="277" YPos="78" Width="30" Height="3" /> + <Image Name="ConsoleTopLeft" XPos="256" YPos="5" Width="3" Height="3" /> + <Image Name="ConsoleTopRight" XPos="321" YPos="5" Width="3" Height="3" /> + <Image Name="ConsoleBottomLeft" XPos="256" YPos="78" Width="3" Height="3" /> + <Image Name="ConsoleBottomRight" XPos="321" YPos="78" Width="3" Height="3" /> + <Image Name="ScrollThumbLeftNormal" XPos="374" YPos="4" Width="56" Height="14" /> + <Image Name="ScrollThumbLeftHover" XPos="374" YPos="19" Width="56" Height="14" /> + <Image Name="ScrollThumbLeftPushed" XPos="374" YPos="34" Width="56" Height="14" /> + <Image Name="ScrollThumbRightNormal" XPos="432" YPos="4" Width="56" Height="14" /> + <Image Name="ScrollThumbRightHover" XPos="432" YPos="19" Width="56" Height="14" /> + <Image Name="ScrollThumbRightPushed" XPos="432" YPos="34" Width="56" Height="14" /> + <Image Name="ScrollThumbUpNormal" XPos="328" YPos="4" Width="14" Height="56" /> + <Image Name="ScrollThumbUpHover" XPos="343" YPos="4" Width="14" Height="56" /> + <Image Name="ScrollThumbUpPushed" XPos="358" YPos="4" Width="14" Height="56" /> + <Image Name="ScrollThumbDownNormal" XPos="328" YPos="62" Width="14" Height="56" /> + <Image Name="ScrollThumbDownHover" XPos="343" YPos="62" Width="14" Height="56" /> + <Image Name="ScrollThumbDownPushed" XPos="358" YPos="62" Width="14" Height="56" /> + <Image Name="ConsoleScrollThumbUpNormal" XPos="376" YPos="50" Width="10" Height="18" /> + <Image Name="ConsoleScrollThumbUpHover" XPos="387" YPos="50" Width="10" Height="18" /> + <Image Name="ConsoleScrollThumbUpPushed" XPos="398" YPos="50" Width="10" Height="18" /> + <Image Name="ConsoleScrollThumbDownNormal" XPos="376" YPos="71" Width="10" Height="18" /> + <Image Name="ConsoleScrollThumbDownHover" XPos="387" YPos="71" Width="10" Height="18" /> + <Image Name="ConsoleScrollThumbDownPushed" XPos="398" YPos="71" Width="10" Height="18" /> + <Image Name="GreyButtonUpNormal" XPos="409" YPos="50" Width="13" Height="13" /> + <Image Name="GreyButtonUpHover" XPos="424" YPos="50" Width="13" Height="13" /> + <Image Name="GreyButtonUpPushed" XPos="439" YPos="50" Width="13" Height="13" /> + <Image Name="GreyButtonDownNormal" XPos="409" YPos="65" Width="13" Height="13" /> + <Image Name="GreyButtonDownHover" XPos="424" YPos="65" Width="13" Height="13" /> + <Image Name="GreyButtonDownPushed" XPos="439" YPos="65" Width="13" Height="13" /> + <Image Name="RoundConfigButtonNormal" XPos="372" YPos="92" Width="18" Height="18" /> + <Image Name="RoundConfigButtonHover" XPos="391" YPos="92" Width="18" Height="18" /> + <Image Name="RoundConfigButtonPushed" XPos="410" YPos="92" Width="18" Height="18" /> + <Image Name="RoundHelpButtonNormal" XPos="372" YPos="111" Width="18" Height="18" /> + <Image Name="RoundHelpButtonHover" XPos="391" YPos="111" Width="18" Height="18" /> + <Image Name="RoundHelpButtonPushed" XPos="410" YPos="111" Width="18" Height="18" /> + <Image Name="ConsoleMouseTextBar" XPos="313" YPos="89" Width="5" Height="14" /> + <Image Name="ConsoleMouseEditBoxCarat" XPos="308" YPos="89" Width="1" Height="14" /> + + <Image Name="StaticGreenTopLeft" XPos="301" YPos="151" Width="31" Height="31" /> + <Image Name="StaticGreenTop" XPos="340" YPos="151" Width="20" Height="31" /> + <Image Name="StaticGreenTopRight" XPos="369" YPos="151" Width="31" Height="31" /> + <Image Name="StaticGreenLeft" XPos="301" YPos="185" Width="31" Height="20" /> + <Image Name="StaticGreenBackdrop" XPos="350" YPos="200" Width="2" Height="2" /> + <Image Name="StaticGreenRight" XPos="369" YPos="185" Width="31" Height="20" /> + <Image Name="StaticGreenBottomLeft" XPos="302" YPos="219" Width="31" Height="31" /> + <Image Name="StaticGreenBottom" XPos="335" YPos="219" Width="20" Height="31" /> + <Image Name="StaticGreenBottomRight" XPos="369" YPos="219" Width="31" Height="31" /> + <Image Name="StaticGreenHorizLine" XPos="340" YPos="151" Width="20" Height="1" /> + <Image Name="StaticGreenVertLine" XPos="301" YPos="185" Width="1" Height="20" /> + + <Image Name="StaticBlueTopLeft" XPos="400" YPos="151" Width="6" Height="6" /> + <Image Name="StaticBlueTop" XPos="410" YPos="151" Width="6" Height="6" /> + <Image Name="StaticBlueTopRight" XPos="424" YPos="151" Width="6" Height="6" /> + <Image Name="StaticBlueLeft" XPos="400" YPos="161" Width="6" Height="6" /> + <Image Name="StaticBlueBackdrop" XPos="411" YPos="162" Width="2" Height="2" /> + <Image Name="StaticBlueRight" XPos="424" YPos="161" Width="6" Height="6" /> + <Image Name="StaticBlueBottomLeft" XPos="400" YPos="175" Width="6" Height="6" /> + <Image Name="StaticBlueBottom" XPos="410" YPos="175" Width="6" Height="6" /> + <Image Name="StaticBlueBottomRight" XPos="424" YPos="175" Width="6" Height="6" /> + + <Image Name="IconCommodityNormal" XPos="142" YPos="256" Width="15" Height="15" /> + <Image Name="IconCommodityHover" XPos="142" YPos="272" Width="15" Height="15" /> + <Image Name="IconCommodity0" XPos="142" YPos="288" Width="15" Height="15" /> + <Image Name="IconCommodity1" XPos="142" YPos="304" Width="15" Height="15" /> + <Image Name="IconCommodity2" XPos="142" YPos="320" Width="15" Height="15" /> + <Image Name="IconCommodity3" XPos="142" YPos="336" Width="15" Height="15" /> + <Image Name="IconPowerplantNormal" XPos="158" YPos="256" Width="15" Height="15" /> + <Image Name="IconPowerplantHover" XPos="158" YPos="272" Width="15" Height="15" /> + <Image Name="IconPowerplant0" XPos="158" YPos="288" Width="15" Height="15" /> + <Image Name="IconPowerplant1" XPos="158" YPos="304" Width="15" Height="15" /> + <Image Name="IconPowerplant2" XPos="158" YPos="320" Width="15" Height="15" /> + <Image Name="IconPowerplant3" XPos="158" YPos="336" Width="15" Height="15" /> + <Image Name="IconEngineNormal" XPos="174" YPos="256" Width="16" Height="15" /> + <Image Name="IconEngineHover" XPos="174" YPos="272" Width="16" Height="15" /> + <Image Name="IconEngine0" XPos="174" YPos="288" Width="15" Height="15" /> + <Image Name="IconEngine1" XPos="174" YPos="304" Width="15" Height="15" /> + <Image Name="IconEngine2" XPos="174" YPos="320" Width="15" Height="15" /> + <Image Name="IconEngine3" XPos="174" YPos="336" Width="15" Height="15" /> + <Image Name="IconRadarNormal" XPos="190" YPos="256" Width="15" Height="15" /> + <Image Name="IconRadarHover" XPos="190" YPos="272" Width="15" Height="15" /> + <Image Name="IconRadar0" XPos="190" YPos="288" Width="15" Height="15" /> + <Image Name="IconRadar1" XPos="190" YPos="304" Width="15" Height="15" /> + <Image Name="IconRadar2" XPos="190" YPos="320" Width="15" Height="15" /> + <Image Name="IconRadar3" XPos="190" YPos="336" Width="15" Height="15" /> + <Image Name="IconECMNormal" XPos="206" YPos="256" Width="15" Height="15" /> + <Image Name="IconECMHover" XPos="206" YPos="272" Width="15" Height="15" /> + <Image Name="IconECM0" XPos="206" YPos="288" Width="15" Height="15" /> + <Image Name="IconECM1" XPos="206" YPos="304" Width="15" Height="15" /> + <Image Name="IconECM2" XPos="206" YPos="320" Width="15" Height="15" /> + <Image Name="IconECM3" XPos="206" YPos="336" Width="15" Height="15" /> + <Image Name="IconCapacitorNormal" XPos="222" YPos="256" Width="15" Height="15" /> + <Image Name="IconCapacitorHover" XPos="222" YPos="272" Width="15" Height="15" /> + <Image Name="IconCapacitor0" XPos="222" YPos="288" Width="15" Height="15" /> + <Image Name="IconCapacitor1" XPos="222" YPos="304" Width="15" Height="15" /> + <Image Name="IconCapacitor2" XPos="222" YPos="320" Width="15" Height="15" /> + <Image Name="IconCapacitor3" XPos="222" YPos="336" Width="15" Height="15" /> + <Image Name="IconShieldNormal" XPos="238" YPos="256" Width="15" Height="15" /> + <Image Name="IconShieldHover" XPos="238" YPos="272" Width="15" Height="15" /> + <Image Name="IconShield0" XPos="238" YPos="288" Width="15" Height="15" /> + <Image Name="IconShield1" XPos="238" YPos="304" Width="15" Height="15" /> + <Image Name="IconShield2" XPos="238" YPos="320" Width="15" Height="15" /> + <Image Name="IconShield3" XPos="238" YPos="336" Width="15" Height="15" /> + <Image Name="IconGunNormal" XPos="254" YPos="256" Width="15" Height="15" /> + <Image Name="IconGunHover" XPos="254" YPos="272" Width="15" Height="15" /> + <Image Name="IconGun0" XPos="254" YPos="288" Width="15" Height="15" /> + <Image Name="IconGun1" XPos="254" YPos="304" Width="15" Height="15" /> + <Image Name="IconGun2" XPos="254" YPos="320" Width="15" Height="15" /> + <Image Name="IconGun3" XPos="254" YPos="336" Width="15" Height="15" /> + <Image Name="IconMissileNormal" XPos="270" YPos="256" Width="15" Height="15" /> + <Image Name="IconMissileHover" XPos="270" YPos="272" Width="15" Height="15" /> + <Image Name="IconMissile0" XPos="270" YPos="288" Width="15" Height="15" /> + <Image Name="IconMissile1" XPos="270" YPos="304" Width="15" Height="15" /> + <Image Name="IconMissile2" XPos="270" YPos="320" Width="15" Height="15" /> + <Image Name="IconMissile3" XPos="270" YPos="336" Width="15" Height="15" /> + <Image Name="IconMODxNormal" XPos="286" YPos="256" Width="15" Height="15" /> + <Image Name="IconMODxHover" XPos="286" YPos="272" Width="15" Height="15" /> + <Image Name="IconMODx0" XPos="286" YPos="288" Width="15" Height="15" /> + <Image Name="IconMODx1" XPos="286" YPos="304" Width="15" Height="15" /> + <Image Name="IconMODx2" XPos="286" YPos="320" Width="15" Height="15" /> + <Image Name="IconMODx3" XPos="286" YPos="336" Width="15" Height="15" /> + <Image Name="IconStorageNormal" XPos="410" YPos="256" Width="15" Height="15" /> + <Image Name="IconStorageHover" XPos="426" YPos="256" Width="15" Height="15" /> + + <Image Name="IconSize1" XPos="473" YPos="223" Width="12" Height="26" /> + <Image Name="IconSize2" XPos="460" YPos="223" Width="12" Height="26" /> + <Image Name="IconSize3" XPos="447" YPos="223" Width="12" Height="26" /> + <Image Name="IconSize4" XPos="499" YPos="250" Width="12" Height="26" /> + <Image Name="IconSize5" XPos="486" YPos="250" Width="12" Height="26" /> + <Image Name="IconSize6" XPos="473" YPos="250" Width="12" Height="26" /> + <Image Name="IconSize7" XPos="460" YPos="250" Width="12" Height="26" /> + <Image Name="IconSize8" XPos="447" YPos="250" Width="12" Height="26" /> + + <Image Name="MarketItemShortInfoNormal" XPos="302" YPos="256" Width="98" Height="106" /> + <Image Name="MarketItemShortInfoHover" XPos="302" YPos="364" Width="98" Height="106" /> + + <Image Name="MarketItemSortFrameNormal" XPos="410" YPos="182" Width="16" Height="16" /> + <Image Name="MarketItemSortFrameHover" XPos="410" YPos="199" Width="16" Height="16" /> + <Image Name="MarketItemSortHighlight" XPos="478" YPos="312" Width="16" Height="16" /> + + <Image Name="MarketItemSortAlphaAscendNormal" XPos="410" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortAlphaAscendHover" XPos="410" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortAlphaDescendNormal" XPos="427" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortAlphaDescendHover" XPos="427" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortCostNormal" XPos="444" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortCostHover" XPos="444" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortSizeAscendNormal" XPos="461" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortSizeAscendHover" XPos="461" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortSizeDescendNormal" XPos="478" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortSizeDescendHover" XPos="478" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortRankNormal" XPos="495" YPos="278" Width="16" Height="16" /> + <Image Name="MarketItemSortRankHover" XPos="495" YPos="295" Width="16" Height="16" /> + <Image Name="MarketItemSortAmountAscendNormal" XPos="410" YPos="312" Width="16" Height="16" /> + <Image Name="MarketItemSortAmountAscendHover" XPos="410" YPos="329" Width="16" Height="16" /> + <Image Name="MarketItemSortAmountDescendNormal" XPos="427" YPos="312" Width="16" Height="16" /> + <Image Name="MarketItemSortAmountDescendHover" XPos="427" YPos="329" Width="16" Height="16" /> + <Image Name="MarketItemSortAscendNormal" XPos="444" YPos="312" Width="16" Height="16" /> + <Image Name="MarketItemSortAscendHover" XPos="444" YPos="329" Width="16" Height="16" /> + <Image Name="MarketItemSortDescendNormal" XPos="461" YPos="312" Width="16" Height="16" /> + <Image Name="MarketItemSortDescendHover" XPos="461" YPos="329" Width="16" Height="16" /> + <Image Name="MarketItemSortShowAllNormal" XPos="410" YPos="346" Width="61" Height="16" /> + <Image Name="MarketItemSortShowAllHover" XPos="410" YPos="363" Width="61" Height="16" /> + <Image Name="MarketItemSortShowAllHighlight" XPos="410" YPos="380" Width="61" Height="16" /> + + <Image Name="MarketDecrease1Normal" XPos="431" YPos="85" Width="22" Height="17" /> + <Image Name="MarketDecrease1Hover" XPos="454" YPos="85" Width="22" Height="17" /> + <Image Name="MarketDecrease1Pushed" XPos="477" YPos="85" Width="22" Height="17" /> + <Image Name="MarketDecrease10Normal" XPos="431" YPos="103" Width="22" Height="17" /> + <Image Name="MarketDecrease10Hover" XPos="454" YPos="103" Width="22" Height="17" /> + <Image Name="MarketDecrease10Pushed" XPos="477" YPos="103" Width="22" Height="17" /> + <Image Name="MarketDecrease100Normal" XPos="431" YPos="121" Width="22" Height="17" /> + <Image Name="MarketDecrease100Hover" XPos="454" YPos="121" Width="22" Height="17" /> + <Image Name="MarketDecrease100Pushed" XPos="477" YPos="121" Width="22" Height="17" /> + <Image Name="MarketIncrease1Normal" XPos="431" YPos="139" Width="22" Height="17" /> + <Image Name="MarketIncrease1Hover" XPos="454" YPos="139" Width="22" Height="17" /> + <Image Name="MarketIncrease1Pushed" XPos="477" YPos="139" Width="22" Height="17" /> + <Image Name="MarketIncrease10Normal" XPos="431" YPos="157" Width="22" Height="17" /> + <Image Name="MarketIncrease10Hover" XPos="454" YPos="157" Width="22" Height="17" /> + <Image Name="MarketIncrease10Pushed" XPos="477" YPos="157" Width="22" Height="17" /> + <Image Name="MarketIncrease100Normal" XPos="431" YPos="175" Width="22" Height="17" /> + <Image Name="MarketIncrease100Hover" XPos="454" YPos="175" Width="22" Height="17" /> + <Image Name="MarketIncrease100Pushed" XPos="477" YPos="175" Width="22" Height="17" /> + <Image Name="MarketSellAllNormal" XPos="431" YPos="193" Width="22" Height="17" /> + <Image Name="MarketSellAllHover" XPos="454" YPos="193" Width="22" Height="17" /> + <Image Name="MarketSellAllPushed" XPos="477" YPos="193" Width="22" Height="17" /> + + <Image Name="ShipConfigEquipmentItemWindowNormal" XPos="1" YPos="405" Width="121" Height="106" /> + <Image Name="ShipConfigEquipmentItemWindowHover" XPos="123" YPos="405" Width="121" Height="106" /> + <Image Name="ShipConfigEquipmentLoadBlue" XPos="245" YPos="405" Width="28" Height="21" /> + <Image Name="ShipConfigEquipmentLoadGreen" XPos="245" YPos="426" Width="28" Height="21" /> + <Image Name="ShipConfigEquipmentLoadRed" XPos="245" YPos="447" Width="28" Height="21" /> + <Image Name="ShipConfigEquipmentRightArrow" XPos="245" YPos="468" Width="14" Height="12" /> + <Image Name="ShipConfigEquipmentLeftArrow" XPos="245" YPos="481" Width="14" Height="12" /> + <Image Name="ShipConfigEquipmentPrevItemNormal" XPos="274" YPos="405" Width="11" Height="21" /> + <Image Name="ShipConfigEquipmentPrevItemHover" XPos="274" YPos="427" Width="11" Height="21" /> + <Image Name="ShipConfigEquipmentNextItemNormal" XPos="286" YPos="405" Width="11" Height="21" /> + <Image Name="ShipConfigEquipmentNextItemHover" XPos="286" YPos="427" Width="11" Height="21" /> + + + + <Image Name="AltProgressLeft" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressMiddle" XPos="20" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressRight" XPos="30" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressHalf" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight1" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight10" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight2" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight3" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight4" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight5" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight6" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight7" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight8" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressLight9" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="AltProgressQuarter" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="ButtonLeftHighlight" XPos="91" YPos="9" Width="8" Height="26" /> + <Image Name="ButtonMiddleHighlight" XPos="97" YPos="9" Width="5" Height="26" /> + <Image Name="ButtonRightHighlight" XPos="100" YPos="9" Width="8" Height="26" /> + <Image Name="ButtonLeftNormal" XPos="73" YPos="9" Width="8" Height="26" /> + <Image Name="ButtonMiddleNormal" XPos="82" YPos="9" Width="2" Height="26" /> + <Image Name="ButtonRightNormal" XPos="82" YPos="9" Width="8" Height="26" /> + <Image Name="ButtonLeftPushed" XPos="109" YPos="9" Width="8" Height="26" /> + <Image Name="ButtonMiddlePushed" XPos="115" YPos="9" Width="4" Height="26" /> + <Image Name="ButtonRightPushed" XPos="118" YPos="9" Width="8" Height="26" /> + <Image Name="CheckboxHover" XPos="100" YPos="79" Width="12" Height="12" /> + <Image Name="CheckboxMark" XPos="119" YPos="79" Width="12" Height="12" /> + <Image Name="CheckboxNormal" XPos="77" YPos="79" Width="12" Height="12" /> + <Image Name="ClientBrush" XPos="20" YPos="34" Width="29" Height="22" /> + <Image Name="CloseButtonHover" XPos="35" YPos="166" Width="14" Height="14" /> + <Image Name="CloseButtonNormal" XPos="20" YPos="166" Width="14" Height="14" /> + <Image Name="CloseButtonPressed" XPos="50" YPos="166" Width="14" Height="14" /> + <Image Name="ComboboxDividerLeft" XPos="10" YPos="10" Width="10" Height="10" /> + <Image Name="ComboboxDividerMiddle" XPos="20" YPos="10" Width="10" Height="10" /> + <Image Name="ComboboxDividerRight" XPos="30" YPos="10" Width="10" Height="10" /> + <Image Name="ComboboxEditLeft" XPos="153" YPos="11" Width="7" Height="23" /> + <Image Name="ComboboxEditMiddle" XPos="164" YPos="11" Width="8" Height="23" /> +... [truncated message content] |
From: <ult...@us...> - 2007-06-19 02:17:11
|
Revision: 579 http://svn.sourceforge.net/opengate/?rev=579&view=rev Author: ultrasick Date: 2007-06-18 19:17:14 -0700 (Mon, 18 Jun 2007) Log Message: ----------- deleteing files with old image format + uploading new image format Added Paths: ----------- trunk/data/commodities/ammunition_290x290.png trunk/data/commodities/ammunition_76x76.png trunk/data/commodities/armor_290x290.png trunk/data/commodities/armor_76x76.png trunk/data/commodities/fuel_cells_290x290.png trunk/data/commodities/fuel_cells_76x76.png trunk/data/commodities/gold_290x290.png trunk/data/commodities/gold_76x76.png trunk/data/commodities/ice_290x290.png trunk/data/commodities/ice_76x76.png trunk/data/commodities/manufactured_foods_290x290.png trunk/data/commodities/manufactured_foods_76x76.png trunk/data/commodities/organic_foods_290x290.png trunk/data/commodities/organic_foods_76x76.png trunk/data/commodities/tauseti_flashback_290x290.png trunk/data/commodities/tauseti_flashback_76x76.png Removed Paths: ------------- trunk/data/commodities/ammunition.png trunk/data/commodities/armor.png trunk/data/commodities/fuel_cells.png trunk/data/commodities/gold.png trunk/data/commodities/ice.png trunk/data/commodities/manufactured_foods.png trunk/data/commodities/organic_foods.png trunk/data/commodities/tauseti_flashback.png Deleted: trunk/data/commodities/ammunition.png =================================================================== (Binary files differ) Added: trunk/data/commodities/ammunition_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/ammunition_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/ammunition_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/ammunition_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/armor.png =================================================================== (Binary files differ) Added: trunk/data/commodities/armor_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/armor_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/armor_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/armor_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/fuel_cells.png =================================================================== (Binary files differ) Added: trunk/data/commodities/fuel_cells_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/fuel_cells_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/fuel_cells_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/fuel_cells_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/gold.png =================================================================== (Binary files differ) Added: trunk/data/commodities/gold_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/gold_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/gold_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/gold_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/ice.png =================================================================== (Binary files differ) Added: trunk/data/commodities/ice_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/ice_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/ice_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/ice_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/manufactured_foods.png =================================================================== (Binary files differ) Added: trunk/data/commodities/manufactured_foods_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/manufactured_foods_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/manufactured_foods_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/manufactured_foods_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/organic_foods.png =================================================================== (Binary files differ) Added: trunk/data/commodities/organic_foods_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/organic_foods_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/organic_foods_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/organic_foods_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/tauseti_flashback.png =================================================================== (Binary files differ) Added: trunk/data/commodities/tauseti_flashback_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/tauseti_flashback_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/tauseti_flashback_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/tauseti_flashback_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-19 01:59:16
|
Revision: 578 http://svn.sourceforge.net/opengate/?rev=578&view=rev Author: ultrasick Date: 2007-06-18 18:59:03 -0700 (Mon, 18 Jun 2007) Log Message: ----------- deleteing files with old image format + uploading new image format Added Paths: ----------- trunk/data/commodities/cpu_290x290.png trunk/data/commodities/cpu_76x76.png trunk/data/commodities/helium_290x290.png trunk/data/commodities/helium_76x76.png trunk/data/commodities/nitrogen_290x290.png trunk/data/commodities/nitrogen_76x76.png Removed Paths: ------------- trunk/data/commodities/cpu.png trunk/data/commodities/helium.png trunk/data/commodities/medical_supplies.png trunk/data/commodities/nitrogen.png Deleted: trunk/data/commodities/cpu.png =================================================================== (Binary files differ) Added: trunk/data/commodities/cpu_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpu_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/cpu_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/cpu_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/helium.png =================================================================== (Binary files differ) Added: trunk/data/commodities/helium_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/helium_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/helium_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/helium_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/medical_supplies.png =================================================================== (Binary files differ) Deleted: trunk/data/commodities/nitrogen.png =================================================================== (Binary files differ) Added: trunk/data/commodities/nitrogen_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/nitrogen_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/nitrogen_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/nitrogen_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ult...@us...> - 2007-06-19 01:55:07
|
Revision: 577 http://svn.sourceforge.net/opengate/?rev=577&view=rev Author: ultrasick Date: 2007-06-18 18:55:07 -0700 (Mon, 18 Jun 2007) Log Message: ----------- deleteing files with old image format + uploading new image format + renaming conflux to squadrok Added Paths: ----------- trunk/data/commodities/chemicals_290x290.png trunk/data/commodities/chemicals_76x76.png trunk/data/commodities/iron_290x290.png trunk/data/commodities/iron_76x76.png trunk/data/commodities/medical_supplies_290x290.png trunk/data/commodities/medical_supplies_76x76.png trunk/data/commodities/octavia_light_290x290.png trunk/data/commodities/octavia_light_76x76.png trunk/data/commodities/squadrok_biomass.blend trunk/data/commodities/squadrok_biomass.xml trunk/data/commodities/squadrok_biomass_290x290.png trunk/data/commodities/squadrok_biomass_76x76.png Removed Paths: ------------- trunk/data/commodities/chemicals.png trunk/data/commodities/conflux_biomass.blend trunk/data/commodities/conflux_biomass.png trunk/data/commodities/conflux_biomass.xml trunk/data/commodities/iron.png trunk/data/commodities/octavia_light.png Deleted: trunk/data/commodities/chemicals.png =================================================================== (Binary files differ) Added: trunk/data/commodities/chemicals_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/chemicals_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/chemicals_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/chemicals_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/conflux_biomass.blend =================================================================== (Binary files differ) Deleted: trunk/data/commodities/conflux_biomass.png =================================================================== (Binary files differ) Deleted: trunk/data/commodities/conflux_biomass.xml =================================================================== (Binary files differ) Deleted: trunk/data/commodities/iron.png =================================================================== (Binary files differ) Added: trunk/data/commodities/iron_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/iron_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/iron_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/iron_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/medical_supplies_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/medical_supplies_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/medical_supplies_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/medical_supplies_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/data/commodities/octavia_light.png =================================================================== (Binary files differ) Added: trunk/data/commodities/octavia_light_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/octavia_light_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/octavia_light_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/octavia_light_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/squadrok_biomass.blend =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/squadrok_biomass.blend ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/squadrok_biomass.xml =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/squadrok_biomass.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Name: svn:eol-style + native Added: trunk/data/commodities/squadrok_biomass_290x290.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/squadrok_biomass_290x290.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/commodities/squadrok_biomass_76x76.png =================================================================== (Binary files differ) Property changes on: trunk/data/commodities/squadrok_biomass_76x76.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |