Enigma Source (svn, archived)

Enigma is a puzzle game

Brought to you by: alochmann, danielheck, raoul-b, rlamprecht

Commit [r763] Maximize Restore History

trunk: merge of 1.01 changes - part 1

- 1.01 changes from r546:732
Note:
- r545:546 has already been merged with r547
- we need to split the merge due to data/sound delete and recreation

Authored by: ral 2007-05-27

Browse code at this revision

Parent: [r762]

Child: [r764]

1 2 3 .. 14 > >> (Page 1 of 14)

copied	/branches/1.0/data/levels/enigma_esprit/esprit37_3.xml -> /trunk/data/levels/enigma_esprit/esprit37_3.xml
copied	/branches/1.0/data/levels/enigma_experimental/flood_demo_1.xml -> /trunk/data/levels/enigma_experimental/flood_demo_1.xml
copied	/branches/1.0/data/levels/enigma_experimental/floors_1.xml -> /trunk/data/levels/enigma_experimental/floors_1.xml
copied	/branches/1.0/data/levels/enigma_experimental/items_1.xml -> /trunk/data/levels/enigma_experimental/items_1.xml
copied	/branches/1.0/data/levels/enigma_experimental/puzzle_demo_2.xml -> /trunk/data/levels/enigma_experimental/puzzle_demo_2.xml
copied	/branches/1.0/data/levels/enigma_experimental/puzzle_testarea_1.xml -> /trunk/data/levels/enigma_experimental/puzzle_testarea_1.xml
copied	/branches/1.0/data/levels/enigma_experimental/stones_1.xml -> /trunk/data/levels/enigma_experimental/stones_1.xml
changed	/trunk/CHANGES
changed	/trunk/Makefile.am
changed	/trunk/README
changed	/trunk/configure.ac
changed	/trunk/data/Makefile.am
changed	/trunk/data/gfx/enigma_logo3.png
changed	/trunk/data/gfx/enigma_marble.png
changed	/trunk/data/levels/enigma_cross/enigma0_92_1.xml
changed	/trunk/data/levels/enigma_cross/enigma0_92_2.xml
changed	/trunk/data/levels/enigma_cross/enigma0_92_3.xml
changed	/trunk/data/levels/enigma_cross/newlevels.xml
changed	/trunk/data/levels/enigma_cross/newlevels_1.0.1.xml
removed	/trunk/data/levels/enigma_esprit/esprit37_2.xml
changed	/trunk/data/levels/enigma_esprit/index.xml
changed	/trunk/data/levels/enigma_experimental/index.xml
removed	/trunk/data/levels/enigma_experimental/items.xml
removed	/trunk/data/levels/enigma_experimental/puzzle_demo.xml
removed	/trunk/data/levels/enigma_experimental/randompuzzles.xml

/branches/1.0/data/levels/enigma_esprit/esprit37_3.xml to /trunk/data/levels/enigma_esprit/esprit37_3.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/flood_demo_1.xml to /trunk/data/levels/enigma_experimental/flood_demo_1.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/floors_1.xml to /trunk/data/levels/enigma_experimental/floors_1.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/items_1.xml to /trunk/data/levels/enigma_experimental/items_1.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/puzzle_demo_2.xml to /trunk/data/levels/enigma_experimental/puzzle_demo_2.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/puzzle_testarea_1.xml to /trunk/data/levels/enigma_experimental/puzzle_testarea_1.xml

File was copied.

/branches/1.0/data/levels/enigma_experimental/stones_1.xml to /trunk/data/levels/enigma_experimental/stones_1.xml

File was copied.

/trunk/CHANGES Diff Switch to side-by-side view

/trunk/Makefile.am Diff Switch to side-by-side view

/trunk/README Diff Switch to side-by-side view

/trunk/configure.ac Diff Switch to side-by-side view

/trunk/data/Makefile.am Diff Switch to side-by-side view

/trunk/data/gfx/enigma_logo3.png

Binary file was changed.

/trunk/data/gfx/enigma_marble.png

Binary file was changed.

/trunk/data/levels/enigma_cross/enigma0_92_1.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_cross/enigma0_92_2.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_cross/enigma0_92_3.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_cross/newlevels.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_cross/newlevels_1.0.1.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_esprit/esprit37_2.xml

File was removed.

/trunk/data/levels/enigma_esprit/index.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_experimental/index.xml Diff Switch to side-by-side view

/trunk/data/levels/enigma_experimental/items.xml

File was removed.

/trunk/data/levels/enigma_experimental/puzzle_demo.xml

File was removed.

/trunk/data/levels/enigma_experimental/randompuzzles.xml

File was removed.

1 2 3 .. 14 > >> (Page 1 of 14)