forked from github/server
Merge remote-tracking branch 'eressea/master'
Conflicts: src/kernel/order.c
This commit is contained in:
commit
6b14eae118
|
@ -118,7 +118,7 @@
|
||||||
<param name="study.speedup" value="0"/>
|
<param name="study.speedup" value="0"/>
|
||||||
<param name="world.era" value="3"/>
|
<param name="world.era" value="3"/>
|
||||||
<param name="rules.migrants" value="0"/>
|
<param name="rules.migrants" value="0"/>
|
||||||
<param name="rules.monsters.attack_chance" value="0.1"/>
|
<param name="rules.monsters.attack_chance" value="0.0"/>
|
||||||
<param name="rules.transfermen" value="0"/>
|
<param name="rules.transfermen" value="0"/>
|
||||||
<param name="rules.stealth.faction" value="1"/>
|
<param name="rules.stealth.faction" value="1"/>
|
||||||
<param name="rules.stealth.anon_battle" value="0"/>
|
<param name="rules.stealth.anon_battle" value="0"/>
|
||||||
|
|
2
critbit
2
critbit
|
@ -1 +1 @@
|
||||||
Subproject commit 2d901a238b98b14204f9118abc5040ff4904052c
|
Subproject commit 2a7af5e2347217ea4efcf7fb3f0bc9c2681d1a17
|
|
@ -1476,7 +1476,7 @@
|
||||||
<text locale="en">MAKE</text>
|
<text locale="en">MAKE</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="maketemp">
|
<string name="maketemp">
|
||||||
<text locale="de">MAKETEMP</text>
|
<text locale="en">MAKETEMP</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="move">
|
<string name="move">
|
||||||
<text locale="en">MOVE</text>
|
<text locale="en">MOVE</text>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
s/preview build
|
s/preview build master
|
||||||
s/preview version
|
s/preview version
|
||||||
for game in 2 3 4 ; do
|
for game in 2 3 4 ; do
|
||||||
s/preview -g $game run && \
|
s/preview -g $game run && \
|
||||||
|
|
12
s/preview
12
s/preview
|
@ -23,6 +23,7 @@ function build() {
|
||||||
assert_dir $SOURCE
|
assert_dir $SOURCE
|
||||||
cd $SOURCE
|
cd $SOURCE
|
||||||
git pull || abort "failed to update source. do you have local changes?"
|
git pull || abort "failed to update source. do you have local changes?"
|
||||||
|
[ -z $1 ] || git checkout $1
|
||||||
s/build || abort "build failed."
|
s/build || abort "build failed."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,11 +84,11 @@ let turn=$turn+1
|
||||||
}
|
}
|
||||||
|
|
||||||
function send() {
|
function send() {
|
||||||
echo "sending reports to $1"
|
|
||||||
zip="$turn-$1.zip"
|
zip="$turn-$1.zip"
|
||||||
zip -q -u $zip $turn-$1.?r
|
zip -q -u $zip $turn-$1.?r
|
||||||
email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
|
email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
|
||||||
cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $GAME Partei $1" -a $zip -- $email
|
echo "sending reports to $1 / $email"
|
||||||
|
cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
|
||||||
}
|
}
|
||||||
|
|
||||||
game=0
|
game=0
|
||||||
|
@ -128,7 +129,8 @@ case "$1" in
|
||||||
version
|
version
|
||||||
;;
|
;;
|
||||||
"build")
|
"build")
|
||||||
build
|
shift
|
||||||
|
build $*
|
||||||
;;
|
;;
|
||||||
"setup")
|
"setup")
|
||||||
setup
|
setup
|
||||||
|
@ -153,8 +155,8 @@ case "$1" in
|
||||||
sent=1
|
sent=1
|
||||||
done
|
done
|
||||||
if [ $sent -eq 0 ]; then
|
if [ $sent -eq 0 ]; then
|
||||||
if [ -e $factions ]; then
|
if [ -e ../$factions ]; then
|
||||||
for faction in $(cat $factions) ; do
|
for faction in $(cat ../$factions) ; do
|
||||||
send $faction
|
send $faction
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#define VERSION_MAJOR 3
|
#define VERSION_MAJOR 3
|
||||||
#define VERSION_MINOR 0
|
#define VERSION_MINOR 2
|
||||||
#define VERSION_BUILD 682
|
#define VERSION_BUILD 684
|
||||||
|
|
|
@ -3627,6 +3627,8 @@ void new_units(void)
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
init_tokens(makeord);
|
||||||
|
skip_token();
|
||||||
alias = getid();
|
alias = getid();
|
||||||
|
|
||||||
token = getstrtoken();
|
token = getstrtoken();
|
||||||
|
|
Loading…
Reference in New Issue