Ignore:
Timestamp:
Sep 7, 2013, 9:30:33 PM (7 years ago)
Author:
David Sharpe <decoydavid@…>
Branch:
default
Children:
595:e848e77c5fee, 616:11a3ac7365cd
Parents:
593:0279d573ef7e (diff), 592:db8b87caa402 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/levels/crew

    r592 r594  
    229229  - [68, 1623]
    230230  - cargo_bay
    231   - [1550, 1200]
     231  - [1760, 1265]
    232232  - 0
    233233  classname: Door
  • data/levels/crew

    r593 r594  
    116116  classname: ChargingAlien
    117117  name: store_alien_1
     118- args:
     119  - [684, 612]
     120  - 300
     121  classname: ChargingAlien
     122  name: room_one_alien
     123- args:
     124  - [1304, 760]
     125  - 300
     126  classname: ChargingAlien
     127  name: room_two_alien
    118128game_objects:
    119129- args:
     
    424434  classname: ToggleSwitch
    425435  name: room_two_switch
     436- args:
     437  - [2668, 1428]
     438  classname: SokoBox
     439  name: lift_box_1
     440- args:
     441  - [2792, 1436]
     442  classname: SokoBox
     443  name: store_box_2
     444- args:
     445  - [2732, 1316]
     446  classname: SokoBox
     447  name: lift_box_3
    426448lines: []
    427449music: POL-cyber-factory-short.ogg
Note: See TracChangeset for help on using the changeset viewer.