Ignore:
Timestamp:
09/07/13 22:48:35 (8 years ago)
Author:
David Sharpe <decoydavid@…>
Branch:
default
Parents:
616:11a3ac7365cd (diff), 609:9ea26b835271 (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.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/levels/crew

    r605 r617  
    247247- args:
    248248  - [68, 1623]
    249   - cargo_bay
    250   - [1760, 1265]
     249  - hangar
     250  - [2680, 1675]
    251251  - 0
    252252  classname: Door
     
    377377- args:
    378378  - [2950, 1193]
    379   - hangar
    380   - [2680, 1675]
     379  - cargo_bay
     380  - [1760, 1265]
    381381  - -45
    382382  - hangar_door_puzzle
  • data/levels/crew

    r616 r617  
    126126  classname: ChargingAlien
    127127  name: room_two_alien
     128- args:
     129  - [2816, 1344]
     130  - 300
     131  classname: ChargingAlien
     132  name: lift_alien_1
     133- args:
     134  - [2648, 1336]
     135  - 300
     136  classname: ChargingAlien
     137  name: lift_alien_2
     138- args:
     139  - [2728, 1528]
     140  - 300
     141  classname: ChargingAlien
     142  name: lift_alien_3
    128143game_objects:
    129144- args:
     
    212227  classname: Door
    213228  name: room_one_exit
     229- args:
     230  - [440, 572]
     231  classname: collectable.Gun
     232  name: gun
    214233- args:
    215234  - [982, 671]
     
    361380  - [1760, 1265]
    362381  - -45
    363   classname: Door
     382  - hangar_door_puzzle
     383  classname: PuzzleDoor
    364384  name: to_hangar
     385- args: [lift_switch_1, lift_switch_2]
     386  classname: puzzle.StateLogicalAndPuzzler
     387  name: hangar_door_puzzle
     388- args:
     389  - [2900, 1576]
     390  classname: FloorSwitch
     391  name: lift_switch_1
     392- args:
     393  - [2556, 1220]
     394  classname: FloorSwitch
     395  name: lift_switch_2
    365396- args:
    366397  - [2596, 2248]
     
    447478  name: lift_box_3
    448479lines: []
    449 music: POL-cyber-factory-short.ogg
     480music: POL-against-the-system-short.ogg
    450481polygons:
    451482  1:
Note: See TracChangeset for help on using the changeset viewer.