[Orxonox-commit 4644] r9315 - in data/pool: audio/sounds fonts gui/imagesets images/effects images/gui images/skyboxes materials
dafrick at orxonox.net
dafrick at orxonox.net
Mon Jul 9 23:47:33 CEST 2012
Author: dafrick
Date: 2012-07-09 23:47:32 +0200 (Mon, 09 Jul 2012)
New Revision: 9315
Removed:
data/pool/audio/sounds/laser1.wav
data/pool/audio/sounds/pong_bat.wav
data/pool/audio/sounds/pong_score.wav
data/pool/audio/sounds/pong_side.wav
data/pool/fonts/console.fontdef
data/pool/fonts/typewriter.ttf
data/pool/gui/imagesets/DriveIcons.imageset
data/pool/gui/imagesets/FairChar.imageset
data/pool/images/effects/smokecolors.png
data/pool/images/gui/DriveIcons.png
data/pool/images/gui/FairChar.png
data/pool/images/skyboxes/skypanoramagen1_bk.jpg
data/pool/images/skyboxes/skypanoramagen1_dn.jpg
data/pool/images/skyboxes/skypanoramagen1_fr.jpg
data/pool/images/skyboxes/skypanoramagen1_lf.jpg
data/pool/images/skyboxes/skypanoramagen1_rt.jpg
data/pool/images/skyboxes/skypanoramagen1_up.jpg
data/pool/images/skyboxes/skypanoramagen2_bk.jpg
data/pool/images/skyboxes/skypanoramagen2_dn.jpg
data/pool/images/skyboxes/skypanoramagen2_fr.jpg
data/pool/images/skyboxes/skypanoramagen2_lf.jpg
data/pool/images/skyboxes/skypanoramagen2_rt.jpg
data/pool/images/skyboxes/skypanoramagen2_up.jpg
Modified:
data/pool/audio/sounds/AUTHORS
data/pool/fonts/AUTHORS
data/pool/gui/imagesets/AUTHORS
data/pool/images/effects/AUTHORS
data/pool/images/gui/AUTHORS
data/pool/images/skyboxes/AUTHORS
data/pool/materials/OrxonoxSky.material
data/pool/materials/planets.material
Log:
Removing files that do not comply with our license.
Modified: data/pool/audio/sounds/AUTHORS
===================================================================
--- data/pool/audio/sounds/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/audio/sounds/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -9,10 +9,6 @@
Engine_idle.ogg Kevin Young - Samples (License: CC Sampling+) from: ReWire (SHMIR and Vents)
Engine_low.ogg Kevin Young - Samples (License: CC Sampling+) from: ReWire (SHMIR and Vents)
Engine_off.ogg Kevin Young - Samples (License: CC Sampling+) from: ReWire (SHMIR and Vents)
-laser1.wav unknown
-pong_bat.wav Erwin Herrsche?
-pong_score.wav Erwin Herrsche?
-pong_side.wav Erwin Herrsche?
Rocket_engine.ogg Kevin Young
Rocket_explosion.ogg Kevin Young - Samples (License: CC Sampling+) from: sleep (BOMB)
Rocket_launch.ogg Kevin Young
Deleted: data/pool/audio/sounds/laser1.wav
===================================================================
(Binary files differ)
Deleted: data/pool/audio/sounds/pong_bat.wav
===================================================================
(Binary files differ)
Deleted: data/pool/audio/sounds/pong_score.wav
===================================================================
(Binary files differ)
Deleted: data/pool/audio/sounds/pong_side.wav
===================================================================
(Binary files differ)
Modified: data/pool/fonts/AUTHORS
===================================================================
--- data/pool/fonts/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/fonts/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -5,7 +5,6 @@
bluebold.ttf Larabie fonts “read_me.html"
bluecond.ttf Larabie fonts “read_me.html"
bluehigh.ttf Larabie fonts “read_me.html"
-console.fontdef Felix Schulthess?
LiberationMono.fontdef Larabie fonts “read_me.html"
LiberationMono.ttf Larabie fonts “read_me.html"
Monofur.fontdef Larabie fonts “read_me.html"
@@ -23,7 +22,6 @@
solo5.ttf Larabie fonts “read_me.html"
Tt-Kp.fontdef Larabie fonts “read_me.html"
Tt-Kp.ttf Larabie fonts “read_me.html"
-typewriter.ttf Felix Schulthess?
VeraMono.fontdef Larabie fonts “read_me.html"
VeraMono.ttf Larabie fonts “read_me.html"
Deleted: data/pool/fonts/console.fontdef
===================================================================
--- data/pool/fonts/console.fontdef 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/fonts/console.fontdef 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,10 +0,0 @@
-Console
-{
- type truetype
- source typewriter.ttf
- size 32
- resolution 96
- code_points 33-126 161-255
-}
-
-
Deleted: data/pool/fonts/typewriter.ttf
===================================================================
(Binary files differ)
Modified: data/pool/gui/imagesets/AUTHORS
===================================================================
--- data/pool/gui/imagesets/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/gui/imagesets/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,9 +1,7 @@
Here we list the authors of all the media files in this dirctory (and possibly sub-directories). All files are released under the CC by-sa license which can be found in the LICENSE file in this directory, unless otherwise specified.
File Author
-DriveIcons.imageset Reto Grieder?
-FairChar.imageset Reto Grieder?
-Imageset.xsd Reto Grieder?
+Imageset.xsd CEGUI
MainMenuBackground.imageset Benjamin Knecht
OrxonoxLook.imageset Damian Frick, based on TaharezGreenLook.imageset
PickupInventory.imageset Damian Frick, Eric Beier and Benedict Simlinger
Deleted: data/pool/gui/imagesets/DriveIcons.imageset
===================================================================
--- data/pool/gui/imagesets/DriveIcons.imageset 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/gui/imagesets/DriveIcons.imageset 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Imageset Name="DriveIcons" Imagefile="DriveIcons.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
- <Image Name="Artic" XPos="0" YPos="0" Width="32" Height="32" />
- <Image Name="Lime" XPos="32" YPos="0" Width="32" Height="32" />
- <Image Name="Sunset" XPos="64" YPos="0" Width="32" Height="32" />
- <Image Name="Black" XPos="96" YPos="0" Width="32" Height="32" />
- <Image Name="Blue" XPos="128" YPos="0" Width="32" Height="32" />
- <Image Name="Silver" XPos="0" YPos="32" Width="32" Height="32" />
- <Image Name="DriveStack" XPos="32" YPos="32" Width="32" Height="32" />
- <Image Name="GreenCandy" XPos="64" YPos="32" Width="32" Height="32" />
- <Image Name="GlobalDrive" XPos="96" YPos="32" Width="32" Height="32" />
-</Imageset>
\ No newline at end of file
Deleted: data/pool/gui/imagesets/FairChar.imageset
===================================================================
--- data/pool/gui/imagesets/FairChar.imageset 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/gui/imagesets/FairChar.imageset 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<Imageset Name="FairChar" Imagefile="FairChar.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
- <Image Name=" " XPos="0" YPos="0" Width="0" Height="0" />
- <Image Name="A" XPos="4" YPos="1" Width="30" Height="30" YOffset="-30" />
- <Image Name="B" XPos="35" YPos="1" Width="31" Height="30" YOffset="-30" />
- <Image Name="C" XPos="68" YPos="1" Width="31" Height="30" YOffset="-30" />
- <Image Name="D" XPos="98" YPos="1" Width="32" Height="30" YOffset="-30" />
- <Image Name="E" XPos="131" YPos="1" Width="32" Height="30" YOffset="-30" />
- <Image Name="F" XPos="163" YPos="1" Width="32" Height="30" YOffset="-30" />
- <Image Name="G" XPos="196" YPos="1" Width="30" Height="30" YOffset="-30" />
- <Image Name="H" XPos="1" YPos="94" Width="30" Height="30" YOffset="-30" />
- <Image Name="I" XPos="32" YPos="94" Width="25" Height="30" YOffset="-30" />
- <Image Name="J" XPos="1" YPos="32" Width="24" Height="30" YOffset="-30" />
- <Image Name="K" XPos="28" YPos="32" Width="30" Height="30" YOffset="-30" />
- <Image Name="L" XPos="60" YPos="32" Width="30" Height="30" YOffset="-30" />
- <Image Name="M" XPos="92" YPos="32" Width="30" Height="30" YOffset="-30" />
- <Image Name="N" XPos="123" YPos="32" Width="31" Height="30" YOffset="-30" />
- <Image Name="O" XPos="156" YPos="32" Width="30" Height="30" YOffset="-30" />
- <Image Name="P" XPos="187" YPos="32" Width="31" Height="30" YOffset="-30" />
- <Image Name="Q" XPos="58" YPos="94" Width="30" Height="30" YOffset="-30" />
- <Image Name="R" XPos="89" YPos="94" Width="32" Height="30" YOffset="-30" />
- <Image Name="S" XPos="1" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="T" XPos="32" YPos="63" Width="24" Height="30" YOffset="-30" />
- <Image Name="U" XPos="59" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="V" XPos="91" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="W" XPos="123" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="X" XPos="155" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="Y" XPos="186" YPos="63" Width="30" Height="30" YOffset="-30" />
- <Image Name="Z" XPos="123" YPos="94" Width="30" Height="30" YOffset="-30" />
-</Imageset>
Modified: data/pool/images/effects/AUTHORS
===================================================================
--- data/pool/images/effects/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/images/effects/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -11,15 +11,15 @@
backlightflare.png Fabian Landau
backlighttrail.png Fabian Landau
backlighttrail2.png David Gassner
-bigflame.png unknown
+bigflame.png OGRE Particle Editor
bigflare1.png Fabian Landau
clouds.png Benjamin de Capitani
explosion3.png Fabian Landau
-explosion.png unknown
+explosion.png OGRE Particle Editor
flare2_1.png David Gassner
-flare2.png unknown
+flare2.png David Gassner
flare.png Felix Schulthess
-flaretrail.png unknown
+flaretrail.png OGRE Particle Editor
LightningBall_1.png Joël Smely
LightningBall_2.png Joël Smely
LightningBall_3.png Joël Smely
@@ -46,13 +46,12 @@
planets/violetplanet2.png Damian Frick
planets/violetplanet.png Damian Frick
primitives/sphere.png Damian Frick
-ring_flare2.png unknown
-ring_flare.png unknown
+ring_flare2.png OGRE Particle Editor
+ring_flare.png OGRE Particle Editor
Sepia1D.png Fabian Landau?
smoke2.png Fabian Landau
smoke3.png Fabian Landau
smoke4.png Gion-Andri Cantieni
smoke.png Benjamin de Capitani
-smokecolors.png unknown
-streak.png unknown
+streak.png OGRE Particle Editor
Deleted: data/pool/images/effects/smokecolors.png
===================================================================
(Binary files differ)
Modified: data/pool/images/gui/AUTHORS
===================================================================
--- data/pool/images/gui/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/images/gui/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,8 +1,6 @@
Here we list the authors of all the media files in this directory (and possibly sub-directories). All files are released under the CC by-sa license which can be found in the LICENSE file in this directory, unless otherwise specified.
File Author
-DriveIcons.png Reto Grieder?
-FairChar.png Reto Grieder?
main_menu_1.jpg Reto Grieder
OrxonoxLook.png Damian Frick
pickup.png Damian Frick, Eric Beier and Benedict Simlinger
Deleted: data/pool/images/gui/DriveIcons.png
===================================================================
(Binary files differ)
Deleted: data/pool/images/gui/FairChar.png
===================================================================
(Binary files differ)
Modified: data/pool/images/skyboxes/AUTHORS
===================================================================
--- data/pool/images/skyboxes/AUTHORS 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/images/skyboxes/AUTHORS 2012-07-09 21:47:32 UTC (rev 9315)
@@ -19,18 +19,6 @@
skybox3_lf.png Benjamin de Capitani
skybox3_rt.png Benjamin de Capitani
skybox3_up.png Benjamin de Capitani
-skypanoramagen1_bk.jpg Fabian Landau?
-skypanoramagen1_dn.jpg Fabian Landau?
-skypanoramagen1_fr.jpg Fabian Landau?
-skypanoramagen1_lf.jpg Fabian Landau?
-skypanoramagen1_rt.jpg Fabian Landau?
-skypanoramagen1_up.jpg Fabian Landau?
-skypanoramagen2_bk.jpg Fabian Landau?
-skypanoramagen2_dn.jpg Fabian Landau?
-skypanoramagen2_fr.jpg Fabian Landau?
-skypanoramagen2_lf.jpg Fabian Landau?
-skypanoramagen2_rt.jpg Fabian Landau?
-skypanoramagen2_up.jpg Fabian Landau?
starbox_bk.jpg Felix Schulthess
starbox_dn.jpg Felix Schulthess
starbox_fr.jpg Felix Schulthess
Deleted: data/pool/images/skyboxes/skypanoramagen1_bk.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen1_dn.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen1_fr.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen1_lf.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen1_rt.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen1_up.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_bk.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_dn.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_fr.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_lf.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_rt.jpg
===================================================================
(Binary files differ)
Deleted: data/pool/images/skyboxes/skypanoramagen2_up.jpg
===================================================================
(Binary files differ)
Modified: data/pool/materials/OrxonoxSky.material
===================================================================
--- data/pool/materials/OrxonoxSky.material 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/materials/OrxonoxSky.material 2012-07-09 21:47:32 UTC (rev 9315)
@@ -1,39 +1,4 @@
-material Orxonox/skypanoramagen1
-{
- technique
- {
- pass
- {
- lighting off
- depth_write off
- texture_unit
- {
- cubic_texture skypanoramagen1.jpg separateUV
- tex_address_mode clamp
- }
- }
- }
-}
-
-material Orxonox/skypanoramagen2
-{
- technique
- {
- pass
- {
- lighting off
- depth_write off
-
- texture_unit
- {
- cubic_texture skypanoramagen2.jpg separateUV
- tex_address_mode clamp
- }
- }
- }
-}
-
material Orxonox/Starbox
{
technique
Modified: data/pool/materials/planets.material
===================================================================
--- data/pool/materials/planets.material 2012-07-08 16:31:46 UTC (rev 9314)
+++ data/pool/materials/planets.material 2012-07-09 21:47:32 UTC (rev 9315)
@@ -106,7 +106,7 @@
}
}
-material planets/violetplanet
+material planets/violetplanet2
{
technique
{
@@ -118,7 +118,7 @@
texture_unit
{
- texture violetplanet.png
+ texture violetplanet2.png
}
}
}
More information about the Orxonox-commit
mailing list