[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./config.h.dummy ./configure.ac src/wes...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./config.h.dummy ./configure.ac src/wes... |
|
Date: |
Sat, 13 Nov 2004 15:43:36 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 04/11/13 20:31:06
Modified files:
. : config.h.dummy configure.ac
src : wesconfig.h
Log message:
pumped version to 0.8.8-CVS
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/config.h.dummy.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/wesconfig.h.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Modified files:
data/scenarios/The_Rise_of_Wesnoth: Clearwater_Port.cfg
Elf_Lords.cfg
Return_of_the_Fleet.cfg
Rise_of_Wesnoth.cfg
The_Plan.cfg
The_Vanguard.cfg
Log message:
Aethyr's Portrait
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: wesnoth/config.h.dummy
diff -u wesnoth/config.h.dummy:1.8 wesnoth/config.h.dummy:1.9
--- wesnoth/config.h.dummy:1.8 Sun Oct 31 15:12:19 2004
+++ wesnoth/config.h.dummy Sun Oct 31 19:14:06 2004
@@ -9,17 +9,17 @@
#define PACKAGE_NAME "Battle for Wesnoth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 0.8.7"
+#define PACKAGE_STRING "Battle for Wesnoth 0.8.8-CVS"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "wesnoth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.8.7"
+#define PACKAGE_VERSION "0.8.8-CVS"
/* Version number of package */
-#define VERSION "0.8.7"
+#define VERSION "0.8.8-CVS"
/* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
+#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.103 wesnoth/configure.ac:1.104
--- wesnoth/configure.ac:1.103 Sun Oct 31 19:14:06 2004
+++ wesnoth/configure.ac Fri Nov 5 21:57:12 2004
@@ -10,7 +10,7 @@
dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default
server for this version])
AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default
server for this version])
-AC_REVISION([$Revision: 1.103 $])
+AC_REVISION([$Revision: 1.104 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -36,10 +36,21 @@
[static=no])
AC_ARG_ENABLE([lite],
- [ --enable-lite enable lite version of wesnoth
(without music)],
+ [ --enable-lite enable lite version of wesnoth
(without music or large images)],
[lite=$enableval],
[lite=no])
+AC_ARG_ENABLE([tinygui],
+ [ --enable-tinygui enable GUI reductions for resolutions
down to 320x240 (PDAs)],
+ [tinygui=$enableval],
+ [tinygui=no])
+
+if test "x$tinygui" = "xyes"
+then
+ CPPFLAGS="$CPPFLAGS -DUSE_TINY_GUI"
+fi
+AM_CONDITIONAL([TINYGUI], [test "x$tinygui" = "xyes"])
+
DATADIR=$PACKAGE
AC_ARG_ENABLE([datadir-name],,[AC_MSG_ERROR([Please use --with-datadir-name
instead of obsolete --enable-datadir-name])])
AC_ARG_WITH([datadir-name],
Index: wesnoth/src/wesconfig.h
diff -u wesnoth/src/wesconfig.h:1.10 wesnoth/src/wesconfig.h:1.11
--- wesnoth/src/wesconfig.h:1.10 Sun Oct 31 15:12:19 2004
+++ wesnoth/src/wesconfig.h Sun Oct 31 19:14:07 2004
@@ -4,8 +4,8 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#else
-# define VERSION "0.8.7"
-# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
+# define VERSION "0.8.8-CVS"
+# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
# define PACKAGE "wesnoth"
# define LOCALEDIR "po"
#endif
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.25 Sun Nov
7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg Sat Nov
13 20:31:06 2004
@@ -261,12 +261,14 @@
[message]
id=msgT7_4
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "I am, my Lord, I command the local
garrison. Our whole fishing fleet is evacuating people to Southbay as we speak.
The ships should be back in a few days. Our forces engaged the Orcs as they
exited the Swamp of Esten, we even pushed them back into the swamp!"
[/message]
[message]
id=msgT7_5
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Unfortunately, it was only a feint and orc
reinforcements quickly overran our positions. We lost most of our forces, my
lord, including the King of Clearwater, who was bravely leading the charge."
[/message]
@@ -279,12 +281,14 @@
[message]
id=msgT7_7
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "The blood of many good soldiers stained the
frozen field that day. And still they press on. The king left no heir, but the
other nobles have fled to Southbay. We've been busy evacuating the rest of the
populace. The army bought us enough time to evacuate almost all our people, and
most of the winter stores. They've gone to Southbay, apparently the city is
brimming with refugees from all over."
[/message]
[message]
id=msgT7_8
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "We're only holding the city until the last
of the refugees are gone. You, my lord, are free to retreat to safety when the
next ship comes. But, if I may be frank my lord, our defenses are stretched
thin and we could use all the help we can get to hold our walls. Otherwise I
fear that we will be overrun before the last of the people can be evacuated"
[/message]
@@ -297,6 +301,7 @@
[message]
id=msgT7_10
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "I thank you, my lord. But we are to bring
these Wesfolk too? It would be...highly irregular. Are you sure, my lord?"
[/message]
@@ -309,6 +314,7 @@
[message]
id=msgT7_12
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Yes Sir!"
[/message]
@@ -327,6 +333,7 @@
[message]
id=msgT7_15
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "To your posts men! We should be able to
evacuate everyone in three more boat loads. Until then, let us make those orcs
pay dearly for every inch of our land. For our homes, for our people, for our
fallen King!"
[/message]
@@ -607,6 +614,7 @@
[message]
id=msgT7_23
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the first ship has arrived! Prince
Haldric, if you and your men must leave for Southbay just go to the pier to
board the ship."
[/message]
[set_variable]
@@ -626,6 +634,7 @@
[message]
id=msgT7_24
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the first ship is departing. But
the second ship should arrive shortly."
[/message]
@@ -658,6 +667,7 @@
[message]
id=msgT7_25
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the second ship has arrived!
Prince Haldric, if you and your men want to leave for Southbay just go to the
pier to board the ship."
[/message]
[set_variable]
@@ -678,6 +688,7 @@
[message]
id=msgT7_26
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the second ship is departing. But
the last ship will be here before long. With your help we can hold on just a
while longer"
[/message]
@@ -710,6 +721,7 @@
[message]
id=msgT7_27
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the last ship has arrived! Finally
the last of our people can flee to safety. Prince Haldric, you and your men
must go now! Go to the pier to board the ship for Southbay."
[/message]
[set_variable]
@@ -730,6 +742,7 @@
[message]
id=msgT7_28
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the last ship is departing. We're
Trapped!"
[/message]
@@ -787,6 +800,7 @@
[message]
id=msgT7_29
speaker=Lieutenant Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the ship isn't
here yet. Come help us defend against the orcs"
[/message]
[/else]
@@ -798,6 +812,7 @@
[message]
id=msgT7_30
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Shirk not your duty soldier. When
the boat arrives, this is where Prince Haldric must go to lead you to the ship.
Until then, help us defend against the orcs."
[/message]
[/else]
@@ -837,6 +852,7 @@
[message]
id=msgT7_31
speaker=Lieutenant Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the ship isn't
here yet. Come help us defend against the orcs"
[/message]
@@ -889,6 +905,7 @@
[message]
id=msgT7_33
speaker=Lieutenant Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My lord, the ship isn't
here yet. Come help us defend against the orcs"
[/message]
[/else]
@@ -917,6 +934,7 @@
[message]
id=msgT7_35
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Let me have peace in Death! My love, I'll
be there soo-"
[/message]
@@ -985,6 +1003,7 @@
[message]
id=msgT7_45
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My family was from Southbay, my father was
a soldier there. The city's sewer entrance is near that fossil of a Lich."
[/message]
@@ -997,12 +1016,14 @@
[message]
id=msgT7_47
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "No. These monsters killed my family. My
wife, my daughters. There is nothing left for me. I'll stay, by the time the
Orcs wrestle Clearwater Port away from me there'll be nothing but rubble left!"
[/message]
[message]
id=msgT7_48
speaker=Lieutenant Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "The peasant farmers seem to like you. Who
knows, maybe they'll be of some help."
[/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.14
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.15
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.14 Sun Nov
7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg Sat Nov 13
20:31:06 2004
@@ -678,12 +678,14 @@
[message]
id=msgT15_31
description=Lt. Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "No Sir. I was leading the
final survivors of Clearwater Port, we were making our last stand at the
lighthouse, then one of your ships came. One of my men conked me on the head,
then I woke up at sea."
[/message]
[message]
id=msgT15_32
description=Lt. Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "I come bearing news. Some
'old friends' have decided to make an appearance. You should go 'greet' them."
[/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.17
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.18
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.17
Sun Nov 7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Sat Nov
13 20:31:06 2004
@@ -205,6 +205,7 @@
[message]
id=msgT19_2
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Sir, some ships have landed. . . They look
like they've been damaged by the voyage. Hmm, it seems that most of the ships
are staying at sea."
[/message]
[message]
@@ -215,6 +216,7 @@
[message]
id=msgT19_4
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Yes Sir! The rest of the refugees have fled
South, to our initial landing site. If we fail here they'll get slaughtered."
[/message]
[message]
@@ -225,6 +227,7 @@
[message]
id=msgT19_6
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "For the glory of the men of The Green Isle!"
[/message]
[message]
@@ -354,6 +357,7 @@
[message]
id=msgT19_13
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "I see masts on the horizon. Jevyan's fleet
is here! It's all over."
[/message]
[/event]
@@ -528,6 +532,7 @@
[message]
id=msgT19_27
speaker=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Oh, to join my family again! Do not mourn
my passing."
[/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.11
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.12
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.11 Thu Nov
11 19:04:56 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Sat Nov
13 20:31:06 2004
@@ -350,6 +350,7 @@
[message]
id=msgT21_14
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "We don't need some magic trinket to beat
you! Prepare to meet you fate you decrepit sack of bones! For the honour of all
of the people of the of the West North!"
[/message]
[message]
@@ -380,6 +381,7 @@
[message]
id=msgT21_20
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "<Whispering> Yes Sir. I am ready."
[/message]
[/event]
@@ -413,6 +415,7 @@
[message]
id=msgT21_22
speaker=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Feel my wrath, Jevyan I'm coming for you!
No piece of paper in my pocket is going to stop me from destroying you. For my
family! For the people of Clearwater Port!"
[/message]
[message]
@@ -677,6 +680,7 @@
[message]
id=msgT21_39
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "My love, my family, I'll be there soo-"
[/message]
@@ -704,6 +708,7 @@
[message]
id=msgT21_41
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Jevyan- I spit upon thee. Your end awaits.
My love, my family, I'll be there soo-"
[/message]
@@ -746,6 +751,7 @@
[message]
id=msgT21_46
description=Lt. Aethyr
+
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "You deny me my honourable
death? Our foes are not yet convinced that the Elves have the Ruby."
[/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.6
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.7
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.6 Sun Nov 7
04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg Sat Nov 13
20:31:06 2004
@@ -223,6 +223,7 @@
[message]
id=msgT20_13
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "There is no way I'm letting you go through
with this Sir! Over our dead bodies, right Jessica?"
[/message]
[message]
@@ -233,6 +234,7 @@
[message]
id=msgT20_15
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "I'll do it sir."
[/message]
[message]
@@ -243,6 +245,7 @@
[message]
id=msgT20_17
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "You've denied me my honourable death twice
already. Once when you arrived at Clearwater Port, and once again when your
ships rescued me. I'll not be denied in this a third time!"
[/message]
[message]
@@ -254,11 +257,13 @@
[message]
id=msgT20_19
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Sir, my family has been slaughtered, and my
home lost. All I long for is to join them. Give me this honourable death. . .
Please sir! I beg of you!"
[/message]
[message]
id=msgT20_20
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "After this conflict is over I'll have to
suffer through the long years alone, with no honourable way of joining them. I
want to look that monster Jevyan in the eye before I go! I won't be denied!"
[/message]
[message]
@@ -269,6 +274,7 @@
[message]
id=msgT20_22
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Honour me by destroying Jevyan! Preferably
before he can do unnatural things to me. I want to rest in the ground, not be
some mindless undead slave for all eternity!"
[/message]
[message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.20
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.21
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.20 Sun Nov
7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Sat Nov 13
20:31:06 2004
@@ -256,6 +256,7 @@
[message]
id=msgT18_14
description=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "No Sir! They must have seized all of
remaining boats on the Green Isle. Our fleet should be returning any day now."
[/message]
[message]
@@ -457,6 +458,7 @@
[message]
id=msgT18_27
speaker=Lt. Aethyr
+ image="portraits/The_Rise_of_Wesnoth/aethyr.png"
message= _ "Oh, to join my family again! Do not mourn
my passing."
[/message]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth ./config.h.dummy ./configure.ac src/wes...,
James Spencer <=