60593 Commits

Author SHA1 Message Date
Bär Halberkamp
abcba455f4 EI: make S1 slightly harder 2015-03-11 20:15:59 +01:00
Bär Halberkamp
be58ca724f EI: Make the music more chaotic once Mal Ravanal appears 2015-03-11 20:02:46 +01:00
Bär Halberkamp
b218241785 EI: added a small delay after Ravanal's appearance to make it appear more dramatic 2015-03-11 17:00:22 +01:00
Bär Halberkamp
845ca289e6 EI: Added Ravanal's character stats to character-definitions.cfg 2015-03-11 16:58:17 +01:00
Bär Halberkamp
fa76604e8e Give side 2 the extra mountain village 2015-03-11 16:54:52 +01:00
Bär Halberkamp
642273c4be EI: Improve the AI in scenario 1 2015-03-11 16:54:16 +01:00
Bär Halberkamp
2ed7b049fe EI: made side 4 able to recruit level 1 units as well 2015-03-11 16:33:01 +01:00
Bär Halberkamp
7c0846c457 EI: Put Gweddry and Dacyn's character stats in their own file. 2015-03-11 15:05:35 +01:00
gfgtdf
760e967060 more removal of unnecessary code in mp_game_settings 2015-03-09 16:56:47 +01:00
Chris Beck
4ec3d15288 remove some unnecessary code in mp_game_settings 2015-03-09 11:34:47 -04:00
Chris Beck
dd2c6dee71 add more mechanisms in support of correct xp modifier in tutorial
- Adds lines `experience_modifier=100` to both tutorial scenarios
- When writing a saved_game, write the mp game settings (including
  the experience modifier setting) for TEST and TUTORIAL scenario
  types as well.

There are no "test campaigns" right now, so this won't be a
problem.
2015-03-08 22:01:24 -04:00
Chris Beck
a8898db7b3 Merge pull request #383 from cbeck88/xp_mod
change mp_game_settings to default experience modifier to 100
2015-03-08 21:58:37 -04:00
gfgtdf
b54a0ae5c3 fix saved_gamre::set_data
fixed up a15867e634
2015-03-09 00:58:45 +01:00
gfgtdf
5a09a576fa fixup previous 2015-03-09 00:31:25 +01:00
gfgtdf
b9bed4ff6c fix play_controller::is_browsing()
we now check linger_, init_side_done_ and gamestate_.gamedata_.phase() before accessing current_team().
This is saver since during linger mode or during initilisation there is not really a 'current team'.
2015-03-09 00:16:19 +01:00
Chris Beck
f0a69e682b change mp_game_settings to default experience modifier to 100
This appears to fix tutorial scenario two. Bug #23366.
I'm not sure if this should be related to loading the tutorial at
all though, so it might not be the real cause of the bug.
2015-03-08 15:54:34 -04:00
aquileia
4da8eecc64 vcproj: Fix WML_test execution on debug builds
[skip ci]
2015-03-08 19:42:28 +01:00
aquileia
44ec27daf2 vcproj: Update for ea212b5
[skip ci]
2015-03-08 19:42:25 +01:00
aquileia
86d8b7faef vcproj: Fix liblua Release rebuild
If several projects share the same IntDir, they write to the same .pdb
which causes issues with multithread compilation (as well as warnings).

[skip ci]
2015-03-08 19:35:16 +01:00
Nils Kneuper
9b5168d7fd fixed changelog formatting for Version 1.13.0-dev 2015-03-08 10:01:52 +01:00
Nils Kneuper
26a1f63961 updated Polish translation 2015-03-08 09:50:49 +01:00
Charles Dang
57761598af Updated green cloak item image
http://forums.wesnoth.org/viewtopic.php?p=554997#p554997
2015-03-08 19:37:03 +11:00
Charles Dang
c59f504942 T: use new baseframe for Quintain by dipseydoodle. No anims yet.
http://forums.wesnoth.org/viewtopic.php?p=566137#p566137
2015-03-08 18:02:58 +11:00
Charles Dang
2a46858414 Updated dummy item image by dipseydoodle
http://forums.wesnoth.org/viewtopic.php?p=566137#p566137
2015-03-08 18:01:33 +11:00
Charles Dang
10aa44b389 Updated barrel item image by beetlenaut
http://forums.wesnoth.org/viewtopic.php?p=564574#p564574
2015-03-08 17:59:22 +11:00
Charles Dang
d9ed10acdb Fixed indent 2015-03-08 17:41:10 +11:00
Charles Dang
8baf92ef9d TS2: fixed typo in formula 2015-03-08 14:56:41 +11:00
Bär Halberkamp
243d592121 Place Delfador's portrait on the right side in the totorial. 2015-03-08 04:42:13 +01:00
Charles Dang
ab83f36bd0 Change titlescreen music to Journey's End 2015-03-08 14:19:39 +11:00
Chris Beck
1adfbb9956 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2015-03-07 21:41:01 -05:00
Chris Beck
ade22a7be0 attempt to fix encoding problem in changelog 2015-03-07 21:40:33 -05:00
Charles Dang
22a9102a2c Fixup changelog 2015-03-08 13:39:46 +11:00
Charles Dang
8a4a41b8f8 Updated codeblocks projfile for ea212b5bc257 2015-03-08 13:35:01 +11:00
Chris Beck
ab7f420049 update RELEASE NOTES 2015-03-07 21:29:19 -05:00
Chris Beck
1cd15a7865 update changelog 2015-03-07 21:26:49 -05:00
Chris Beck
ea212b5bc2 move class floating_label from font.cpp to its own file
floating_label is essentially a primitive GUI1 widget, consisting
just of a text label and non-interacting. It's also used for the
map labels displayed in-game iiuc.
2015-03-07 21:22:03 -05:00
Chris Beck
1bc7471822 Merge pull request #382 from cbeck88/font_family
add support for styled font families in GUI1, help dialogs
2015-03-07 19:42:18 -05:00
Chris Beck
0c8d66ec0d avoid repeatedly opening the same font file
this is a small optimization
2015-03-07 18:20:46 -05:00
gfgtdf
1edeff4ee2 fix mid scenario saves
previously mid-scenario saved accidently contained
[carryover_sides_start] instead of [carryover_sides]. It is not clear
whether the previous behaviour causes bugs but it was not the intended
behaviour.
2015-03-08 00:18:10 +01:00
Chris Beck
8e4ead95df refactor add_font_to_fontlist function 2015-03-07 17:55:00 -05:00
Chris Beck
b0ed5403fe refactor the get_font mechanism
with ideas from aquileia
2015-03-07 17:55:00 -05:00
Chris Beck
d4c1a42f89 add DejaVuSans-Bold font style for GUI1, help dialogs 2015-03-07 14:35:45 -05:00
Chris Beck
21bf262965 fix bug 22376: use DejaVuSans-Oblique for italicized characters 2015-03-07 14:35:45 -05:00
Chris Beck
cd54ee0d52 add support for styled fonts outside of SDL TTF in GUI1, help
This commit allows bold and italic font files to be specified in
the fonts.cfg file. When attribute "bold_name" is set to the name
of a font file, this font will be used in place of SDL TTF bold-
styling applied to the base font. Similarly for "italic_name".

This commit assumes that the code points for the styled versions
are the same as for the unstyled version. If that assumption is
not true for some font that we care about then this commit will
likely have to be revised.
2015-03-07 14:35:45 -05:00
Chris Beck
1f3e143204 fix some indentation 2015-03-07 14:35:45 -05:00
Charles Dang
4e6be2eab3 Updated help descriptions for traits 2015-03-08 03:12:19 +11:00
Charles Dang
1591829b5d Cleaned up show_story documentation 2015-03-08 02:48:35 +11:00
Charles Dang
906ff65382 Removed an unused function 2015-03-08 02:25:29 +11:00
gfgtdf
b847cad549 fixup previous
fixes up the commit 'less copying of configs when loading saved games'
2015-03-07 02:39:07 +01:00
gfgtdf
a15867e634 less coping of configs when loading saved.
First we make saved_game assignment operator copy and swap.
This might increase performance in case where the copy elison can be aplied.

Second we add a set_data(config& ) method that moves the savefile cfg
into this object. And use that function in the loadgame class.
2015-03-07 01:32:35 +01:00