Changeset 12


Ignore:
Timestamp:
02/25/09 00:43:06 (10 years ago)
Author:
barra_parpg
Message:
  • Applying vtchill's name conflict patch
Location:
trunk/game/objects/items/resort
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/objects/items/resort/balls/blue/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="blue_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/balls/green/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="green" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="green_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/balls/red/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="red_ball" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/life_belts/blue/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="blue_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/life_belts/green/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="green" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="green_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/life_belts/red/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="red_belt" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44        <image source="045.png" direction="45" /> 
  • trunk/game/objects/items/resort/sunshades/blue/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="blue" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="blue_sunshade" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44</object> 
  • trunk/game/objects/items/resort/sunshades/red/object.xml

    r9 r12  
    11<?fife type="object"?> 
    2 <object id="red" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
     2<object id="red_sunshade" namespace="http://www.fifengine.de/xml/rio_de_hola" blocking="1" static="1"> 
    33        <image source="000.png" direction="0" /> 
    44</object> 
Note: See TracChangeset for help on using the changeset viewer.