Changeset 618:cc94512d14f2


Ignore:
Timestamp:
09/07/13 22:49:13 (8 years ago)
Author:
David Sharpe <decoydavid@…>
Branch:
default
Parents:
617:2070ce83637b (diff), 613:0b46e8524ec5 (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

Location:
data/levels
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • data/levels/crew

    r611 r618  
    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

    r617 r618  
    4848- args:
    4949  - [834, 1842]
    50   - [500, 500]
     50  - [982, 1680]
    5151  classname: PatrollingAlien
    5252  name: patrol_1
    5353- args:
    5454  - [740, 2122]
    55   - [500, 500]
     55  - [726, 2289]
    5656  classname: PatrollingAlien
    5757  name: patrol_1
    5858- args:
    5959  - [936, 1668]
    60   - [900, 900]
     60  - [1102, 1504]
    6161  classname: PatrollingAlien
    6262  name: patrol_2
    6363- args:
    6464  - [624, 1716]
    65   - [900, 900]
     65  - [470, 1560]
    6666  classname: PatrollingAlien
    6767  name: patrol_3
    6868- args:
    6969  - [1024, 1788]
    70   - [900, 900]
     70  - [1249, 1736]
    7171  classname: PatrollingAlien
    7272  name: patrol_4
    7373- args:
    7474  - [748, 1640]
    75   - [900, 900]
     75  - [668, 1419]
    7676  classname: PatrollingAlien
    7777  name: patrol_5
    7878- args:
    7979  - [572, 2016]
    80   - [900, 900]
     80  - [365, 20035]
    8181  classname: PatrollingAlien
    8282  name: patrol_6
    8383- args:
    8484  - [552, 1864]
    85   - [900, 900]
     85  - [272, 1806]
    8686  classname: PatrollingAlien
    8787  name: patrol_7
     
    9393- args:
    9494  - [932, 2072]
    95   - [900, 900]
     95  - [1050, 2180]
    9696  classname: PatrollingAlien
    9797  name: patrol_9
    9898- args:
    9999  - [740, 1938]
    100   - [900, 900]
     100  - [586, 2090]
    101101  classname: PatrollingAlien
    102102  name: patrol_10
  • data/levels/hangar

    r613 r618  
    7676  - [2680, 1701]
    7777  - crew
    78   - [2935, 1205]
     78  - [110, 1650]
    7979  - 90
    8080  - keycard_red
     
    105105  name: maint_toggle_2
    106106- args:
    107   - [160, 1661]
     107  - [160, 1500]
    108108  classname: FloorSwitch
    109109  name: maint_switch_1
    110110- args:
    111   - [1840, 1261]
     111  - [1340, 1261]
    112112  classname: FloorSwitch
    113113  name: maint_switch_2
  • data/levels/hangar

    r616 r618  
    205205  classname: Note
    206206  name: cargo_note
     207- args:
     208  - [260, 1781]
     209  - hangar
     210  - [260, 1665]
     211  - 90
     212  classname: Door
     213  name: from_keys
     214- args:
     215  - [260, 1701]
     216  - hangar
     217  - [260, 1810]
     218  - 90
     219  - keycard_red
     220  classname: KeyedDoor
     221  name: to_keys
     222- args:
     223  - [225, 1960]
     224  - [285, 1960]
     225  - keycard_blue
     226  classname: KeyedHatch
     227  name: blue_hatch
     228- args:
     229  - [225, 2160]
     230  - [285, 2160]
     231  - keycard_green
     232  classname: KeyedHatch
     233  name: green_hatch
     234- args:
     235  - [225, 2340]
     236  - [285, 2340]
     237  - keycard_black
     238  classname: KeyedHatch
     239  name: black_hatch
     240- args:
     241  - [255, 2520]
     242  - alientunnel1
     243  - [1025, 1025]
     244  - 90
     245  classname: Door
     246  name: to_alientunnel1
    207247lines:
    208248- - [120, 1321]
     
    212252- - [280, 1161]
    213253  - [280, 1101]
     254- - [120, 1960]
     255  - [225, 1960]
     256- - [285, 1960]
     257  - [380, 1960]
     258- - [120, 2160]
     259  - [225, 2160]
     260- - [285, 2160]
     261  - [380, 2160]
     262- - [120, 2340]
     263  - [225, 2340]
     264- - [285, 2340]
     265  - [380, 2340]
    214266music: POL-cyber-factory-short.ogg
     267music_volume: 0.3
    215268polygons:
    216269  1:
     
    278331  - [2400, 1321]
    279332  - [2400, 280]
     333  2:
     334  - [120, 1781]
     335  - [120, 2521]
     336  - [380, 2521]
     337  - [380, 1781]
     338  - [120, 1781]
    280339size: [3001, 2601]
Note: See TracChangeset for help on using the changeset viewer.