gfgtdf
28bfa6037c
optimize minimap.cpp
2014-05-27 21:48:28 +02:00
Chris Beck
e5015214d0
fix bug in [wml_message] which caused wml errors not to be flushed
2014-05-27 15:26:00 -04:00
gfgtdf
8a95d36c61
optimize minimap.cpp
...
by moving a call out of the loop.
2014-05-27 21:05:47 +02:00
Chris Beck
cad6edf182
add comment to test_relative_dir.cfg
2014-05-27 12:00:30 -04:00
Alexander van Gessel
4d7de12e47
Unit tests for deterministic unit facings
2014-05-27 17:30:13 +02:00
Alexander van Gessel
311d7bad80
Make recruit facing direction deterministic
...
This commit borrows ideas from PR #29
If there are enemies, face towards the closest one (with distance reduced by enemy level)
If you have a leader, face away from him.
Otherwise, face towards the center of the map.
2014-05-27 17:29:07 +02:00
Alexander van Gessel
d8cd6be83c
Add _" and " between shared weapon effects.
2014-05-27 15:01:06 +02:00
Alexander van Gessel
038ff82a02
Test case for two interface bugs
...
An effect that does more than one thing concatenates the descriptions.
The effect description isn't updated when a new weapon which it affects
is added to the unit.
2014-05-27 14:58:43 +02:00
Alexander van Gessel
e701fe68b0
Move animationless moving unit hiding to a more appropriate place
...
Unit hiding is usually done in replace_temporary, which is called by
proceed_to. As proceed_to exits at the beginning if animate is false, this
would seem like a good place to hide the unit, but it is also unhidden during
this function. This means that was_hidden_ is set multiple times, with the
second time overwriting it with the temporary state of being hidden.
As animate remains false for the entire lifetime of the unit mover, we hide it
at the start and let finish unhide it again.
Reported at http://r.wesnoth.org/p570866
2014-05-27 13:47:47 +02:00
Chris Beck
30c179b92d
refactor enum casts: prefer lexical cast default and cfg["x"].str()
2014-05-27 03:44:23 -04:00
Chris Beck
991d334388
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-26 23:35:14 -04:00
Chris Beck
f664b4e5af
add test of [modify_unit] facing= attribute
2014-05-26 23:34:48 -04:00
gfgtdf
0f5dc4febb
Merge branch 'master' of https://github.com/wesnoth/wesnoth
2014-05-27 04:25:36 +02:00
gfgtdf
e80fc181ae
simplfy the use of turn_info
...
recreating this object has no effect besides send_data so i replaced
recreating with calling send_data.
2014-05-27 02:53:30 +02:00
gfgtdf
c621bfde14
remove turn_info::team_num_
...
it's not used anymore.
2014-05-27 02:15:23 +02:00
Chris Beck
b272239ea9
add replace_schedule in prestart test
2014-05-26 20:14:16 -04:00
Chris Beck
254c38e9af
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-26 20:02:27 -04:00
Chris Beck
ec5ec4fb38
add tests of modify_turns tag
2014-05-26 20:02:05 -04:00
gfgtdf
d28a1d6563
Merge branch 'master' of https://github.com/wesnoth/wesnoth
2014-05-27 01:11:08 +02:00
gfgtdf
562e1edd00
remove do_replay s side parameter
...
and use controller->current_side() instead.
2014-05-27 01:10:30 +02:00
Chris Beck
0c504c5434
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-26 19:08:06 -04:00
Chris Beck
7cc62266e9
unit tests for giving gold in prestart
2014-05-26 19:06:00 -04:00
gfgtdf
52f271a390
use turn_info_send in play_idle_loop
2014-05-27 00:50:32 +02:00
gfgtdf
12f117400c
use turn_info_send in play_human_turn
2014-05-27 00:44:26 +02:00
gfgtdf
8282b1b0d6
add turn_info_send class
2014-05-27 00:42:09 +02:00
Chris Beck
71190a0b05
Merge remote-tracking branch 'aquileia/DM_fix'
2014-05-26 18:41:11 -04:00
Chris Beck
f4708f5236
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-26 18:40:43 -04:00
Chris Beck
694a2c4fd1
for some compilers, assert != terminate... fixup make_enum
2014-05-26 18:40:02 -04:00
gfgtdf
022f78a3ae
remove command_disabled_resetter
...
it was part of the old rng implementation which was removed.
2014-05-27 00:16:00 +02:00
Chris Beck
f11b7ac6e7
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-26 17:39:36 -04:00
Chris Beck
f4fa57f09f
add "do_build_and_tests.sh" to .gitignore
...
This is convenient for me to do.
2014-05-26 17:39:11 -04:00
aquileia
9b51a3a877
Implement temporary weapon swap in DM 21
...
As Kalenz puts it, "We have acquired orcish weapons". All elvish swords
are replaced by orcish ones for the duration of the scenario.
2014-05-26 23:23:28 +02:00
gfgtdf
830eb0c123
remove whiteboard continue_execute_all
...
this is not needed since we changed the rng for attacks in
821dbd1cb85ce46c88715496a18766424824a6c3.
2014-05-26 23:05:10 +02:00
Chris Beck
a28ca002af
remove const from alignment_description return type
...
http://www.wesnoth.org/irclogs/2014/05/%23wesnoth-dev.2014-05-26.log
2014-05-26 16:06:52 -04:00
Chris Beck
96d616eb4d
travis reruns ./test in case of error code 200, 10 times max
...
This is to combat what are apparently transient timeout faults
where the travis workers choke on running ./test and never
actually start the process... it seems not even to get to the
"running 140 tests" message when it ends with error code 200.
2014-05-26 16:04:10 -04:00
Chris Beck
cec797bcb4
travis now takes 15 seconds to timeout a test rather than 10
2014-05-26 15:04:03 -04:00
Chris Beck
7cad975038
add timeout (sec) arg, and "additional wesnoth args" to test script
2014-05-26 15:03:34 -04:00
Chris Beck
d734b09d18
fixup 0656e93134b7 *now* it returns const, and recipients are const
2014-05-26 14:53:18 -04:00
Chris Beck
0656e93134
fixup alignment_type function (returns const std::string now)
...
This fixes up 684d1c35c64e9317e331f3860aeb0fb98088ac28.
gfgtdf was getting crashes in the help menu otherwise.
2014-05-26 14:34:55 -04:00
Chris Beck
793cbaf479
Refactor to make campaign_type an enum
2014-05-26 14:01:32 -04:00
Chris Beck
861a2bffe6
remove dead code from gamestatus object
...
The "history" tag apparently did nothing and has no affect in the
engine, as pointed out by gfgtdf a month ago... According to git
it was added in 2009. I am now removing it.
2014-05-26 12:37:31 -04:00
Chris Beck
853768ce85
Merge branch 'refactor_play_turn_to_avoid_string_literals'
2014-05-25 20:58:14 -04:00
Chris Beck
28c6dbfa2b
Refactor, since this logic is in MAKE_ENUM now for team:controller
2014-05-25 20:57:19 -04:00
gfgtdf
387017d6d2
add a check_victory after init side
2014-05-26 01:23:35 +02:00
Chris Beck
b2ac9c5b31
Merge branch 'master' of git://github.com/wesnoth/wesnoth
2014-05-25 16:23:22 -04:00
Chris Beck
9ac310e191
team::controller enum to use MAKE_ENUM macro
2014-05-25 16:22:55 -04:00
gfgtdf
d1d70cb7b1
remove check_victory in play_human_turn
...
we don't need these because we call check_victory at the end of the
synced_context.
I removed them because check_victory assumes that "this code is run
rarely" which is not the case if we call it there.
2014-05-25 21:56:26 +02:00
gfgtdf
9f399d8979
cleanup check_victory in ai actions
...
do_execute which calls run_in_synced_context can throw end_level
exception because run_in_synced context calls check_victory. So we don't
need the additional check_victory in action_result::execute anymore.
2014-05-25 21:56:20 +02:00
Chris Beck
684d1c35c6
unit_type::alignment to use MAKE_ENUM macro
2014-05-25 14:38:00 -04:00
Chris Beck
7b876194bd
update changelog
2014-05-25 12:27:43 -04:00
