[Orxonox-commit 6032] r10691 - in data/trunk: gui/imagesets images/effects images/gui materials
fvultier at orxonox.net
fvultier at orxonox.net
Sun Oct 25 19:04:24 CET 2015
Author: fvultier
Date: 2015-10-25 19:04:23 +0100 (Sun, 25 Oct 2015)
New Revision: 10691
Added:
data/trunk/images/effects/damage.png
data/trunk/images/effects/munition.png
data/trunk/images/effects/splash.png
data/trunk/images/effects/unknown.png
data/trunk/materials/Pickups.material
Removed:
data/trunk/images/effects/damageLarge.png
data/trunk/images/effects/damageMedium.png
data/trunk/images/effects/damageSmall.png
data/trunk/materials/3arrowsup.material
data/trunk/materials/Arrow.material
data/trunk/materials/Cross.material
data/trunk/materials/Eye.material
data/trunk/materials/Shield.material
data/trunk/materials/Shrink.material
data/trunk/materials/damageLarge.material
data/trunk/materials/damageMedium.material
data/trunk/materials/damageSmall.material
Modified:
data/trunk/gui/imagesets/PickupInventory.imageset
data/trunk/images/gui/pickup.png
Log:
Modified: data/trunk/gui/imagesets/PickupInventory.imageset
===================================================================
--- data/trunk/gui/imagesets/PickupInventory.imageset 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/gui/imagesets/PickupInventory.imageset 2015-10-25 18:04:23 UTC (rev 10691)
@@ -9,6 +9,8 @@
<Image Name="UsePickup" XPos="500" YPos="0" Width="100" Height="100"/>
<Image Name="DropPickup" XPos="600" YPos="0" Width="100" Height="100"/>
+ <Image Name="DestroyPickup" XPos="1900" YPos="0" Width="100" Height="100"/>
+ <Image Name="DestroyCarrierPickup" XPos="2000" YPos="0" Width="100" Height="100"/>
<Image Name="SmallInvisible" XPos="700" YPos="0" Width="100" Height="100"/>
<Image Name="MediumInvisible" XPos="800" YPos="0" Width="100" Height="100"/>
@@ -25,4 +27,12 @@
<Image Name="SmallShrink" XPos="1600" YPos="0" Width="100" Height="100"/>
<Image Name="MediumShrink" XPos="1700" YPos="0" Width="100" Height="100"/>
<Image Name="HugeShrink" XPos="1800" YPos="0" Width="100" Height="100"/>
+
+ <Image Name="SmallDamageBoost" XPos="2100" YPos="0" Width="100" Height="100"/>
+ <Image Name="MediumDamageBoost" XPos="2200" YPos="0" Width="100" Height="100"/>
+ <Image Name="HugeDamageBoost" XPos="2300" YPos="0" Width="100" Height="100"/>
+
+ <Image Name="SmallMunition" XPos="2400" YPos="0" Width="100" Height="100"/>
+ <Image Name="MediumMunition" XPos="2500" YPos="0" Width="100" Height="100"/>
+ <Image Name="HugeMunition" XPos="2600" YPos="0" Width="100" Height="100"/>
</Imageset>
Added: data/trunk/images/effects/damage.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/damage.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: data/trunk/images/effects/damageLarge.png
===================================================================
(Binary files differ)
Deleted: data/trunk/images/effects/damageMedium.png
===================================================================
(Binary files differ)
Deleted: data/trunk/images/effects/damageSmall.png
===================================================================
(Binary files differ)
Added: data/trunk/images/effects/munition.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/munition.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/splash.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/splash.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/unknown.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/unknown.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: data/trunk/images/gui/pickup.png
===================================================================
(Binary files differ)
Deleted: data/trunk/materials/3arrowsup.material
===================================================================
--- data/trunk/materials/3arrowsup.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/3arrowsup.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material 3arrowsup
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture 3arrowsup.png
- }
- }
- }
-}
Deleted: data/trunk/materials/Arrow.material
===================================================================
--- data/trunk/materials/Arrow.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/Arrow.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material Arrow
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture arrow.png
- }
- }
- }
-}
Deleted: data/trunk/materials/Cross.material
===================================================================
--- data/trunk/materials/Cross.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/Cross.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material Cross
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture cross.png
- }
- }
- }
-}
Deleted: data/trunk/materials/Eye.material
===================================================================
--- data/trunk/materials/Eye.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/Eye.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material Eye
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture eye.png
- }
- }
- }
-}
Added: data/trunk/materials/Pickups.material
===================================================================
--- data/trunk/materials/Pickups.material (rev 0)
+++ data/trunk/materials/Pickups.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -0,0 +1,215 @@
+material Sphere2
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture sphere.png
+ }
+ }
+ }
+}
+
+material Unknown
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture unknown.png
+ }
+ }
+ }
+}
+
+material Damage
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture damage.png
+ }
+ }
+ }
+}
+
+material Shield
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture shield.png
+ }
+ }
+ }
+}
+
+material Cross
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture cross.png
+ }
+ }
+ }
+}
+
+material Munition
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture munition.png
+ }
+ }
+ }
+}
+
+material Arrow
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture arrow.png
+ }
+ }
+ }
+}
+
+material 3arrowsup
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture 3arrowsup.png
+ }
+ }
+ }
+}
+
+material Eye
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture eye.png
+ }
+ }
+ }
+}
+
+material Asterisk
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture asterisk.png
+ }
+ }
+ }
+}
+
+material Shrink
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture triplespiral.png
+ }
+ }
+ }
+}
+
+material Splash
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture splash.png
+ }
+ }
+ }
+}
\ No newline at end of file
Deleted: data/trunk/materials/Shield.material
===================================================================
--- data/trunk/materials/Shield.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/Shield.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material Shield
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture shield.png
- }
- }
- }
-}
Deleted: data/trunk/materials/Shrink.material
===================================================================
--- data/trunk/materials/Shrink.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/Shrink.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material Shrink
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture triplespiral.png
- }
- }
- }
-}
Deleted: data/trunk/materials/damageLarge.material
===================================================================
--- data/trunk/materials/damageLarge.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/damageLarge.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material damageLarge
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture damageLarge.png
- }
- }
- }
-}
Deleted: data/trunk/materials/damageMedium.material
===================================================================
--- data/trunk/materials/damageMedium.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/damageMedium.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material damageMedium
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture damageMedium.png
- }
- }
- }
-}
Deleted: data/trunk/materials/damageSmall.material
===================================================================
--- data/trunk/materials/damageSmall.material 2015-10-25 10:13:49 UTC (rev 10690)
+++ data/trunk/materials/damageSmall.material 2015-10-25 18:04:23 UTC (rev 10691)
@@ -1,17 +0,0 @@
-material damageSmall
-{
- technique
- {
- pass
- {
- lighting off
- scene_blend add
- depth_write off
-
- texture_unit
- {
- texture damageSmall.png
- }
- }
- }
-}
More information about the Orxonox-commit
mailing list