Author: zookeeper
Date: Mon Apr 2 15:24:59 2012
New Revision: 53753
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53753&view=rev
Log:
Ported r53752 to 1.10. Shouldn't have any unwanted consequences.
Modified:
branches/1.10/changelog
branches/1.10/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg
branches/1.10/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg
Modified: branches/1.10/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/changelog?rev=53753&r1=53752&r2=53753&view=diff
==============================================================================
--- branches/1.10/changelog (original)
+++ branches/1.10/changelog Mon Apr 2 15:24:59 2012
@@ -17,6 +17,8 @@
Russian, Serbian, Slovak, Spanish
* Multiplayer:
* Ignore Pango markup in map descriptions (bug #19210)
+ * Changes to the time of day schedules of Fallenstar Lake and Silverhead
+ Crossing
* User interface:
* Fixed provided saved game filenames being ignored when requesting to
save a MP game due to a network or OOS error (bug #19562)
Modified: branches/1.10/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg?rev=53753&r1=53752&r2=53753&view=diff
==============================================================================
--- branches/1.10/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg (original)
+++ branches/1.10/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg Mon Apr 2
15:24:59 2012
@@ -7,7 +7,13 @@
map_data="{multiplayer/maps/2p_Fallenstar_Lake.map}"
random_start_time="no"
- {DEFAULT_SCHEDULE}
+ {SECOND_WATCH}
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+
{DEFAULT_MUSIC_PLAYLIST}
[side]
Modified: branches/1.10/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg?rev=53753&r1=53752&r2=53753&view=diff
==============================================================================
--- branches/1.10/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg
(original)
+++ branches/1.10/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg Mon Apr
2 15:24:59 2012
@@ -7,13 +7,7 @@
map_data="{multiplayer/maps/2p_Silverhead_Crossing.map}"
random_start_time="no"
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
- {DAWN}
-
+ {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
[side]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
