Mercurial > nagslang

changeset 476:7f33228ff62a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author David Sharpe <decoydavid@gmail.com>
date Sat, 07 Sep 2013 16:46:43 +0200
parents 9775055ba2f0 (current diff) 3bddf39b1ceb (diff)
children 290cb3a0927e
files
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/hangar	Sat Sep 07 16:43:44 2013 +0200
+++ b/data/levels/hangar	Sat Sep 07 16:46:43 2013 +0200
@@ -61,6 +61,16 @@
   - [1700, 410]
   - 'HANGAR 1: '
   classname: Note
+- args:
+  - [2400, 1450]
+  - crew
+  - [500, 1400]
+  - 180
+  classname: Door
+- args:
+  - [2350, 1500]
+  - 'CREW: Void lock failure detected - please call maintenance'
+  classname: Note
 lines: []
 polygons:
   1:
--- a/data/levels/start	Sat Sep 07 16:43:44 2013 +0200
+++ b/data/levels/start	Sat Sep 07 16:46:43 2013 +0200
@@ -22,8 +22,8 @@
   name: note_restart
 - args:
   - [550, 550]
-  - level1
-  - [300, 300]
+  - hangar
+  - [1650, 2450]
   - 90
   classname: RestartGameDoor
 - args: