650d5e014e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_gui.cpp
# src/company_cmd.cpp
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/korean.txt
# src/lang/slovak.txt
# src/main_gui.cpp
# src/video/sdl2_v.cpp
4 years ago
7154f8859d
Merge tag '1.11.0-beta1' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
4 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
4 years ago
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
4 years ago
cb69611248
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/changelog.sh
# cmake/PackageDeb.cmake
# src/network/network_client.cpp
# src/settings_gui.cpp
4 years ago
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
4 years ago
4831b4fa96
Codechange: [Actions] we no longer need xdg-basedir ( #8615 )
...
This was already removed from the "ci-build", but not yet from
"release".
4 years ago
1187dc3217
Feature: [Actions] Create .zip for macOS build
4 years ago
a2bd0a14e1
Feature: [Actions] ARM64 builds for Windows
4 years ago
2d9e164ec4
Fix: [Actions] Give Universal Mac packages the "universal" suffix
4 years ago
ce42e819b9
Feature: Build macOS build as a universal binary
4 years ago
bc8f347ef2
Fix: vcpkg binaries were not being cached on Mac
4 years ago
cc5f190cb3
Fix: [Actions] circumvent Windows tar warning about read-only files ( #8570 )
...
This was already applied on the CI build, but not yet on the
release build.
4 years ago
4f5990fa26
Fix: Remove .sha256 files from macOS builds
4 years ago
60851ef1a6
Feature: Sign macOS builds
4 years ago
fec5ce093f
Feature: Build ARM64 (Apple Silicon) version for macOS
4 years ago
4059ccf863
Fix: [Actions] circumvent Windows tar warning about read-only files ( #8524 )
...
Because certain files are read-only, the "restore-cache" step
fails, as Windows tar refuses to overwrite those files (even
if they are identical). Instead of hoping upstream fixes
"restore-cache", just remove the read-only flag on these files
instead.
4 years ago
3dfee979a7
Codechange: Drop libxdg-basedir dependency in favour of finding the directories ourselves
4 years ago
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
4 years ago
f2d78b11dd
Fix: [Actions] cmakeBuildType is only used with CMakeListsTxtBasic ( #8435 )
...
We use CMakeListsTxtAdvanced, and as such, we have to do this our
self via "-DCMAKE_BUILD_TYPE=RelWithDebInfo". Otherwise we are
producing Debug builds instead of Release builds. Oops.
4 years ago
7ea5904395
Add: [Actions] release workflow for both releases and nightlies
...
This has several ways of being triggered:
- When creating a new release via the GitHub interface. Fully
automated that will produce new binaries, upload them, and it
will even update the website to tell about the new version.
- When triggered in an automated way from OpenTTD/workflows to
start a nightly.
- Manually via the Release workflow, which accepts branches,
Pull Requests and tags to build.
Rerunning a job is safe and should be without issues. Everything
retriggers and updates what-ever might have been broken. In fact,
except for dates, it should produce identical results.
Co-authored-by: Charles Pigott <charlespigott@googlemail.com>
4 years ago
93ef759a25
Add: [Actions] preview workflow, where PRs can be reviewed in the browser
...
When a developer attaches the "preview" label, a build is created
and published on https://preview.openttd.org/ . After that, new
pushes to the PR are automatically build (as long as the "preview"
label exists).
If a non-developer attaches the "preview" label, it will be
removed.
4 years ago
d15dc9f40f
Add: support for emscripten (play-OpenTTD-in-the-browser)
...
Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.
Co-authored-by: milek7 <me@milek7.pl>
4 years ago
abb746fae3
Fix: [Actions] cleanup ci-build workflow to be up-to-date ( #8375 )
...
Also, while at it, make it more like the upcoming release-workflow,
so they look a lot more similar.
Functional it should be the same, except that Windows should
now also output when a test fails.
4 years ago
5aac3d71ee
Github: Remove regression tests from build workflow
4 years ago
0d46b5e88a
Github: Remove commit checker workflow
4 years ago
e2eafd86de
Fix: Prevent infinite recursion in commit checker
4 years ago
13e1b13a4e
Fix: [Actions] Call apt-get update before trying to install packages
4 years ago
2073c8d67f
Add: [Actions] Add problem matchers for CI platforms
4 years ago
5af98c69e6
Add: [Actions] CI build workflow
4 years ago
fb3de33a38
Add: [Actions] commit-checker workflow
5 years ago
Jonathan G Rennison
Patric Stout
Owen Rudge
Charles Pigott
glx22