mattsc
48da8f4bca
Xcode project update
2013-12-16 18:03:03 -08:00
Ignacio R. Morelle
8592b52f4c
CodeBlocks project update
2013-12-16 20:48:28 -03:00
Alexander van Gessel
562a5be85c
Merge branch 'master' of github.com:wesnoth/wesnoth-old
2013-12-17 00:36:58 +01:00
Alexander van Gessel
0d18c7ca56
Move format_time_summary to its own file to fix linking issues
2013-12-17 00:36:48 +01:00
Andrius Silinskas
79f0f28619
Added campaign difficulty info for game item in MP Lobby.
2013-12-16 14:03:21 +00:00
mattsc
fd3e6e6fcc
SotBE S4: balancing adjustments to gold, turns, ...
...
... income, recruit lists, AI parameters
2013-12-15 12:50:37 -08:00
mattsc
d13f49696d
SotBE S4: give the player control of side 3 orcs
2013-12-15 12:50:36 -08:00
mattsc
349cc748dc
SotBE S4: move shamans to Side 1 at end of scenario
2013-12-15 12:50:36 -08:00
mattsc
5f91abf23e
SotBE S4: remove two pieces of dialog
...
They are unnecessary or don't apply to the new map any more.
2013-12-15 12:50:35 -08:00
mattsc
3e5263fdb0
SotBE S4: change the map to make scenario more interesting
...
Kapou'e now has to go through the Side 5 elves to get to the center
keep with the shamans.
2013-12-15 12:50:35 -08:00
mattsc
dff106b8d3
SotBE: add side parameter to orcish shaman macros
...
In S4 they now start on Side 3, not Side 1.
2013-12-15 12:50:35 -08:00
mattsc
22b58cf400
SotBE S3: clarify objectives
...
Indicate that it is good enough to accomplish either one of the
objectives.
2013-12-15 12:50:34 -08:00
mattsc
9811d46ff9
SotBE S1: add bowmen to enemy AI recruit list
2013-12-15 12:50:34 -08:00
David Mikos
ccb0ea5067
MP lobby: hide map icon in the event the map is not loadable.
2013-12-15 22:08:57 +10:30
David Mikos
ff77d473ef
MP lobby advertized game layout changes.
2013-12-15 21:36:13 +10:30
David Mikos
44431996c0
Make multiplayer lobby advertized game names and vacant slots bold.
2013-12-15 19:41:49 +10:30
David Mikos
86adae8b07
Move multiplayer lobby map size info to bottom icon area.
2013-12-15 19:22:44 +10:30
David Mikos
90ebb53855
Slightly tweak multiplayer lobby icon spacings for advertized games.
2013-12-15 18:29:52 +10:30
Bär Halberkamp
b7a0f40e34
Added some macros to S2 to make the code more compact
2013-12-14 20:29:50 +01:00
Bär Halberkamp
8d12ff8208
Also made side 4 hidden until it appears
2013-12-14 20:19:02 +01:00
Bär Halberkamp
7411ed053f
EI: Made the undead side not appear in side list before it actually appears
2013-12-14 20:17:00 +01:00
Bär Halberkamp
eea8ce6079
Added facing=se for Dacyn and Gweddry in S1
2013-12-14 15:41:14 +01:00
Bär Halberkamp
bb575be36d
Added custom TC for Dacyn and Mal-Ravanal in EI
2013-12-14 15:37:28 +01:00
Andrius Silinskas
3b3a120847
Aligned labels in MP Connect screen.
2013-12-14 09:53:22 +00:00
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
8748b68b87
Fix a goto jumping past va_end
...
Found by coverity
2013-12-12 20:33:47 +01: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
