Commit graph

1784 commits

Author SHA1 Message Date
Martin Hrubý (hrubymar10)
eabaa42fe4
Fix Xcode project 2020-10-18 21:09:54 +02:00
Steve Cotton
934cae6093 Refactoring the orb-coloring code, adding new units/orb_status.hpp
Instead of creating lots of image::locators and calling a family of
similarly-named preferences functions, this refactor encapsulates that logic
and uses an enum.

The new orb_status files still need adding to the MacOS build.

An assert has been added to `unit_drawer`'s constructor. There are two callers
- the `display` class guards it with an explicit check before constructing
unit_drawer. The `game_display` class doesn't have an explicit check, but it's
clear that other code in that class assumes the teams are already valid (and
would crash if they weren't).
2020-10-17 14:11:10 +02:00
Pentarctagon
49a5899c4e
Wesnoth 1.15.6. 2020-10-16 23:40:02 -05:00
Charles Dang
5b96bee90d Minor projectfile update 2020-09-21 02:52:46 +11:00
Pentarctagon
f97d2f8250
Wesnoth 1.15.5. 2020-09-19 12:52:10 -05:00
newfrenchy83
51f7340067
fix codeblocks project for lua widget 2020-09-04 13:20:16 +02:00
Martin Hrubý (hrubymar10)
1b1c0a4e52
Fix Xcode project 2020-09-04 10:54:28 +02:00
Steve Cotton
a2b98687b7
Update the VC16 project files for Lua Widgets (#5125)
In source_lists/wesnoth, put the new files in alphabetical order.

This (as expected) fails to build on MacOS, just like the previous build.

It also fails to build with Clang on Linux, just like the previous build. That's
caused by src/scripting/push_check.hpp:89's unused parameter 'L', and is
also just like the previous build.
2020-09-04 05:44:15 +02:00
Martin Hrubý (hrubymar10)
c48e176a1a
Fix Xcode source tarball builds
Closes #5117
2020-09-03 10:48:30 +02:00
Martin Hrubý (hrubymar10)
8ba4e4fca9
Fix "refusing to merge unrelated histories" error 2020-08-28 10:10:47 +02:00
Martin Hrubý (hrubymar10)
576bd8a419
Drop support for old OS X and update README and Xcode project 2020-08-24 15:44:30 +02:00
Martin Hrubý (hrubymar10)
5e5df83db6
Update Xcode project's changelog 2020-08-23 10:52:56 +02:00
Pentarctagon
12066c4357 Wesnoth 1.15.4. 2020-08-21 23:22:12 -05:00
newfrenchy83
2be22c8030
fix codeblock projectfiles (#5078) 2020-08-12 11:11:28 +02:00
Steve Cotton
c9511d7ba0
Drop support for the l10n-track file (#4722)
The file only had a run-time effect if it listed any files as "fuzzy", which it
hasn't since the last change in 2015. However, that isn't a reason for removing
it.

The reason for removing it is that it doesn't make sense to automatically mark
images as fuzzy when an image changes, because fuzzy is often much better than
untranslated. This is different to the logic for strings, where a single word
can negate the meaning of a sentence. The decision has to be a manual process,
and at that point it might as well be done with the source-control tool's
delete-file function.

Even considering the previous times that l10n-track was used, I can't see a
scenario where it would be useful.

* Scenario: a screenshot needs to be replaced. In this case the new images are
  going to be screenshots too. If the old images are out of date, better to
  just delete them instead of needing the fuzzy mechanism; either option would
  have the same effect of showing the up-to-date-but-untranslated image.

* Scenario: a map is completely redrawn. This seems unlikely, as a completely redrawn
  image could be added as a new map rather than replacing the old one. Even if
  it does happen, it's probably best to just delete the old --overlay.png
  files.

* Scenario: a new landmark is added to a map. Using the existing overlay file
  is still going to be good, as it means the rest of the map is shown
  translated. There's surely new dialogue in the WML files commenting on this
  new landmark, which would be a good place to say
    # po: Lorem's Ipsum was added to the map on 24 Jan 2020, please add a label to your language's --overlay file.

* Scenario: an old feature is removed from the map. Using the existing overlay
  will have an out-of-date label, and the significance of that would depend on
  how it affects the storyline. This could be significant enough to make
  showing the English labels be a better option than showing the translated
  ones. However, the translated maps could be updated without knowledge of the
  language, so if it's such a significant change then the developer writing the
  new WML should probably do that.

* Scenario: a feature moves slightly on the map. This is an example where the
  l10n-track file has been used, it happened with the Bitter Swamp on the
  bottom-right corner of the title screen. I think it would have been better to
  show the slightly-out-of-date overlay instead of showing the English.

Note about cherry-picking: in the 1.14 branch, the change needs to be applied
to src/picture.cpp instead of src/filesystem.cpp.
2020-08-08 05:07:59 +02:00
Steve Cotton
711b9388e9
Fix the build, separate fixes for VC16 and GCC-10 (#5037)
I'm relying on Travis to check whether the VC16 fix is correct,
as I don't have a Windows install to test this locally.
2020-08-07 19:06:54 +02:00
newfrenchy83
f33330de19
fix wesnothd and campaignd codeblock projectfiles after #5029 (#5035) 2020-08-07 11:18:05 +02:00
Martin Hrubý (hrubymar10)
f28ef7026b
Fix Xcode project after #5029 2020-08-06 22:01:59 +02:00
newfrenchy83
e05be0b597
update codeblocks projectfiles (#5033) 2020-08-06 12:21:02 -05:00
Martin Hrubý
9f854e7ce8
Fix SDL2 2.0.12 change in SDL_GetDisplayDPI (#5024)
* Fix SDL2 2.0.12 change in SDL_GetDisplayDPI

Fixes #5019

* Remove signing requirement for DEBUG Xcode builds
2020-08-05 23:44:39 -05:00
DisherProject
18c487e4ff
Add JPG support to VC++2019 build (#5031)
* Add JPG support to VC++2019 build

Co-authored-by: DisherProject <pycchio@tiscali.it>
2020-08-05 23:43:38 -05: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
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
newfrenchy83
4becc858f1
update codeblock projectfiles 2020-07-03 17:16:26 -05:00
Pentarctagon
0c3cdd3a86 Remove VC14 (VS2015/VS2017 project files).
Reasons:
* These projectfiles are still 32-bit, whereas all other builds for all other OSes are now 64-bit.
* Relatedly, these projectfiles are dependent on the libraries kept at the aquileia/external repository.
* VS2019 is still listed as supporting Windows 7, so there is a minimal likelihood of developers not being able to use VS2019.
* The VS2019 projectfiles instead use vcpkg to get the required dependencies, which is easier to setup than the aquileia/external prebuilt libraries.
* It's one less thing that needs to be updated whenever source files are added/moved/removed.
* It's two fewer jobs that Travis needs to run, which means Travis builds will finish more quickly.
2020-07-03 12:23:34 -05:00
Charles Dang
04dce20deb Updated VC16 projectfile 2020-07-03 07:06:01 +11:00
Martin Hrubý (hrubymar10)
f3256cfbd1
Fix Xcode project after #4963 2020-07-02 15:40:30 +02:00
newfrenchy83
fd0cd29683
updated codeblock projectfiles 2020-06-29 16:48:26 -05:00
Charles Dang
c0205969d5 Updated VS projectfile 2020-06-30 05:43:56 +11:00
Pentarctagon
62d0ad4907
Update readme for vcpkg. 2020-05-15 14:06:57 -05:00
Pentarctagon
a04dce619b Add the VS2019 Debug configuration job to travis. 2020-03-22 19:54:02 -05:00
Pentarctagon
111e327e7b Add VS2019 jobs to travis.
The first run of the 2019 jobs will fail, since that run will be used to build and cache the vcpkg dependencies - there's no way to get enough time to build wesnoth and build the dependencies in a single job.
2020-03-20 16:07:18 -05: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
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
Pentarctagon
7b2f4065d1
Typo fix.
I guess I'm not the only one who's modified these by hand.
2020-03-14 01:37:10 -05:00
Martin Hrubý (hrubymar10)
da42ee0d83
Correct way for handling data inside Xcode project 2020-03-10 17:53:06 +01:00
Martin Hrubý (hrubymar10)
3ffbc985b8
Update macOS package changelog 2020-03-10 17:29:31 +01:00
Charles Dang
63cceb84f8 Wesnoth 1.15.3 2020-03-10 08:55:10 +11:00
Martin Hrubý (hrubymar10)
0badc6a5af
New Xcode README.md steps
* Wesnoth .dmg template init

* Update Xcode's README.md with current steps and informations
2020-03-09 14:00:21 +01:00
Pentarctagon
faa58bc441 Update the VC14 toolset to the same as used on travis. 2020-03-02 07:35:09 -06:00
Pentarctagon
1975122f11
Fix typo 2020-02-16 10:10:15 -06:00
Martin Hrubý (hrubymar10)
4a58fee658
Update macOS package changelog 2020-02-02 04:34:33 +01:00
Martin Hrubý (hrubymar10)
d48f445eca
NSHumanReadableCopyright 2020-01-26 11:59:11 +01:00
Iris Morelle
48e6b821b0 i18n: Convert POSIX/Win32 locale table file into a map
This removes the need for the separate file and the giant if chain by
using a std::map instead.
2020-01-19 12:40:03 -03:00
pentarctagon
1b6b0c95ad Make the Debug and Release builds put their executables in the same place. 2020-01-05 01:35:09 -06:00
pentarctagon
0c368e3a1f Remove WindowsTimeout.cpp and related.
This is no longer needed, as the WML unit tests are now handled by the python script.
2019-12-31 18:43:36 -06:00
pentarctagon
0a7f483c72 Add debug and release Windows jobs to travis.
This also removes the separate WML_tests.cmd scripts from VC14 and VC16, now instead using the same run_wml_tests script as the linux jobs.

There is currently no caching of the Windows jobs, since msbuild unfortunately uses timestamps rather than more complete information like scons/ccache in order to determine if things need to be rebuilt. Since git doesn't preserve any sort of last modified timestamp, the cloned repo into the travis job is always "newer" than the cached compiled output, and therefore wesnoth is always fully rebuilt.

Ideally, assuming this sticks around and gets out of early access from travis, we could then use just travis instead of travis and appveyor.
2019-12-31 17:17:34 -06:00
mattsc
183408445f Xcode project: fix unit_tests build 2019-12-31 11:59:37 -08:00