76434 Commits

Author SHA1 Message Date
gfgtdf
a9d9e48c72 fix float_label too fast in some cases
now its lifetime is no longer measured in frames
in particular its lifetime is now indepndent of the
current frames per second
2020-03-19 03:07:31 +01:00
gfgtdf
2c1d9f757e less floating_label.hpp includes 2020-03-19 03:07:31 +01:00
doofus-01
e1fb5fc2b7
Add comment to ABILITY_FEEDING macro
There should be some explanation of what was done in 2ba7ad5c439c5ed5414654262e17608b1cc4c332 otherwise that's pretty sneaky.
2020-03-18 18:41:03 -07:00
Gunter Labes
84fba4930b
Remove obsolete includes 2020-03-18 21:46:31 +01:00
Gunter Labes
fc26103ce7
Use the same verb form in help strings 2020-03-18 20:56:20 +01:00
Gunter Labes
1c0f66bb1e Add help text for the ping command
Fixes #2487.
2020-03-18 20:23:58 +01:00
gfgtdf
d68c8debfa
fixup compilation error
accidently added the line it to the wrong file
2020-03-17 01:45:40 +01:00
gfgtdf
2ddaf9d095
fix compilation error 2020-03-16 21:10:56 +01:00
gfgtdf
fe79921c20
fix assertion error in case that the scenario has no [side]s
fixes #2818
2020-03-16 19:11:03 +01:00
gfgtdf
0cdb3e5782
guard against invalid [scenario]playing_team 2020-03-16 18:56:12 +01:00
newfrenchy83
a3859e4b46
fix cb projecfile after #4797 (#4811)
* fix cb projecfile after https://github.com/wesnoth/wesnoth/pull/4797/files

* Update tests.cbp

* Update wesnoth.cbp
2020-03-16 08:31:26 -05:00
Martin Hrubý (hrubymar10)
24b84079df
Fix Xcode build after #4797 2020-03-16 11:09:46 +01:00
Charles Dang
c173d01bac
Merge pull request #4809 from stevecotton/mp_create_unknown_tile_master
Fix the MP Create Dialog's handling of unplayable maps
2020-03-16 13:12:25 +11:00
Steve Cotton
d4c34c5586 Fix the MP Create Dialog's handling of unplayable maps
The UX seems to already be prepared for this - if the map doesn't load then
the create_engine class puts an error message in the map description, which
is shown on the top-left of the MP Create Dialog when the map is selected.

Fixes bugs #3149, #4395 and #4545.  The block deleted in this commit skipped
adding an entry to the games_list listbox, which broke assumptions elsewhere
that the indices returned by create_game_.get_filtered_level_indices()
correspond to the indices in the listbox.
2020-03-16 02:15:42 +01:00
nemaara
4682b45de1 Cataphract: description wording 2020-03-15 20:16:13 -04:00
nemaara
277f35b538 Sunderer: description wording 2020-03-15 20:16:05 -04:00
gfgtdf
9fdf618624 fix some compiler warnings 2020-03-16 00:29:57 +01:00
gfgtdf
f9790bcb5d add wesnoth.colors
see #3706

the main usecase to be able to show messages and
dialog labels in the color of a specific team.
2020-03-16 00:29:57 +01:00
nemaara
f166e2edee Horse Archer: description wording 2020-03-15 17:55:57 -04:00
nemaara
8df46f691f Windbolt: description wording 2020-03-15 17:55:48 -04:00
nemaara
88d6d2e530 Dune Marauder: description wording 2020-03-15 17:49:20 -04:00
nemaara
e1d48c32d4 Dune Raider: revise description 2020-03-15 17:49:12 -04:00
nemaara
a7f8aa66b7 Dune Harrier: revise description 2020-03-15 16:08:14 -04:00
nemaara
2c6d8f4d33 Dune Skirmisher: tweak description 2020-03-15 16:04:49 -04:00
nemaara
7e0118b3bc Dune Strider: update description 2020-03-15 16:04:22 -04:00
Pentarctagon
d91a9d333e
Initialize private_replay. 2020-03-15 12:03:02 -05:00
gfgtdf
528dbccd94
support scenario files in map_file (#4804)
* support scenario files in map_file

Now a scenario generated by the scenario editor can be loaded
just like a simple map file.

fixes #4803
2020-03-15 13:24:26 +01:00
Nils Kneuper
2f9a82a78f updated Portuguese (Brazil) translation 2020-03-15 11:23:26 +01:00
Nils Kneuper
8d876a1562 updated Swedish translation 2020-03-15 11:19:47 +01:00
Iris Morelle
64a96d2eba
Merge pull request #4802 from shikadiqueen/bug/3273
gui2/addon_manager: Re-read add-on versions after each update batch
2020-03-15 05:33:17 -03:00
Iris Morelle
e92ee39932
Merge branch 'master' into bug/3273 2020-03-15 05:32:25 -03:00
nemaara
3e4c63a698 Dune Paragon: tweak description 2020-03-15 03:38:19 -04:00
nemaara
3730eb9870 Dune Swordsman: tweak description 2020-03-15 03:38:06 -04:00
nemaara
b11f846867 Dune Blademaster: revise description 2020-03-15 03:37:54 -04:00
nemaara
38ad3d3bd7 Warmaster: revise description 2020-03-15 02:34:12 -04:00
nemaara
73581d92ff Dune Captain: revise description 2020-03-15 02:33:41 -04:00
nemaara
db12d37437 Dune Soldier: revise description 2020-03-15 01:56:37 -04:00
nemaara
2ab85209dc Spearmaster: tweak description 2020-03-15 01:47:37 -04:00
nemaara
c0cde27b98 Spearguard: description wording 2020-03-15 01:47:06 -04:00
Pentarctagon
bc24ba4644 Also log the db_id. 2020-03-15 00:34:47 -05:00
nemaara
f4b96d3651 Wayfarer: fix description wording 2020-03-15 01:18:06 -04:00
nemaara
f26c28f382 Explorer: tweak description wording 2020-03-15 01:17:56 -04:00
nemaara
a17e13f114 Rover: fix description 2020-03-15 01:09:17 -04:00
nemaara
45c5625302 Firetrooper: reword description 2020-03-15 01:01:43 -04:00
Pentarctagon
7ecc6a3fb4 Use the vcvarsall bat script. 2020-03-14 23:20:12 -05:00
nemaara
fceb2e3b78 Scorcher: update description 2020-03-14 23:57:21 -04:00
nemaara
c0dcd39d2e Burner: tweak description 2020-03-14 23:21:08 -04:00
nemaara
9a431b7f3e Luminary: tweak description 2020-03-14 23:15:03 -04:00
nemaara
446b90a3a0 Alchemist: update description 2020-03-14 23:12:30 -04:00
nemaara
7837e9eaf7 Apothecary: tweak description 2020-03-14 20:47:25 -04:00