77101 Commits

Author SHA1 Message Date
Hejnewar
525dd2ecd9 Balance changes 2020-08-04 19:35:55 +02:00
Pentarctagon
5ba26b9143 Change mariadbpp includes to be quoted. 2020-08-02 23:56:43 -05:00
Pentarctagon
311b4a016e Make sure to reset the logging level to the default in tests that change the logging level.
Fixes #4898
2020-08-01 14:03:55 -05:00
loonycyborg
dadb7bb0c4 scons: properly separate sources from external modules to builddir 2020-08-01 13:22:04 +03:00
Pentarctagon
f662cad825 Fix the source_lists not being found when using the -Y/--srcdir option. 2020-08-01 03:50:52 -05:00
Nils Kneuper
0db9d4c1c1 updated Russian translation credits 2020-07-31 21:14:11 +02:00
Nils Kneuper
395eae1ea3 updated Russian translation 2020-07-31 21:12:51 +02:00
Nils Kneuper
f03b9a87fd updated Portuguese (Brazil) translation 2020-07-31 21:04:39 +02:00
Martin Hrubý (hrubymar10)
5adfb5b918 Fix SDL assertion failed 2020-07-31 00:32:25 +02:00
Martin Hrubý (hrubymar10)
96633954ef
Update Xcode project for new MacCompileStuff update 2020-07-31 00:29:39 +02:00
Martin Hrubý (hrubymar10)
3b54f93885
Fix Xcode project after #4884 2020-07-30 22:49:15 +02:00
Steve Cotton
ebbd9c5dfa
Remove the python2 rmtrans tool (#5014)
It seems unused, as there's:

 * Wiki: no mention of rmtrans
 * main Git repo: only the brief paragraph in the tools readme
 * resources repo: no mention of it
 * forums: only as part of a general list of Python files
 * Github issues and PRs: only as part of a general list of Python files

FWIW, I think it's already possible to do with Gimp's default tools ("Colors",
"Curves ...", select channel "Alpha", select curve type "Freehand", click in
the bottom-left of the box and sweep down, then to the left edge of the box,
then as far right as required).
2020-07-30 22:19:52 +02:00
pentarctagon
7f9eebdf49 Add mariadbpp as a submodule.
This has been added as a submodule for convenience of use, since mariadbpp isn't included in any repositories (linux distros, vcpkg, etc) aside from an Arch AUR.
2020-07-30 13:17:22 -05:00
pentarctagon
388e4c00d9 Fix for newer cmake minimum version and some translation targets. 2020-07-30 13:17:22 -05:00
pentarctagon
ba296898d7 Store additional information in the database:
* mp_scenario_addon_id
* mp_scenario_addon_version (host's version)
* mp_era_addon_id
* mp_era_addon_version (host's version)
* active_mod_addon_ids
* active_mod_versions (host's versions)

Forward-port of #4958
2020-07-30 13:17:22 -05:00
Pentarctagon
113a4e0913 Use mariadbpp rather than the mysql C connector.
Reasoning being:
* The result_set and other APIs are nicer to use.
* We use mariadb on our server rather than mysql, so this would minimize the chance of any incompatibilities.
* The mysql C++ connector 1.1 isn't compatible with with c++17 (https://stackoverflow.com/q/47284705).
2020-07-30 13:17:22 -05:00
Pentarctagon
f996803cf6 A separate button for info/announcements.
Rather than having everything in the MOTD, this adds a separate button that will popup a window which will have most of this information in two tabs:
* General server information, such as a link to the CoC.
* Announcements, such as tournaments and new versions being released.

The information on this new window will be stored in the new `server_config` database table.
The MOTD will then just be a short greeting instead of the several lines that are shown currently.

Additionally, now the motd will only be displayed in the lobby chat the first time the user logs on.
2020-07-30 13:17:22 -05:00
Pentarctagon
4a3177b228 Don't display the motd every time a user rejoins the MP lobby. 2020-07-30 13:17:22 -05:00
nemaara
86b0a82f88 DiD S7b: change FDR's fear quote 2020-07-30 05:18:37 -04:00
nemaara
3f3ceb5157 DiD: fix impetuity description 2020-07-30 05:15:35 -04:00
nemaara
f64c40c146 DiD S7a: clarify reduced vision 2020-07-30 05:14:18 -04:00
nemaara
f96e06b802 DiD S3: clarify objectives 2020-07-30 05:10:44 -04:00
Steve Cotton
c1e4178338 Disambiguate some python shebang lines to be "python3"
Loonycyborg already uses these tools with Python 3.

The python launcher tool for Windows has magic handling for some shebang lines,
however `#!/bin/env python` isn't recognised without the `/usr`. Had the `/usr`
been included with the old code then these scripts would likely have been run
with Python 2.
https://docs.python.org/dev/using/windows.html#shebang-lines
2020-07-29 22:10:02 +02:00
gfgtdf
c7d0144535
readd changing the order of [terrain_graphics] (#5012)
before the 'ignore unused addons' commit, the engine reordered [terrain_graphics] to make mainline [terrain_graphics] appear after umc [terrain_graphics] tags, this commit restores this behavior  (instead of using [terrain_graphics]precendence= in mainline which would be an alternative fix). If we ever use game_config_view for anything else than the game_config we can also make this an optional "bool put_first_source_last" parameter.
2020-07-29 19:31:54 +02:00
gfgtdf
3df569ae74
fix missing chunk name in [lua] tags with no name= attribute
reported here https://forums.wesnoth.org/viewtopic.php?p=656867#p656867
2020-07-29 18:52:41 +02:00
gfgtdf
c4a6b223f3 use 1-based side numbers in get_village_owner 2020-07-29 01:09:06 +02:00
gfgtdf
fb1974248f Allow more than one starting position on the same tile
Since the gamemap structure already supports this, it
only makes sense that the code that reads gamemaps
supports it aswell.
2020-07-29 01:09:06 +02:00
gfgtdf
2f71cedc5d small map reading refactor
we now use string_view instead of char* pairs
2020-07-29 01:09:06 +02:00
gfgtdf
89e56d8fb9 add utils::split_set and move split_foreach
this also improves the perfromance of utils::split because
it no longer uses stringstreams.
2020-07-29 01:09:06 +02:00
Iris Morelle
fa08ff291b gui2/button: Fix highlight colour for the disabled state
It was apparently copy-pasted from the pressed state. This resulted in
disabled buttons looking like they are pressed.

[ci skip]
2020-07-27 06:02:53 -04:00
loonycyborg
350462a5af Added support for returning full rows to prepared_statement<>
Now it can also take any type C as result type which it will treat like
STL-like structure adding result rows to it using C::push_back().
2020-07-26 16:04:11 +03:00
Nils Kneuper
490e24d543 updated Portuguese (Brazil) translation 2020-07-26 10:27:20 +02:00
Iris Morelle
ceabe0c79c SoF: Use the correct macro for enemy flags
Fixes subtle animation issues with them.

[ci skip]
2020-07-25 04:08:38 -04:00
Iris Morelle
9fa0536eaa wmllint: Recognize [remove_time_area]
Fixes issues with wmllint emitting spurious warnings about unit ids when
encountering time area ids in [remove_time_area].

[ci skip]
2020-07-25 04:05:49 -04:00
Steve Cotton
11d702225b
Warn about manually editing files created by the scenario editor (#5001)
This comment will be added at the start of any .cfg file written by the
scenario editor. Given that the only target audience is authors using text
editors, it's not translatable and uses plain ascii characters.
2020-07-23 19:18:08 +02:00
gfgtdf
67b4fb9ce0
fix map_file= 2020-07-22 15:15:00 +02:00
Iris Morelle
17b5d5420e gui2/file_dialog: Use golden headers above list views 2020-07-22 01:25:12 -04:00
Charles Dang
ff0eecc7c7
Merge pull request #5000 from gwhitney/revert_assert
Don't insist that windows request nonzero height or width
2020-07-21 02:33:23 +11:00
Glen Whitney
2808cad37b Don't insist that windows request nonzero height or width
Eases the assertion concerning nonzero window dimensions in
  gui/widgets/window.cpp; it turns out that some windows do request zero
  dimension, and it doesn't hurt anything for them to.

  Fixes #4960.
2020-07-19 22:32:31 -07:00
nemaara
c14b941e32 Ixthala demon: fix exp 2020-07-20 01:04:35 -04:00
Iris Morelle
ea883befcf gui2/preferences: Use labelless toggle buttons in Advanced
The labels are implemented with a different widget on a separate column,
the the reserved space only serves to make things look weird.
2020-07-19 21:53:44 -04:00
Iris Morelle
75344d0ec1 gui2/mp_alerts_options: Clean-up table column/row headers
Yes, this UI is effectively a table in the truest sense of the word.
2020-07-19 21:39:32 -04:00
nemaara
0c969f858b
Merge pull request #4974 from nemaara/quenoth_rebalance
UtBS and Quenoth rebalance
2020-07-19 19:54:55 -04:00
nemaara
651e725064 Add UtBS rebalance to changelog 2020-07-19 19:54:43 -04:00
nemaara
49eb715516 UtBS S12: don't recall merfolk into caves 2020-07-19 19:52:06 -04:00
nemaara
dd15d88a31 Sun Singer/Sylph: slightly reduce hp 2020-07-19 19:51:34 -04:00
nemaara
8a3b9f15be UtBS: reduce difficulty on easy and normal 2020-07-19 19:51:34 -04:00
nemaara
74033f89b2 UtBS: increase HP loss from dehydration 2020-07-19 19:51:33 -04:00
nemaara
3745de3a30 UtBS S12: allow everyone to move and attack after killing fake Eloh 2020-07-19 19:51:33 -04:00
nemaara
60e615cc90 UtBS S12: increase difficulty 2020-07-19 19:51:30 -04:00