upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 22:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,613 Commits 52 Branches 374 Tags
Commit Graph

54613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrius Silinskas
66921f48f4 Display side's name in MP Connect. 
Name is being take from "name" attribute in [side][/side].

As a result of this, other columns have been reordered and renamed to make the
dialog more intuitive.
 2013-12-13 09:52:22 +00:00
Alexander van Gessel
e76a18d0f2 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-12 14:30:19 +01:00
Alexander van Gessel
d12a0f706e Create (and delete) defender_stats_ alongside attacker_stats_ (bug #21277) 2013-12-12 14:28:26 +01:00
Boldizsár Lipka
8b8e270ce3 Return campaign names when campaign names are requested. 
A copypaste error caused create_engine to return random map names.
 2013-12-12 11:53:37 +01:00
Boldizsár Lipka
29198c3206 Ignore case when filtering levels. 2013-12-12 11:53:37 +01:00
Boldizsár Lipka
fbbcea11b4 get_levels_by_type -> ..._unfiltered, get_filtered_levels_by_type -> 
get_levels_by_type.

create_engine works on the filtered lists everywhere, so I made it
'default' here too. I didn't remove the unfiltered function because it
might be useful in some use cases.
 2013-12-12 11:53:37 +01:00
Boldizsár Lipka
714d777214 Enable searching for levels by name on the mp create screen. 2013-12-12 11:53:37 +01:00
Ignacio R. Morelle
08de5f7057 Amend credits entry formatting 2013-12-11 21:34:49 -03:00
Ignacio R. Morelle
72d41a2585 Update changelog 2013-12-11 21:34:32 -03:00
Ignacio R. Morelle
11c038214e Merge pull request #85 from cbeck88/party-full-bell 
Party full bell
 2013-12-11 16:30:51 -08:00
Alexander van Gessel
b2b43a02cf Place some asserts 2013-12-11 14:57:15 +01:00
Alexander van Gessel
0a7b0e5f02 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-11 07:31:17 +01:00
Alexander van Gessel
27a0f40a53 Fix a nullref 
Found by coverity
 2013-12-11 07:30:38 +01:00
Alexander van Gessel
3ec6250b48 Clear attacker_stats_ when skipping a weapon 2013-12-11 07:26:21 +01:00
fendrin
9de545414a Handle fogged terrain colors which dropped below the color range. 2013-12-11 00:14:58 +01:00
fendrin
5693b33574 Base the minimap semantic terrain coding on the rep() color only. 2013-12-10 23:52:41 +01:00
Chris Beck
a3dfc2404c add self to about.cfg 2013-12-10 14:06:39 -05:00
fendrin
5463068caf Fix how the hotkey system handles default bindings. 
Only hotkeys which are changed from the defaults are saved in the users
config file.

Isolated a method for internal use of read write hotkey_item's and one
that offers read only access to external functions.

Removed a obsolete method from the preferences to save single hotkey
bindings.
 2013-12-10 14:42:27 +01:00
fendrin
c3fb5decab Make only use of constant hotkey_command references. 2013-12-10 14:42:27 +01:00
fendrin
2225cd44d8 Don't manipulate hotkey items directly but use the hotkey interface. 2013-12-10 14:42:27 +01:00
fendrin
270be19d6a Call the get_hotkey method with more explicit values. 
This change is just to enhance readability.
The variables passed before the commit were expected to hold the exact
same values.
 2013-12-10 14:42:27 +01:00
fendrin
34173e19c6 Made hotkey datastructure references constant. 
This is just to get everything right, those objects don't need to get
manipulated in any way by code outside of the hotkey scope.
 2013-12-10 14:42:27 +01:00
fendrin
412980aa4f Restore the previous scope when the play_controller is destroyed. 2013-12-10 14:42:26 +01:00
fendrin
0cef528a90 Made the getter for hotkey items returning a const object. 
There is no need to manipulate hotkey items you get by requesting with
an sdl event at the hand.
 2013-12-10 14:42:26 +01:00
fendrin
0410757436 Adjusted the campaign to how the new mp campaign support seems to work. 
Added "fore_lock_settings=yes" to nearly every scenario (except the
story only ones where we do not define sides).

Scenario 7 also got a reducement of sides to fit into the amount of our
team color range.

Moved some loyal unit descriptions into character macros.
 2013-12-10 14:42:26 +01:00
fendrin
02adc2d2fa Update of the emacs wml mode's database. 2013-12-10 14:42:26 +01:00
fendrin
8957ae44f0 Draw the minimap villages at the same size as the terrain tiles. 2013-12-10 14:42:26 +01:00
fendrin
102bcd7101 Grouped the soundtrack into two albums, both around one hour in length. 
This commit only changes the ogg vorbis meta tags of the files.
 2013-12-10 14:42:26 +01:00
fendrin
9d15d9e545 Made use of the time of day schedule macros. 2013-12-10 14:42:06 +01:00
Ignacio R. Morelle
030f16d72f Rename 'rail' color_range to 'rails' 
Fixes the following errors appearing every time rail terrain does
in-game:

  20131210 00:19:44 error display: caught config::error while processing color-range RC: Invalid color range: rails
  20131210 00:19:44 error display: bailing out from RC
 2013-12-10 00:21:40 -03:00
loonycyborg
fb31727f77 scons: Handle missing environment variables properly when forwarding. 2013-12-10 06:29:11 +04:00
Andrius Silinskas
cd0cb75ca8 Fixed MP Create screen for low res. 2013-12-09 15:45:06 +00:00
Alexander van Gessel
5610b589e0 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-09 16:43:13 +01:00
Alexander van Gessel
1a4e24c1ee Remove an unused assignment 
Found by coverity
 2013-12-09 16:42:27 +01:00
Alexander van Gessel
dcdce05935 Factor out two nearly-identical format_time_summary functions 2013-12-09 16:36:11 +01:00
Alexander van Gessel
ddf57aaacb Fix a copy-paste error 
Found by coverity
 2013-12-09 16:32:59 +01:00
Bär Halberkamp
e5f8cd19ab Simplified concentration code 2013-12-09 16:03:35 +01:00
Andrius Silinskas
2707e9ad9d Fixed MP Configure screen for low res. 
Elements on the left side were put into an options pane as it was done with
elements on the right side.
 2013-12-09 10:12:46 +00:00
Alexander van Gessel
acd3af4497 Fix a copy-paste error 
Found by coverity
 2013-12-09 03:44:21 +01:00
Boldizsár Lipka
96b48b2360 Return the number of actual children instead of keys. 2013-12-08 23:21:18 +01:00
Boldizsár Lipka
f2cbf64a07 Make option_display::process_event non-pure virtual. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
5f21a5e06e Display custom options in sections; don't display inactive options. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
006c2f428d Add a function to config that tells the total number of children. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
d36e39b2a7 For custom sliders, show the current value in the label. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
ff7629865b A bit more sophisticated layout for custom options. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
1e982840ad Make custom sliders and textboxes wider. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
ea6317433f Set initial values for custom options. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
34f1c268b8 Display custom options directly on the configure screen. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
17cd340253 Ignore project files for all versions of QtCreator. 2013-12-08 22:20:28 +01:00
Nils Kneuper
8f23b615b0 fixed number of chars per line for changelogs 2013-12-08 11:08:26 +01:00