Menu
▾
▴
opengate-svn — List for Subversion commits
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-08-31 12:53:04
|
Revision: 705
http://opengate.svn.sourceforge.net/opengate/?rev=705&view=rev
Author: ultrasick
Date: 2007-08-31 05:53:01 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
click32.wav -> click.ogg
+ deleted click.wav and click32.wav
Added Paths:
-----------
trunk/data/sounds/GUI/click.ogg
Removed Paths:
-------------
trunk/data/sounds/GUI/click.wav
trunk/data/sounds/GUI/click32.wav
Added: trunk/data/sounds/GUI/click.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/GUI/click.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/GUI/click.wav
===================================================================
(Binary files differ)
Deleted: trunk/data/sounds/GUI/click32.wav
===================================================================
(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-08-31 12:50:59
|
Revision: 704
http://opengate.svn.sourceforge.net/opengate/?rev=704&view=rev
Author: ultrasick
Date: 2007-08-31 05:51:00 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
increased the quality of the ogg files
Modified Paths:
--------------
trunk/data/sounds/guns/laser.ogg
trunk/data/sounds/guns/laser2.ogg
trunk/data/sounds/modifications/camera.ogg
trunk/data/sounds/sectors/sentinel_1.ogg
trunk/data/sounds/sectors/sentinel_2.ogg
trunk/data/sounds/sectors/sentinel_3.ogg
trunk/data/sounds/sectors/sentinel_4.ogg
Modified: trunk/data/sounds/guns/laser.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/guns/laser2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/modifications/camera.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/sectors/sentinel_1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/sectors/sentinel_2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/sectors/sentinel_3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sounds/sectors/sentinel_4.ogg
===================================================================
(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-08-31 12:18:34
|
Revision: 703
http://opengate.svn.sourceforge.net/opengate/?rev=703&view=rev
Author: ultrasick
Date: 2007-08-31 05:18:32 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
wav -> ogg
+ deleting the silence in the laser2 file
Added Paths:
-----------
trunk/data/sounds/guns/laser.ogg
trunk/data/sounds/guns/laser2.ogg
trunk/data/sounds/modifications/camera.ogg
trunk/data/sounds/sectors/sentinel_1.ogg
trunk/data/sounds/sectors/sentinel_2.ogg
trunk/data/sounds/sectors/sentinel_3.ogg
trunk/data/sounds/sectors/sentinel_4.ogg
Removed Paths:
-------------
trunk/data/sounds/guns/laser.wav
trunk/data/sounds/guns/laser2.wav
trunk/data/sounds/modifications/camera.wav
trunk/data/sounds/sectors/sentinel_1.wav
trunk/data/sounds/sectors/sentinel_2.wav
trunk/data/sounds/sectors/sentinel_3.wav
trunk/data/sounds/sectors/sentinel_4.wav
Added: trunk/data/sounds/guns/laser.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/guns/laser.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/guns/laser.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/guns/laser2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/guns/laser2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/guns/laser2.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/modifications/camera.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/modifications/camera.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/modifications/camera.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/sectors/sentinel_1.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_1.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/sectors/sentinel_1.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/sectors/sentinel_2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/sectors/sentinel_2.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/sectors/sentinel_3.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_3.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/sectors/sentinel_3.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/sectors/sentinel_4.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_4.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/sectors/sentinel_4.wav
===================================================================
(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-08-31 11:45:57
|
Revision: 702
http://opengate.svn.sourceforge.net/opengate/?rev=702&view=rev
Author: ultrasick
Date: 2007-08-31 04:45:55 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
new image format for testing purposes
Added Paths:
-----------
trunk/data/capacitors/alembic_big.png
trunk/data/capacitors/alembic_small.png
Added: trunk/data/capacitors/alembic_big.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/alembic_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic_small.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-08-27 18:04:48
|
Revision: 701
http://opengate.svn.sourceforge.net/opengate/?rev=701&view=rev
Author: ultrasick
Date: 2007-08-27 11:04:51 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
"curser"->"cursor"
Modified Paths:
--------------
branches/ogsector/ToDo
branches/ogsector/data/gui/imagesets/cursor.imageset
branches/ogsector/data/gui/imagesets/defaultHUD.imageset
branches/ogsector/data/gui/layouts/opengateUnDocked.layout
branches/ogsector/data/gui/schemes/opengate.scheme
branches/ogsector/data/materials/mousePointer.material
branches/ogsector/data/materials/simpleHUD.material
branches/ogsector/data/simpleHUD.overlay
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
Added Paths:
-----------
branches/ogsector/data/textures/flightCursor.png
Removed Paths:
-------------
branches/ogsector/data/textures/flightCurser.png
Modified: branches/ogsector/ToDo
===================================================================
--- branches/ogsector/ToDo 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/ToDo 2007-08-27 18:04:51 UTC (rev 701)
@@ -30,7 +30,7 @@
- Position,
- Speed/MaxSpeed
- Acceleration
- - Mousecurser
+ - Mousecursor
- Bullseye/VCT-1 (Duelist)
- JG-like Radar
@@ -47,7 +47,7 @@
- cleaning / refaktoring
- integrate in currect OpenGate framework
# - add licence header
- - mark third persons thingies (mousecurser, skybox)
+ - mark third persons thingies (mousecursor, skybox)
#ALT-TAB - free mousepointer from widget contents
- fullscreen switch (probably not supported by ogre)
- show Whos online
Modified: branches/ogsector/data/gui/imagesets/cursor.imageset
===================================================================
--- branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-27 18:04:51 UTC (rev 701)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Imageset Name="opengateCurser" Imagefile="cursor.png">
+<Imageset Name="opengateCursor" Imagefile="cursor.png">
<Image Name="Cursor1" XPos="00" YPos="00" Width="21" Height="21" />
<Image Name="Cursor2" XPos="21" YPos="00" Width="21" Height="21" />
<Image Name="Cursor3" XPos="42" YPos="00" Width="21" Height="21" />
Modified: branches/ogsector/data/gui/imagesets/defaultHUD.imageset
===================================================================
--- branches/ogsector/data/gui/imagesets/defaultHUD.imageset 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/gui/imagesets/defaultHUD.imageset 2007-08-27 18:04:51 UTC (rev 701)
@@ -1,10 +1,10 @@
<?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="FlightCursor" 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="TargetCursor" XPos="0" YPos="71" Width="40" Height="40" />
+ <Image Name="PilotFlightCursor" XPos="26" YPos="4" Width="20" Height="20" />
+ <Image Name="TargetFlightCursor" 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" />
Modified: branches/ogsector/data/gui/layouts/opengateUnDocked.layout
===================================================================
--- branches/ogsector/data/gui/layouts/opengateUnDocked.layout 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/gui/layouts/opengateUnDocked.layout 2007-08-27 18:04:51 UTC (rev 701)
@@ -100,12 +100,12 @@
<Property Name="Image" Value="set:opengateHUD image:Capacitor" />
</Window>
</Window>
- <Window Type="opengate/StaticImage" Name="HUDFlightCurser">
+ <Window Type="opengate/StaticImage" Name="HUDFlightCursor">
<Property Name="UnifiedPosition" Value="{{0.5,-20},{0.5,-20}}" />
<Property Name="UnifiedSize" Value="{{0.0,20},{0.0,20}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengateHUD image:FlightCurser" />
+ <Property Name="Image" Value="set:opengateHUD image:FlightCursor" />
</Window>
<Window Type="opengate/StaticImage" Name="HUDCenter">
<Property Name="UnifiedPosition" Value="{{0.5,-20},{0.5,-20}}" />
@@ -114,26 +114,26 @@
<Property Name="FrameEnabled" Value="False" />
<Property Name="Image" Value="set:opengateHUD image:Center" />
</Window>
- <Window Type="opengate/StaticImage" Name="HUDTargetCurser">
+ <Window Type="opengate/StaticImage" Name="HUDTargetCursor">
<Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
<Property Name="UnifiedSize" Value="{{0.0,40},{0.0,40}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengateHUD image:TargetCurser" />
+ <Property Name="Image" Value="set:opengateHUD image:TargetCursor" />
</Window>
- <Window Type="opengate/StaticImage" Name="HUDPilotFlightCurser">
+ <Window Type="opengate/StaticImage" Name="HUDPilotFlightCursor">
<Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
<Property Name="UnifiedSize" Value="{{0.0,20},{0.0,20}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengateHUD image:PilotFlightCurser" />
+ <Property Name="Image" Value="set:opengateHUD image:PilotFlightCursor" />
</Window>
- <Window Type="opengate/StaticImage" Name="HUDTargetFlightCurser">
+ <Window Type="opengate/StaticImage" Name="HUDTargetFlightCursor">
<Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
<Property Name="UnifiedSize" Value="{{0.0,40},{0.0,40}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengateHUD image:TargetFlightCurser" />
+ <Property Name="Image" Value="set:opengateHUD image:TargetFlightCursor" />
</Window>
<Window Type="opengate/StaticText" Name="HUDVelocityText">
Modified: branches/ogsector/data/gui/schemes/opengate.scheme
===================================================================
--- branches/ogsector/data/gui/schemes/opengate.scheme 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/gui/schemes/opengate.scheme 2007-08-27 18:04:51 UTC (rev 701)
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<GUIScheme Name="opengate">
<Imageset Name="opengate" Filename="opengate.imageset" />
- <Imageset Name="opengateCurser" Filename="cursor.imageset" />
+ <Imageset Name="opengateCursor" Filename="cursor.imageset" />
<Imageset Name="opengateHUD" Filename="defaultHUD.imageset" />
<ImagesetFromImage Name="MainWindowTopLeft" Filename="mainTopLeft.tga" />
Modified: branches/ogsector/data/materials/mousePointer.material
===================================================================
--- branches/ogsector/data/materials/mousePointer.material 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/materials/mousePointer.material 2007-08-27 18:04:51 UTC (rev 701)
@@ -1,4 +1,4 @@
-//material OpenGate/FlightCurser
+//material OpenGate/FlightCursor
//{
// technique
// {
@@ -10,7 +10,7 @@
//
// texture_unit
// {
-// texture textures/flightCurser.png
+// texture textures/flightCursor.png
// }
// }
// }
Modified: branches/ogsector/data/materials/simpleHUD.material
===================================================================
--- branches/ogsector/data/materials/simpleHUD.material 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/materials/simpleHUD.material 2007-08-27 18:04:51 UTC (rev 701)
@@ -15,7 +15,7 @@
}
}
-material SimpleHUD/FlightCurser
+material SimpleHUD/FlightCursor
{
technique
{
@@ -27,7 +27,7 @@
texture_unit
{
- texture textures/flightCurser.png
+ texture textures/flightCursor.png
}
}
}
Modified: branches/ogsector/data/simpleHUD.overlay
===================================================================
--- branches/ogsector/data/simpleHUD.overlay 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/data/simpleHUD.overlay 2007-08-27 18:04:51 UTC (rev 701)
@@ -91,14 +91,14 @@
// material SimpleHUD/CenterPointer
// }
//
- container Panel(SimpleHUD/FlightCurser)
+ container Panel(SimpleHUD/FlightCursor)
{
metrics_mode pixels
top 0
left 0
width 32
height 32
-// material SimpleHUD/FlightCurser
+// material SimpleHUD/FlightCursor
}
//
// container Panel(SimpleHUD/TargetPointer)
Deleted: branches/ogsector/data/textures/flightCurser.png
===================================================================
(Binary files differ)
Added: branches/ogsector/data/textures/flightCursor.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/flightCursor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/src/DockedState.cpp 2007-08-27 18:04:51 UTC (rev 701)
@@ -54,7 +54,7 @@
overlayRootWindow_ = CEGUI::WindowManager::getSingleton().loadWindowLayout((CEGUI::utf8*)"opengateDocked.layout");
cursorFrame_ = 1;
- cursorMaxFrames_ = CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCurser" )->getImageCount();
+ cursorMaxFrames_ = CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCursor" )->getImageCount();
lastCursorFrameTime_ = 0.0f;
Ogre::SceneNode * backgroundNode = sceneMgr_->getRootSceneNode()->createChildSceneNode( "Background" );
@@ -105,7 +105,7 @@
resources_->inputManager->addKeyListener( this, "DockedStateKeyListener" );
resources_->inputManager->addMouseListener( this, "DockedStateMouseListener" );
- resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCurser", (CEGUI::utf8*)"Cursor1" );
+ resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCursor", (CEGUI::utf8*)"Cursor1" );
Ogre::Viewport * vp = resources_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
@@ -139,7 +139,7 @@
lastCursorFrameTime_ += evt.timeSinceLastFrame;
- // CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengateCurser", (CEGUI::utf8*)"Cursor5" );
+ // CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengateCursor", (CEGUI::utf8*)"Cursor5" );
// resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
// CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
@@ -148,8 +148,8 @@
cursorFrame_ =((cursorFrame_)%cursorMaxFrames_)+1;
std::string imageName( "Cursor" + toStr( cursorFrame_ ) );
- if ( CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCurser" )->isImageDefined( imageName ) ){
- resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCurser", imageName);
+ if ( CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCursor" )->isImageDefined( imageName ) ){
+ resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCursor", imageName);
}
lastCursorFrameTime_ = 0.0;
}
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/src/UnDockedState.cpp 2007-08-27 18:04:51 UTC (rev 701)
@@ -71,20 +71,20 @@
setupEventHandlers();
- targetCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetCurser" );
- targetCurserHalfWidth_ = targetCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
- targetCurserHalfHeight_ = targetCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
- targetCurser_->hide();
+ targetCursor_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetCursor" );
+ targetCursorHalfWidth_ = targetCursor_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ targetCursorHalfHeight_ = targetCursor_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ targetCursor_->hide();
- pilotFlightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDPilotFlightCurser" );
- pilotFlightCurserHalfWidth_ = pilotFlightCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
- pilotFlightCurserHalfHeight_ = pilotFlightCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
- pilotFlightCurser_->hide();
+ pilotFlightCursor_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDPilotFlightCursor" );
+ pilotFlightCursorHalfWidth_ = pilotFlightCursor_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ pilotFlightCursorHalfHeight_ = pilotFlightCursor_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ pilotFlightCursor_->hide();
- targetFlightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetFlightCurser" );
- targetFlightCurserHalfWidth_ = targetFlightCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
- targetFlightCurserHalfHeight_ = targetFlightCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
- targetFlightCurser_->hide();
+ targetFlightCursor_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetFlightCursor" );
+ targetFlightCursorHalfWidth_ = targetFlightCursor_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ targetFlightCursorHalfHeight_ = targetFlightCursor_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ targetFlightCursor_->hide();
velocityProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDVelocityProgress" );
velocityProgressHeight_ = velocityProgress_->getHeight().asAbsolute( 0.0 );
@@ -133,9 +133,9 @@
// resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
// CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
- flightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFlightCurser" );
- flightCurserHalfWidth_ = 10;
- flightCurserHalfHeight_ = 10;
+ flightCursor_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFlightCursor" );
+ flightCursorHalfWidth_ = 10;
+ flightCursorHalfHeight_ = 10;
}
@@ -180,15 +180,15 @@
overlayName_ = "SimpleHUD";
hudOverlay_ = Ogre::OverlayManager::getSingleton().getByName( overlayName_ );
hudOverlay_->show( );
-// mousePointer_ = hudOverlay_->getChild( overlayName_ + "/FlightCurser" );
+// mousePointer_ = hudOverlay_->getChild( overlayName_ + "/FlightCursor" );
// mousePointer_->setTop( windowsHalfHeight_ - mousePointer_->getHeight() / 2 );
// mousePointer_->setLeft( windowsHalfWidth_ - mousePointer_->getWidth() / 2 );
// mousePointer_->hide();
- flightCurserPos_[ 0 ] = windowsHalfWidth_ - flightCurserHalfWidth_;
- flightCurserPos_[ 1 ] = windowsHalfHeight_ - flightCurserHalfHeight_;
- flightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCurserPos_[ 0 ] ),
- CEGUI::UDim( 0.0, flightCurserPos_[ 1 ] ) ) );
+ flightCursorPos_[ 0 ] = windowsHalfWidth_ - flightCursorHalfWidth_;
+ flightCursorPos_[ 1 ] = windowsHalfHeight_ - flightCursorHalfHeight_;
+ flightCursor_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCursorPos_[ 0 ] ),
+ CEGUI::UDim( 0.0, flightCursorPos_[ 1 ] ) ) );
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
sceneDetailIndex_ = 0;
@@ -526,17 +526,17 @@
bool UnDockedState::mouseMoved( const OIS::MouseEvent & e ){
if ( !configMode_ ){
- flightCurserPos_[ 0 ] += e.state.X.rel;
- flightCurserPos_[ 1 ] += e.state.Y.rel;
+ flightCursorPos_[ 0 ] += e.state.X.rel;
+ flightCursorPos_[ 1 ] += e.state.Y.rel;
- flightCurserPos_[ 0 ] = min ( flightCurserPos_[ 0 ], windowsWidth_- flightCurserHalfWidth_ );
- flightCurserPos_[ 1 ] = min ( flightCurserPos_[ 1 ], windowsHeight_- flightCurserHalfHeight_ );
+ flightCursorPos_[ 0 ] = min ( flightCursorPos_[ 0 ], windowsWidth_- flightCursorHalfWidth_ );
+ flightCursorPos_[ 1 ] = min ( flightCursorPos_[ 1 ], windowsHeight_- flightCursorHalfHeight_ );
- flightCurserPos_[ 0 ] = max ( flightCurserPos_[ 0 ], -flightCurserHalfWidth_ );
- flightCurserPos_[ 1 ] = max ( flightCurserPos_[ 1 ], -flightCurserHalfHeight_ );
+ flightCursorPos_[ 0 ] = max ( flightCursorPos_[ 0 ], -flightCursorHalfWidth_ );
+ flightCursorPos_[ 1 ] = max ( flightCursorPos_[ 1 ], -flightCursorHalfHeight_ );
- flightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCurserPos_[ 0 ] ),
- CEGUI::UDim( 0.0, flightCurserPos_[ 1 ] ) ) );
+ flightCursor_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCursorPos_[ 0 ] ),
+ CEGUI::UDim( 0.0, flightCursorPos_[ 1 ] ) ) );
// mousePointer_->setLeft( mousePointer_->getLeft( ) + e.state.X.rel );
// mousePointer_->setTop( mousePointer_->getTop( ) + e.state.Y.rel );
@@ -562,8 +562,8 @@
// int relativToMidPointX = (int)rint( (mousePointer_->getLeft( ) + mousePointerWidth) - windowsHalfWidth_ );
// int relativToMidPointY = (int)rint( (mousePointer_->getTop( ) + mousePointerHeight) - windowsHalfHeight_ );
- int relativToMidPointX = (int)rint( ( flightCurserPos_[ 0 ] + flightCurserHalfWidth_ ) - windowsHalfWidth_ );
- int relativToMidPointY = (int)rint( ( flightCurserPos_[ 1 ] + flightCurserHalfHeight_ ) - windowsHalfHeight_ );
+ int relativToMidPointX = (int)rint( ( flightCursorPos_[ 0 ] + flightCursorHalfWidth_ ) - windowsHalfWidth_ );
+ int relativToMidPointY = (int)rint( ( flightCursorPos_[ 1 ] + flightCursorHalfHeight_ ) - windowsHalfHeight_ );
int minActiveZonePercent = 5;
int maxActiveZonePercent = 90;
@@ -935,13 +935,13 @@
bool targetVisible = projectionPos_( mainCamera_, targetPos, targetScreenPos );
if ( targetVisible ){
- targetCurser_->show();
- targetCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
- -targetCurserHalfWidth_ ),
+ targetCursor_->show();
+ targetCursor_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ -targetCursorHalfWidth_ ),
CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
- -targetCurserHalfHeight_ ) ) );
+ -targetCursorHalfHeight_ ) ) );
} else {
- targetCurser_->hide();
+ targetCursor_->hide();
}
Ogre::Real ammoTimeToTarget( distToTarget.length() / sector_->avatarObject()->ammoSpeed() );
@@ -954,16 +954,16 @@
targetVisible = projectionPos_( mainCamera_, duelistPilotPos, targetScreenPos );
if ( targetVisible ){
- pilotFlightCurser_->show();
- pilotFlightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
- - pilotFlightCurserHalfWidth_ ),
+ pilotFlightCursor_->show();
+ pilotFlightCursor_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ - pilotFlightCursorHalfWidth_ ),
CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
- - pilotFlightCurserHalfHeight_ ) ) );
+ - pilotFlightCursorHalfHeight_ ) ) );
} else {
- pilotFlightCurser_->hide();
+ pilotFlightCursor_->hide();
}
} else {
- pilotFlightCurser_->hide();
+ pilotFlightCursor_->hide();
}
if ( duelistTarget_ && ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI ||
@@ -975,16 +975,16 @@
targetVisible = projectionPos_( mainCamera_, duelistTargetPos, targetScreenPos );
if ( targetVisible ){
- targetFlightCurser_->show();
- targetFlightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
- - targetFlightCurserHalfWidth_ ),
+ targetFlightCursor_->show();
+ targetFlightCursor_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ - targetFlightCursorHalfWidth_ ),
CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
- - targetFlightCurserHalfHeight_ ) ) );
+ - targetFlightCursorHalfHeight_ ) ) );
} else {
- targetFlightCurser_->hide();
+ targetFlightCursor_->hide();
}
} else {
- targetFlightCurser_->hide();
+ targetFlightCursor_->hide();
}
//** End update targeting pointer and duelist pointers;
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-08-27 17:46:56 UTC (rev 700)
+++ branches/ogsector/src/UnDockedState.h 2007-08-27 18:04:51 UTC (rev 701)
@@ -122,22 +122,22 @@
Sector * sector_;
NetworkClient * network_;
- Ogre::Vector2 flightCurserPos_;
- CEGUI::Window * flightCurser_;
- Ogre::Real flightCurserHalfWidth_;
- Ogre::Real flightCurserHalfHeight_;
+ Ogre::Vector2 flightCursorPos_;
+ CEGUI::Window * flightCursor_;
+ Ogre::Real flightCursorHalfWidth_;
+ Ogre::Real flightCursorHalfHeight_;
- CEGUI::Window * targetCurser_;
- Ogre::Real targetCurserHalfWidth_;
- Ogre::Real targetCurserHalfHeight_;
+ CEGUI::Window * targetCursor_;
+ Ogre::Real targetCursorHalfWidth_;
+ Ogre::Real targetCursorHalfHeight_;
- CEGUI::Window * pilotFlightCurser_;
- Ogre::Real pilotFlightCurserHalfWidth_;
- Ogre::Real pilotFlightCurserHalfHeight_;
+ CEGUI::Window * pilotFlightCursor_;
+ Ogre::Real pilotFlightCursorHalfWidth_;
+ Ogre::Real pilotFlightCursorHalfHeight_;
- CEGUI::Window * targetFlightCurser_;
- Ogre::Real targetFlightCurserHalfWidth_;
- Ogre::Real targetFlightCurserHalfHeight_;
+ CEGUI::Window * targetFlightCursor_;
+ Ogre::Real targetFlightCursorHalfWidth_;
+ Ogre::Real targetFlightCursorHalfHeight_;
CEGUI::Window * velocityProgress_;
CEGUI::Window * velocityProgressImg_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 17:48:17
|
Revision: 691
http://opengate.svn.sourceforge.net/opengate/?rev=691&view=rev
Author: ultrasick
Date: 2007-08-26 07:52:32 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
added category: "music"
Modified Paths:
--------------
trunk/data/misc/ids.xml
Modified: trunk/data/misc/ids.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-08-27 17:46:53
|
Revision: 700
http://opengate.svn.sourceforge.net/opengate/?rev=700&view=rev
Author: ultrasick
Date: 2007-08-27 10:46:56 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
uploading capacitor: lifeline (based on the quadro)
Added Paths:
-----------
trunk/data/capacitors/lifeline.blend
trunk/data/capacitors/lifeline.xml
trunk/data/capacitors/lifeline_290x290.png
trunk/data/capacitors/lifeline_76x76.png
Added: trunk/data/capacitors/lifeline.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/lifeline.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/lifeline.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/lifeline.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/lifeline_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/lifeline_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/lifeline_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/lifeline_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-08-27 17:46:48
|
Revision: 692
http://opengate.svn.sourceforge.net/opengate/?rev=692&view=rev
Author: ultrasick
Date: 2007-08-26 07:56:56 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
added category: "music" (this time it's real) :-)
Modified Paths:
--------------
trunk/data/misc/ids.xml
Modified: trunk/data/misc/ids.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-08-27 16:54:20
|
Revision: 675
http://opengate.svn.sourceforge.net/opengate/?rev=675&view=rev
Author: ultrasick
Date: 2007-08-26 06:17:30 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
deleting old unnecessary file
Removed Paths:
-------------
trunk/data/GUI/docked/click.wav
Deleted: trunk/data/GUI/docked/click.wav
===================================================================
(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-08-27 16:25:12
|
Revision: 699
http://opengate.svn.sourceforge.net/opengate/?rev=699&view=rev
Author: ultrasick
Date: 2007-08-27 09:25:15 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
deactivated ambient occlusion to make it look a little more like the mantra
Modified Paths:
--------------
trunk/data/capacitors/quadro.blend
trunk/data/capacitors/quadro_290x290.png
trunk/data/capacitors/quadro_76x76.png
Modified: trunk/data/capacitors/quadro.blend
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/quadro_290x290.png
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/quadro_76x76.png
===================================================================
(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-08-27 16:19:17
|
Revision: 698
http://opengate.svn.sourceforge.net/opengate/?rev=698&view=rev
Author: ultrasick
Date: 2007-08-27 09:19:20 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
and here comes another capacitor (based on the mantra)
Added Paths:
-----------
trunk/data/capacitors/quadro.blend
trunk/data/capacitors/quadro.xml
trunk/data/capacitors/quadro_290x290.png
trunk/data/capacitors/quadro_76x76.png
Added: trunk/data/capacitors/quadro.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/quadro.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/quadro.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/quadro.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/quadro_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/quadro_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/quadro_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/quadro_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-08-27 16:15:53
|
Revision: 697
http://opengate.svn.sourceforge.net/opengate/?rev=697&view=rev
Author: ultrasick
Date: 2007-08-27 02:15:11 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
uploading an alternative laser shot sound, a sound file for the camera modification and some "mysterious sentinel sound files"
maybe we don't need them all right now, but we can probably use them later
+ adding the source of the sound files to the credits.txt
Modified Paths:
--------------
trunk/data/misc/credits.txt
Added Paths:
-----------
trunk/data/sounds/guns/laser2.wav
trunk/data/sounds/modifications/
trunk/data/sounds/modifications/camera.wav
trunk/data/sounds/sectors/sentinel_1.wav
trunk/data/sounds/sectors/sentinel_2.wav
trunk/data/sounds/sectors/sentinel_3.wav
trunk/data/sounds/sectors/sentinel_4.wav
Modified: trunk/data/misc/credits.txt
===================================================================
--- trunk/data/misc/credits.txt 2007-08-26 16:48:46 UTC (rev 696)
+++ trunk/data/misc/credits.txt 2007-08-27 09:15:11 UTC (rev 697)
@@ -28,7 +28,7 @@
providing nice base textures for
the Lady Kickstart!
-... www.a1freesoundeffects.com for
+... www.a1FreeSoundEffects.com for
the sonar ping sound file we used
in the open source splash screen!
@@ -37,4 +37,9 @@
Jumpgate Mapper tool!
... George Max for helping out with some
- commodities!
\ No newline at end of file
+ commodities!
+
+... www.WyomingWebDesign.com for
+ sentinel sound files, a cool
+ laser shot sound and a sound of a
+ camera!
\ No newline at end of file
Added: trunk/data/sounds/guns/laser2.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/guns/laser2.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/modifications/camera.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/modifications/camera.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/sentinel_1.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_1.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/sentinel_2.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_2.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/sentinel_3.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_3.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/sentinel_4.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/sentinel_4.wav
___________________________________________________________________
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-08-27 16:15:42
|
Revision: 687
http://opengate.svn.sourceforge.net/opengate/?rev=687&view=rev
Author: ultrasick
Date: 2007-08-26 07:24:15 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving song from tauseti to quantar
Added Paths:
-----------
trunk/doc/data/sounds/stations/quantar/
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
Removed Paths:
-------------
trunk/doc/data/sounds/stations/tauseti/
Added: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
___________________________________________________________________
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-08-27 16:12:52
|
Revision: 671
http://opengate.svn.sourceforge.net/opengate/?rev=671&view=rev
Author: ultrasick
Date: 2007-08-26 05:59:08 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading the sound of an laser shot. it still needs improvement (like an cool impulse at the beginning of the shot to make it sound more like .... um ... well little more like a cool super fat laser gun) ;-)
Added Paths:
-----------
trunk/data/guns/laser.wav
trunk/templates/data/guns/
trunk/templates/data/guns/laser.aup
trunk/templates/data/guns/laser.txt
trunk/templates/data/guns/laser_data/
trunk/templates/data/guns/laser_data/e00/
trunk/templates/data/guns/laser_data/e00/d00/
trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
Added: trunk/data/guns/laser.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/laser.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/guns/laser.aup
===================================================================
--- trunk/templates/data/guns/laser.aup (rev 0)
+++ trunk/templates/data/guns/laser.aup 2007-08-26 12:59:08 UTC (rev 671)
@@ -0,0 +1,23 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="laser_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.4998866213" vpos="0" h="0.0000000000" zoom="2864.0000000000" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.01571429">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="21352">
+ <waveblock start="0">
+ <simpleblockfile filename="e00002bb.au" len="21352" min="-1" max="0.9393" rms="0.158803"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="693">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000fbe.au" len="693" min="-0.218896" max="0.567895" rms="0.016289"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/guns/laser.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/guns/laser.txt
===================================================================
--- trunk/templates/data/guns/laser.txt (rev 0)
+++ trunk/templates/data/guns/laser.txt 2007-08-26 12:59:08 UTC (rev 671)
@@ -0,0 +1,8 @@
+neue monospur (44.100 Hz; 32 bit float)
+rauschen erzeugen (0,5 sekunden; amplitude: 1; braunes rauschen)
+0,015 sekunden am anfang ausw\xE4hlen und fade in effekt
+0,25 sekunden am ende ausw\xE4hlen und fade out effekt
+wahwah effek (lfo requenz: 1,25 Hz; lfo anfangsphase: 0 grad; modulationstiefe: 70%; resonanzgte: 2,5 Q; frequenzverschiebung: 30%)
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/guns/laser.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
___________________________________________________________________
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-08-27 16:08:04
|
Revision: 696
http://opengate.svn.sourceforge.net/opengate/?rev=696&view=rev
Author: spom_spom
Date: 2007-08-26 09:48:46 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(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-08-27 16:06:13
|
Revision: 688
http://opengate.svn.sourceforge.net/opengate/?rev=688&view=rev
Author: ultrasick
Date: 2007-08-26 07:29:06 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving song from tauseti to quantar
Added Paths:
-----------
trunk/data/sounds/stations/quantar/
trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3
trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
Removed Paths:
-------------
trunk/data/sounds/stations/tauseti/
Added: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
===================================================================
--- trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt (rev 0)
+++ trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt 2007-08-26 14:29:06 UTC (rev 688)
@@ -0,0 +1 @@
+see trunk/doc/data/stations/tauseti/interior/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
___________________________________________________________________
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-08-27 16:03:22
|
Revision: 686
http://opengate.svn.sourceforge.net/opengate/?rev=686&view=rev
Author: ultrasick
Date: 2007-08-26 07:00:37 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving files around
Added Paths:
-----------
trunk/templates/data/sounds/GUI/
trunk/templates/data/sounds/GUI/click.aup
trunk/templates/data/sounds/GUI/click.txt
trunk/templates/data/sounds/GUI/click_data/
trunk/templates/data/sounds/GUI/click_data/e00/
trunk/templates/data/sounds/GUI/click_data/e00/d00/
trunk/templates/data/sounds/GUI/click_data/e00/d00/e0000efe.au
Removed Paths:
-------------
trunk/templates/data/sounds/click.aup
trunk/templates/data/sounds/click.txt
trunk/templates/data/sounds/click_data/
Added: trunk/templates/data/sounds/GUI/click.aup
===================================================================
--- trunk/templates/data/sounds/GUI/click.aup (rev 0)
+++ trunk/templates/data/sounds/GUI/click.aup 2007-08-26 14:00:37 UTC (rev 686)
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="click_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="52234.2431761787" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="1209">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000efe.au" len="1209" min="-0.748553" max="0.748331" rms="0.065612"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/sounds/GUI/click.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/sounds/GUI/click.txt
===================================================================
--- trunk/templates/data/sounds/GUI/click.txt (rev 0)
+++ trunk/templates/data/sounds/GUI/click.txt 2007-08-26 14:00:37 UTC (rev 686)
@@ -0,0 +1,11 @@
+neue monospur (44.100 Hz; 32 bit float)
+click track erzeugen (werte egal)
+einen der starken schallimpulse rausschneiden, rest l\xF6schen
+stille wegschneiden, alles wegschneiden was nicht zur sauberen sinuskurve geh\xF6rt, an den anfang der tonspur schieben
+2 volle wellen am anfang ausw\xE4hlen und fade in effekt anwenden
+2 volle wellen am ende ausw\xE4hlen und fade out effekt anwenden
+effekt "tonh\xF6he \xE4ndern" anwenden (-24 halbtonschritte)
+stille wegschneiden
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/sounds/GUI/click.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/sounds/GUI/click_data/e00/d00/e0000efe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/sounds/GUI/click_data/e00/d00/e0000efe.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/templates/data/sounds/click.aup
===================================================================
--- trunk/templates/data/sounds/click.aup 2007-08-26 13:59:09 UTC (rev 685)
+++ trunk/templates/data/sounds/click.aup 2007-08-26 14:00:37 UTC (rev 686)
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
-<project xmlns="http://audacity.sourceforge.net/xml/" projname="click_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="52234.2431761787" rate="44100">
- <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
- <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
- <waveclip offset="0.00000000">
- <sequence maxsamples="262144" sampleformat="262159" numsamples="1209">
- <waveblock start="0">
- <simpleblockfile filename="e0000efe.au" len="1209" min="-0.748553" max="0.748331" rms="0.065612"/>
- </waveblock>
- </sequence>
- <envelope numpoints="0"/>
- </waveclip>
- </wavetrack>
-</project>
Deleted: trunk/templates/data/sounds/click.txt
===================================================================
--- trunk/templates/data/sounds/click.txt 2007-08-26 13:59:09 UTC (rev 685)
+++ trunk/templates/data/sounds/click.txt 2007-08-26 14:00:37 UTC (rev 686)
@@ -1,11 +0,0 @@
-neue monospur (44.100 Hz; 32 bit float)
-click track erzeugen (werte egal)
-einen der starken schallimpulse rausschneiden, rest l\xF6schen
-stille wegschneiden, alles wegschneiden was nicht zur sauberen sinuskurve geh\xF6rt, an den anfang der tonspur schieben
-2 volle wellen am anfang ausw\xE4hlen und fade in effekt anwenden
-2 volle wellen am ende ausw\xE4hlen und fade out effekt anwenden
-effekt "tonh\xF6he \xE4ndern" anwenden (-24 halbtonschritte)
-stille wegschneiden
-projekt speichern
-schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
-sound exportieren (wave; 32 bit float; microsoft)
\ 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: <ult...@us...> - 2007-08-27 16:01:08
|
Revision: 681
http://opengate.svn.sourceforge.net/opengate/?rev=681&view=rev
Author: ultrasick
Date: 2007-08-26 06:40:11 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
and here comes some license info
Added Paths:
-----------
trunk/doc/data/sounds/
trunk/doc/data/sounds/sectors/
trunk/doc/data/sounds/sectors/tauseti/
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
trunk/doc/data/sounds/stations/
trunk/doc/data/sounds/stations/tauseti/
trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
Added: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
___________________________________________________________________
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-08-27 16:01:02
|
Revision: 682
http://opengate.svn.sourceforge.net/opengate/?rev=682&view=rev
Author: ultrasick
Date: 2007-08-26 06:41:21 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
deleting old unnecessary files
Removed Paths:
-------------
trunk/doc/data/sectors/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 16:01:01
|
Revision: 694
http://opengate.svn.sourceforge.net/opengate/?rev=694&view=rev
Author: ultrasick
Date: 2007-08-26 08:57:23 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
corrected image #8 because it was at the wrong place
Modified Paths:
--------------
branches/ogsector/data/gui/imagesets/cursor.png
Modified: branches/ogsector/data/gui/imagesets/cursor.png
===================================================================
(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-08-27 16:00:22
|
Revision: 684
http://opengate.svn.sourceforge.net/opengate/?rev=684&view=rev
Author: ultrasick
Date: 2007-08-26 06:58:33 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
deleting old unnecessary files
Removed Paths:
-------------
trunk/templates/data/guns/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 16:00:21
|
Revision: 690
http://opengate.svn.sourceforge.net/opengate/?rev=690&view=rev
Author: ultrasick
Date: 2007-08-26 07:33:20 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading mouse cursor
Added Paths:
-----------
branches/ogsector/data/gui/imagesets/cursor.imageset
branches/ogsector/data/gui/imagesets/cursor.png
trunk/templates/data/misc/cursor.blend
Added: branches/ogsector/data/gui/imagesets/cursor.imageset
===================================================================
--- branches/ogsector/data/gui/imagesets/cursor.imageset (rev 0)
+++ branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-26 14:33:20 UTC (rev 690)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Imageset Name="Cursor" Imagefile="cursor.png">
+ <Image Name="Cursor1" XPos="00" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor2" XPos="21" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor3" XPos="42" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor4" XPos="63" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor5" XPos="84" YPos="00" Width="21" Height="21" />
+
+ <Image Name="Cursor6" XPos="00" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor7" XPos="21" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor8" XPos="42" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor9" XPos="63" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor10" XPos="84" YPos="21" Width="21" Height="21" />
+
+ <Image Name="Cursor11" XPos="00" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor12" XPos="21" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor13" XPos="42" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor14" XPos="63" YPos="42" Width="21" Height="21" />
+ <Image Name="Cursor15" XPos="84" YPos="42" Width="21" Height="21" />
+
+ <Image Name="Cursor16" XPos="00" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor17" XPos="21" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor18" XPos="42" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor19" XPos="63" YPos="63" Width="21" Height="21" />
+ <Image Name="Cursor20" XPos="84" YPos="63" Width="21" Height="21" />
+</Imageset>
Property changes on: branches/ogsector/data/gui/imagesets/cursor.imageset
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/ogsector/data/gui/imagesets/cursor.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/gui/imagesets/cursor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/misc/cursor.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/cursor.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-08-27 15:58:07
|
Revision: 683
http://opengate.svn.sourceforge.net/opengate/?rev=683&view=rev
Author: ultrasick
Date: 2007-08-26 06:57:52 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
deleting old unnecessary files
Removed Paths:
-------------
trunk/templates/data/guns/laser_data/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 15:58:02
|
Revision: 677
http://opengate.svn.sourceforge.net/opengate/?rev=677&view=rev
Author: ultrasick
Date: 2007-08-26 06:22:52 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading test file
32 bit float, not PCM coded
Added Paths:
-----------
trunk/data/sounds/click32.wav
Added: trunk/data/sounds/click32.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/click32.wav
___________________________________________________________________
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-08-27 15:57:04
|
Revision: 695
http://opengate.svn.sourceforge.net/opengate/?rev=695&view=rev
Author: spom_spom
Date: 2007-08-26 09:17:11 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
animate cursor in docked-state
Modified Paths:
--------------
branches/ogsector/data/gui/imagesets/cursor.imageset
branches/ogsector/data/gui/schemes/opengate.scheme
branches/ogsector/src/ConfigDialog.cpp
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/DockedState.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/networkClient.cpp
branches/ogsector/src/networkProtocol.h
branches/ogsector/src/networkServer.cpp
branches/ogsector/src/networkServerUser.cpp
trunk/data/stations/tauseti_wake.mesh
trunk/data/stations/tauseti_wake_2.blend
Modified: branches/ogsector/data/gui/imagesets/cursor.imageset
===================================================================
--- branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/data/gui/imagesets/cursor.imageset 2007-08-26 16:17:11 UTC (rev 695)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Imageset Name="Cursor" Imagefile="cursor.png">
+<Imageset Name="opengateCurser" Imagefile="cursor.png">
<Image Name="Cursor1" XPos="00" YPos="00" Width="21" Height="21" />
- <Image Name="Cursor2" XPos="21" YPos="00" Width="21" Height="21" />
- <Image Name="Cursor3" XPos="42" YPos="00" Width="21" Height="21" />
- <Image Name="Cursor4" XPos="63" YPos="00" Width="21" Height="21" />
- <Image Name="Cursor5" XPos="84" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor2" XPos="21" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor3" XPos="42" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor4" XPos="63" YPos="00" Width="21" Height="21" />
+ <Image Name="Cursor5" XPos="84" YPos="00" Width="21" Height="21" />
- <Image Name="Cursor6" XPos="00" YPos="21" Width="21" Height="21" />
- <Image Name="Cursor7" XPos="21" YPos="21" Width="21" Height="21" />
- <Image Name="Cursor8" XPos="42" YPos="21" Width="21" Height="21" />
- <Image Name="Cursor9" XPos="63" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor6" XPos="00" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor7" XPos="21" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor8" XPos="42" YPos="21" Width="21" Height="21" />
+ <Image Name="Cursor9" XPos="63" YPos="21" Width="21" Height="21" />
<Image Name="Cursor10" XPos="84" YPos="21" Width="21" Height="21" />
<Image Name="Cursor11" XPos="00" YPos="42" Width="21" Height="21" />
Modified: branches/ogsector/data/gui/schemes/opengate.scheme
===================================================================
--- branches/ogsector/data/gui/schemes/opengate.scheme 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/data/gui/schemes/opengate.scheme 2007-08-26 16:17:11 UTC (rev 695)
@@ -1,6 +1,7 @@
<?xml version="1.0" ?>
<GUIScheme Name="opengate">
<Imageset Name="opengate" Filename="opengate.imageset" />
+ <Imageset Name="opengateCurser" Filename="cursor.imageset" />
<Imageset Name="opengateHUD" Filename="defaultHUD.imageset" />
<ImagesetFromImage Name="MainWindowTopLeft" Filename="mainTopLeft.tga" />
Modified: branches/ogsector/src/ConfigDialog.cpp
===================================================================
--- branches/ogsector/src/ConfigDialog.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/ConfigDialog.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -78,7 +78,6 @@
creditsListBox_->ensureItemIsVisible( creditsListBox_->getItemCount() );
file.close();
-
}
bool ConfigDialog::handleCreditsButton( const CEGUI::EventArgs & e ){
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/DockedState.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -53,6 +53,10 @@
overlayRootWindow_ = CEGUI::WindowManager::getSingleton().loadWindowLayout((CEGUI::utf8*)"opengateDocked.layout");
+ cursorFrame_ = 1;
+ cursorMaxFrames_ = CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCurser" )->getImageCount();
+ lastCursorFrameTime_ = 0.0f;
+
Ogre::SceneNode * backgroundNode = sceneMgr_->getRootSceneNode()->createChildSceneNode( "Background" );
Ogre::ManualObject * background = sceneMgr_->createManualObject( "BackgroundObject" );
@@ -101,8 +105,7 @@
resources_->inputManager->addKeyListener( this, "DockedStateKeyListener" );
resources_->inputManager->addMouseListener( this, "DockedStateMouseListener" );
- resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
- CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+ resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCurser", (CEGUI::utf8*)"Cursor1" );
Ogre::Viewport * vp = resources_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
@@ -133,6 +136,24 @@
bool DockedState::frameStarted( const Ogre::FrameEvent & evt ){
if ( shipConfigDialog_ ) shipConfigDialog_->update( evt.timeSinceLastFrame );
+
+ lastCursorFrameTime_ += evt.timeSinceLastFrame;
+
+ // CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengateCurser", (CEGUI::utf8*)"Cursor5" );
+// resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+// CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+
+ if ( lastCursorFrameTime_ > 1.0/15.0 ){
+
+ cursorFrame_ =((cursorFrame_)%cursorMaxFrames_)+1;
+ std::string imageName( "Cursor" + toStr( cursorFrame_ ) );
+
+ if ( CEGUI::ImagesetManager::getSingleton().getImageset( "opengateCurser" )->isImageDefined( imageName ) ){
+ resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengateCurser", imageName);
+ }
+ lastCursorFrameTime_ = 0.0;
+ }
+
return true;
}
Modified: branches/ogsector/src/DockedState.h
===================================================================
--- branches/ogsector/src/DockedState.h 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/DockedState.h 2007-08-26 16:17:11 UTC (rev 695)
@@ -97,6 +97,10 @@
bool consoleMax_;
bool exitToUndockedState_;
bool quitAllStates_;
+
+ int cursorMaxFrames_;
+ int cursorFrame_;
+ Ogre::Real lastCursorFrameTime_;
};
} // namespace OpenGate
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/SectorObjects.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -590,7 +590,7 @@
if ( shield_ < 0 ){
armor_ += shield_;
shield_ = 0;
- armor_ = max( 0, armor_);
+ armor_ = max( Uint32(0), armor_);
}
statusChanged_ = true;
}
@@ -609,7 +609,7 @@
}
powerLine -= engineIn;
- powerLine = max( 0, powerLine );
+ powerLine = max( Uint32(0), powerLine );
Uint32 shieldIn = 0;
if ( vessel_->shield() ){
@@ -621,7 +621,7 @@
}
powerLine -= shieldIn;
- powerLine = max( 0, powerLine );
+ powerLine = max( Uint32(0), powerLine );
if ( vessel_->capacitor() ){
capacity_ += (Uint32)rint( (Ogre::Real)powerLine * vessel_->capacitor()->efficiency() * elapsedTime );
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/UnDockedState.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -130,8 +130,8 @@
targetShieldText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetShieldText" );
targetArmorText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetArmorText" );
- resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
- CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+// resources_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+// CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
flightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFlightCurser" );
flightCurserHalfWidth_ = 10;
Modified: branches/ogsector/src/networkClient.cpp
===================================================================
--- branches/ogsector/src/networkClient.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/networkClient.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -57,7 +57,7 @@
if ( !error ){
log_->info( "Connected: waiting for userID. " );
online_ = true;
- asio::async_read( socket_, asio::buffer( readMsg_.data(), Message::HeaderLength+MessageBodyUserID( 0 ).dataSize() ),
+ asio::async_read( socket_, asio::buffer( readMsg_.data(), Message::HeaderLength+MessageBodyUserID( Uint32(0) ).dataSize() ),
boost::bind( & NetworkClient::handleReceiveUserID, this, asio::placeholders::error ) );
} else {
log_->fatal( error.what() );
@@ -119,7 +119,7 @@
log_->fatal( std::string( "unknown MESSAGE_PROTO " ) + toStr( base.type() ) );
log_->fatal( "wait for userid " );
asio::async_read( socket_, asio::buffer( readMsg_.data(),
- Message::HeaderLength+MessageBodyUserID( 0 ).dataSize() ),
+ Message::HeaderLength+MessageBodyUserID( Uint32(0) ).dataSize() ),
boost::bind( & NetworkClient::handleReceiveUserID, this,
asio::placeholders::error ) );
Modified: branches/ogsector/src/networkProtocol.h
===================================================================
--- branches/ogsector/src/networkProtocol.h 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/networkProtocol.h 2007-08-26 16:17:11 UTC (rev 695)
@@ -567,6 +567,7 @@
int count = 0;
readFromData( bodyLength_, data_, count );
if ( bodyLength_ > MaxBodyLength ) {
+ std::cerr << "Message::decodeHeader fails: " << bodyLength_ << " > " << MaxBodyLength << std::endl;
bodyLength_ = 0;
return false;
}
Modified: branches/ogsector/src/networkServer.cpp
===================================================================
--- branches/ogsector/src/networkServer.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/networkServer.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -109,6 +109,7 @@
void Server::disconnectUser( UserSession * user ){
std::string name( user->userName() );
log_->info( std::string( "DISCONNECTING: " ) + toStr( user->userID() ) + " " + name );
+ userSessions_.erase( user );
if ( user->registered() ){
allUsers_.leave( user );
@@ -124,7 +125,7 @@
// delete user;
log_->info( std::string( "DISCONNECTED: " ) + name );
- userSessions_.erase( user );
+
delete user;
}
Modified: branches/ogsector/src/networkServerUser.cpp
===================================================================
--- branches/ogsector/src/networkServerUser.cpp 2007-08-26 15:57:23 UTC (rev 694)
+++ branches/ogsector/src/networkServerUser.cpp 2007-08-26 16:17:11 UTC (rev 695)
@@ -72,7 +72,7 @@
bool write_in_progress = !writeMsgs_.empty();
writeMsgs_.push_back( Message( msg ) );
- // std::cout << "send.length() = " << writeMsgs_.front().length() << std::endl;
+ // std::cout << "send.length() = " << writeMsgs_.front().length() << std::endl;
if ( ! write_in_progress && connected_ ) {
asio::async_write( socket_, asio::buffer( writeMsgs_.front().data(), writeMsgs_.front().length() ),
@@ -107,21 +107,23 @@
void UserSession::handleReadHeader( const asio::error & error ) {
if ( !error && readMsg_.decodeHeader() ) {
- // std::cout << "User::handle_read_header: " << readMsg_.length() << std::endl;
-
+// std::cout << "User::handle_read_header: " << readMsg_.length() << std::endl;
+// std::cout << readMsg_.bodyLength() << std::endl;
+
asio::async_read( socket_, asio::buffer( readMsg_.body(), readMsg_.bodyLength() ),
- boost::bind( & UserSession::handleReadBody, this, asio::placeholders::error ) );
+ boost::bind( & UserSession::handleReadBody, this, asio::placeholders::error ) );
} else {
+ std::cerr << "UserSession::handleReadHeader: " << error.what() << std::endl;
connected_ = false;
server_->disconnectUser( this );
}
}
void UserSession::handleReadBody( const asio::error & error ) {
- // std::cout << "User::handle_read_body: " << userID_ << std::endl;
+ // std::cout << "User::handle_read_body: " << userID_ << std::endl;
if ( !error ) {
MessageBodyBase base( readMsg_.body() );
- // std::cout << "Type: = " << (int)base.type() << std::endl;
+ // std::cout << "Type: = " << (int)base.type() << std::endl;
switch( base.type() ){
case PROTO_USERNAME: {
@@ -175,7 +177,8 @@
asio::async_read( socket_, asio::buffer( readMsg_.data(), Message::HeaderLength ),
boost::bind( & UserSession::handleReadHeader, this, asio::placeholders::error ) );
} else {
- LogManager::getSingleton().fatal( std::string( "Cannot read body: " ) + toStr( userID_ ) );
+ LogManager::getSingleton().fatal( std::string( "Cannot read body: " )
+ + toStr( userID_ ) + " " + error.what() );
// room_.leave( this );
}
}
Modified: trunk/data/stations/tauseti_wake.mesh
===================================================================
(Binary files differ)
Modified: trunk/data/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
