Changeset 275:bcdfd2be2eb4


Ignore:
Timestamp:
04/08/11 17:18:48 (12 years ago)
Author:
Adrianna Pińska <adrianna.pinska@…>
Branch:
default
Parents:
274:e006ec7b3d8f (diff), 273:95e2ef31e714 (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:

Merged changes, I hope.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • data/levels/temple.json

    r273 r275  
    3030    ],
    3131    "doorways": {
    32         "starting": {"type": "StartingDoorway", "pos": [4, 16], "facing": "right"},
    33         "to_level2": {"type": "Doorway", "pos": [17, 16], "facing": "left", "leadsto": "level2.to_temple"}
     32        "starting": {"type": "StartingDoorway", "pos": [4, 17], "facing": "right"},
     33        "to_temple_grounds": {"type": "Doorway", "pos": [17, 16], "facing": "left", "leadsto": "temple_grounds.to_temple"}
    3434    }
    3535}
Note: See TracChangeset for help on using the changeset viewer.