51098 Commits

Author SHA1 Message Date
Alexander van Gessel
3ae335c5fe Merge branch 'bzip2' 2012-10-08 15:30:56 +01:00
Fabian Müller
9526f9e3bf Made the editor gui work better on low resolutions.
No more empty space at 800x480.

Switched the order of row 3 and 4 of the tool buttons.
2012-10-08 11:51:02 +00:00
Steven Panek
0da6f9be9c Updated the Galician translation. 2012-10-07 19:09:59 +00:00
J. Tyne
0509957317 Convert a private member function to a static non-member function. 2012-10-07 17:45:03 +00:00
J. Tyne
1fb470a895 Moving a variable into the function where it is used
(instead of passing it as a parameter).
2012-10-07 17:33:26 +00:00
Jérémy Rosen
4d9727cbc9 fix bug #20099 add the image to the data used for refresh 2012-10-07 16:18:23 +00:00
Nils Kneuper
3eabc6df85 applied utils/wesnoth-optipng:
Overall statistics (only for files with a smaller recompressed size):
  Original size: 4442 KiB on 35 files
 Optimized size: 4211 KiB
   Total saving: 230 KiB = 5% decrease
2012-10-07 09:38:45 +00:00
Mark de Wever
496c8772f2 Strip trailing whitespace. 2012-10-07 09:18:00 +00:00
Mark de Wever
5d452a9cd4 Initialize all members. 2012-10-07 09:17:58 +00:00
Mark de Wever
137a31792c Initialize all members. 2012-10-07 09:17:55 +00:00
Mark de Wever
72e1e227a7 Initialize all members. 2012-10-07 09:17:52 +00:00
Mark de Wever
17e542dac1 Add -Wc++11-compat to the pedantic flags. 2012-10-07 09:17:50 +00:00
Mark de Wever
7a3fa073da Add -Wuseless-cast to the pedantic flags. 2012-10-07 09:17:47 +00:00
Mark de Wever
36f05a020d Remove a useless cast.
Detected by the upcoming gcc-4.8.
2012-10-07 09:17:44 +00:00
Mark de Wever
a3bf1d25ef Remove a useless cast.
Detected by the upcoming gcc-4.8.
2012-10-07 09:17:41 +00:00
Mark de Wever
7fd8f4c3f7 Remove a useless cast.
Detected by the upcoming gcc-4.8.
2012-10-07 09:17:38 +00:00
Mark de Wever
44b3dccd10 Fixes the shift and meta key in the hotkeys.
The test tested the right shift and meta twice and the left one never.

Issue found by cppcheck.
2012-10-07 09:17:35 +00:00
Fabian Müller
e954c25637 LoW::1: Removed the signpost which is no longer part of the scenarios objectives.
Gold adjustments.
Minor changes to the dialogues.
2012-10-07 05:12:31 +00:00
Gabriel Morin
cc3a42d352 Changelog entries for 2012-10-07T02:18:27Z!gabrielmorin@gmail.com 2012-10-07 02:45:04 +00:00
Richard Kettering
bd6ec9eb94 Updated the konrad and lisar portraits in the tutorial...
...to be the same as the new base portraits in HttT.
2012-10-07 02:20:31 +00:00
Gabriel Morin
1e319ff73c Don't end turn if executing all actions in another way than...
...using the "end turn" action. Fixes bug #19901.
2012-10-07 02:18:27 +00:00
Richard Kettering
e5da0cf3c9 Replaced the old perrin and masked dwarf portraits with DUHH's current work. 2012-10-07 02:14:06 +00:00
Richard Kettering
4159dea592 Updated portraits for the generic ogre, wose, and sea serpent. 2012-10-07 01:37:43 +00:00
J. Tyne
2edf94b9a4 A more varied set of test cases for attack prediction timings...
...and verification.

The old set had several deficiencies, such as every unit with slow
also having only one attack and having the swarm special (so usually
no attacks). This set keeps the specials and stats on separate cycles.
2012-10-05 21:27:54 +00:00
J. Tyne
b927f4abec Some sparse matrix optimizations.
Benchmarking indicated a 40% reduction in run time for attack
predictions.  (Almost 50% when I substituted a rougher test set.)
2012-10-05 21:12:43 +00:00
J. Tyne
6b6015dea3 Introduce a symbolic constant for the number of planes used by prob_matrix.
(I'm not sure if the number will change yet, but at least it's easier
to change if it comes to that.)
2012-10-05 17:11:38 +00:00
J. Tyne
7fdc64c32b Store more state in combat_matrix. 2012-10-05 16:48:27 +00:00
Fabian Müller
ac337530dc LoW::2: Same balancing adjustments. 2012-10-05 16:21:49 +00:00
Fabian Müller
a298e70a40 Cleaned non working elements from editor gui. 2012-10-05 15:55:45 +00:00
J. Tyne
20a29ce40e Let combat_matrix express "fully healed" as "max_hp"...
...rather than "highest row".

(Part of the separation of implementation and interpretation.)
2012-10-05 15:55:44 +00:00
J. Tyne
1ee61dbfa4 extract_results: Further splitting the labor...
...between prob_matrix and combat_matrix.
2012-10-05 15:15:14 +00:00
J. Tyne
94b1c40915 _levelup: Further splitting the labor...
...between prob_matrix and combat_matrix.
2012-10-05 14:51:47 +00:00
J. Tyne
8991c54931 remove_petrify_distortion: Further splitting the labor...
...between prob_matrix and combat_matrix.
2012-10-05 14:32:43 +00:00
J. Tyne
c371a171d4 Push some drain code up from xfer() to where drain is calculated. 2012-10-05 14:21:49 +00:00
J. Tyne
bc43e5b9ad Specialized xfer() for when prob is 1.0. 2012-10-05 14:12:08 +00:00
Nils Kneuper
124aa5eebf updated Scottish Gaelic translation 2012-10-05 09:46:47 +00:00
Elias Pschernig
1dc6611a02 Fixed bug in wmlparser2...
...where <<>> strings were not ignored inside "" strings.
2012-10-04 21:37:33 +00:00
J. Tyne
7a294aa261 Cleanup the receive_blow_* functions.
This includes moving the prob_matrix bookkeeping to a prob_matrix
member function.
2012-10-04 21:11:02 +00:00
J. Tyne
6f32e9bbca Rename a member function to better reflect the spirit of prob_matrix...
...not caring what its numbers mean.
2012-10-04 19:39:15 +00:00
J. Tyne
3c5815121f Cleanup & reworking shift_rows()/shift_cols().
Benchmarking indicated a 10% reduction in run time (not sure exactly why).
2012-10-04 19:26:18 +00:00
Anja Keicher
826706f66e Added conditions to carryover_info constructor...
...to prevent invalid unit creation. Fixes bugs #20211 and #20208
2012-10-04 18:19:43 +00:00
J. Tyne
e9ba419bf1 Some cleanup/reorganization of the prob_matrix constructor.
One side benefit is that the class can now handle the case where both
combatants have battle histories (not that we really need it to handle
that case).
2012-10-04 16:54:52 +00:00
J. Tyne
deb8e1b349 Split the prob_matrix class into matrix implementation (prob_matrix)...
...and combat prediction (combat_matrix).

(The two are independent concepts, and one can attempt to optimize
them independent of each other.)

No code changes yet other than what was needed to obtain data
encapsulation (e.g.  changing some direct member access to accessor
functions).
2012-10-04 14:40:32 +00:00
J. Tyne
e7a76040ac Remove a "todo" that has already been done (in 2008-06-24T05:30:32Z!koraq@xs4all.nl). 2012-10-04 11:10:19 +00:00
Sergey Popov
136f42bd4f Fix bug #20205
Malformed data caused config::error exception to be thrown.

Unfortunately campaignd on catching such an exception had no way to
close the right connection, instead all connections were closed because
the local variable that was supposed to contain connection number wasn't
updated. This is fixed by using boost.exception to attach the necessary
data to config::error objects so it can be used at the catch site.
2012-10-04 02:23:15 +00:00
Alexander van Gessel
98a9b7ad9d with tabs... 2012-10-03 18:29:32 +01:00
Alexander van Gessel
38d92f8692 Reindent a function 2012-10-03 18:25:36 +01:00
Nils Kneuper
784dd2fd05 updated Scottish Gaelic translation 2012-10-03 13:38:56 +00:00
Nils Kneuper
266c00cf8b extended Scottish Gaelic translation credits entry 2012-10-03 12:36:42 +00:00
Alexander van Gessel
f30b8289da Update wescamp trunk version 2012-10-03 09:41:09 +01:00