Jonathan G Rennison
38571cf0da
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/landscape.cpp
# src/lang/frisian.txt
# src/lang/korean.txt
# src/lang/russian.txt
2022-10-22 10:08:16 +01:00
glx22
87d1bd895a
Fix f6530f3c2: [Actions] set-output was not correctly converted
2022-10-20 19:22:01 +02:00
glx22
8ffe59373f
Update: [Actions] use annotation-check v3
2022-10-20 19:22:01 +02:00
Loïc Guilloux
f6530f3c2d
Codechange: [Actions] set-output is deprecated ( #10089 )
2022-10-19 21:05:11 +02:00
Jonathan G Rennison
1e7ca9f71a
Merge branch 'master' into jgrpp
2022-09-05 23:21:44 +01:00
Patric Stout
15f4d7c04c
Remove: [GitHub] old configuration file for stale-bot ( #9998 )
...
This bot was deactivated months (years?) ago.
2022-09-04 21:42:08 +02:00
Jonathan G Rennison
142a5a95ec
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# src/goal_cmd.h
# src/industry_cmd.cpp
2022-09-01 17:47:30 +01:00
Aaron Katzin
2fe8a257ac
Add: [Actions] Ubuntu Jammy Jellyfish (22.04) build for releases ( #9881 )
2022-08-31 16:11:34 +02:00
Jonathan G Rennison
13557d868a
Disable uninitialised warnings for MSYS/MinGW CI build
2022-06-25 12:05:41 +01:00
Jonathan G Rennison
5b7db9d849
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
2022-05-15 13:54:13 +01:00
Frazer Smith
9bdc1e8f04
Update: bump peter-evans/repository-dispatch from 1 to 2
2022-05-14 16:58:10 +02:00
Frazer Smith
19b838dd60
Update: bump actions/download-artifact from 2 to 3
2022-05-14 16:58:10 +02:00
Frazer Smith
9162ac9d37
Update: bump actions/checkout from 2 to 3
2022-05-14 16:58:10 +02:00
Frazer Smith
2a2f80bb71
Update: bump actions/cache from 2 to 3
2022-05-14 16:58:10 +02:00
Frazer Smith
33dabc42bb
Update: bump actions/upload-artifact from 2 to 3
2022-05-14 16:58:10 +02:00
Owen Rudge
5a6ea11ead
Feature: [Actions] Package builds for the Windows Store automatically
2022-05-04 11:40:49 +01:00
Jonathan G Rennison
34af4844d1
Merge branch 'master' into jgrpp
2022-04-02 14:16:32 +01:00
Patric Stout
8537fa7206
Fix: [Actions] Remove Ubuntu:groovy from release pipeline ( #9845 )
...
It no longer exists upstream. Let's focus on LTS only for now.
2022-04-02 12:36:15 +02:00
Owen Rudge
1bfbcff71e
Change: [Actions] Switch back to primary source for 'gon' in macOS build job
...
This reverts commit 7a97a33598
2022-03-31 13:00:35 +01:00
Owen Rudge
7a97a33598
Fix: [Actions] Switch source for 'gon' in macOS build job
2022-03-28 21:56:24 +01:00
Loïc Guilloux
1a17b6c8f6
Change: [Actions] Remove VS2017 and restore VS2019 for CI ( #9835 )
2022-03-13 16:05:24 +01:00
Jonathan G Rennison
16e4b84a2f
Github: Disable installing gon in OSX release build
2022-03-12 02:40:18 +00:00
Jonathan G Rennison
e5ae88e8ea
Github: Disable import windows signing cert in release workflow
2022-02-01 22:28:22 +00:00
Jonathan G Rennison
3645bcfe62
Github: Disable auto-running of release workflow
2022-01-31 02:27:39 +00:00
Jonathan G Rennison
1c7f6b97a5
Update Github release file to fix compile and distro issues
2022-01-05 19:21:43 +00:00
Jonathan G Rennison
0691b25e17
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
2021-11-20 13:15:32 +00:00
Patric Stout
0cbe94256e
Change: [Emscripten] update to 2.0.34 and use Release over RelWithDebInfo ( #9696 )
...
It turns out that having "-g" in the compile-statement causes
Emscripten to pick -g3, which makes for very big binaries. This
is very likely not your intention when building Emscripten, as
smaller really is better.
For comparison, with RelWithDebInfo the binary is ~80MB. With
Release it is ~7.4MB.
2021-11-14 16:59:49 +01:00
Jonathan G Rennison
656c596c33
Disable fetching MacOS code signing certs in release workflow
2021-11-11 01:01:14 +00:00
Jonathan G Rennison
f79977ad0b
Disable signing installer in release workflow
2021-11-11 00:58:22 +00:00
Jonathan G Rennison
49228a5ee4
Disable unused strings check on PRs for now
...
See: #333
2021-11-09 00:46:45 +00:00
Jonathan G Rennison
e5668cb9ad
CI: Remove regression test from MSYS job
2021-11-03 02:04:12 +00:00
Jonathan G Rennison
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
2021-11-03 00:45:12 +00:00
Jonathan G Rennison
324e90e5ac
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/lang/english.txt
# src/lang/greek.txt
# src/network/core/tcp_connect.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings/gui_settings.ini
# src/town_cmd.cpp
# src/widgets/rail_widget.h
2021-11-02 19:23:24 +00:00
Jonathan G Rennison
9e1bb3eea7
Merge tag '12.0-beta2' into jgrpp-beta
...
# Conflicts:
# docs/landscape_grid.html
# src/lang/simplified_chinese.txt
# src/network/network_server.cpp
# src/station_cmd.cpp
2021-11-02 18:02:37 +00:00
Jonathan G Rennison
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
2021-11-02 17:51:38 +00:00
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
2021-11-01 18:54:43 +00:00
Jonathan G Rennison
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
2021-10-29 22:22:54 +01:00
Jonathan G Rennison
23497dea35
Github: Enable blank issues, remove contact links section
2021-10-29 19:51:27 +01:00
Jonathan G Rennison
da282c3ecc
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
2021-10-28 23:51:24 +01:00
glx22
14429bbe8a
Change: [Actions] Also check desync debug
2021-10-19 09:05:00 +01:00
Patric Stout
5bcdf16dc5
Fix 01603d9e: [Preview] publishing preview failed due to recent changes ( #9621 )
...
Since 01603d9e
2021-10-17 22:42:29 +02:00
Patric Stout
01603d9e47
Fix 3046a6ce: [Preview] building preview failed to patch LZMA ( #9620 )
...
The job was started under a non-priv user, which did not have
permission to patch the emscripten files required to make LZMA
work.
2021-10-17 21:59:50 +02:00
Loïc Guilloux
46123742f5
Change: [Actions] Use macOS-11 image for releases ( #9605 )
2021-10-03 21:14:59 +02:00
Patric Stout
3046a6ce39
Change: upgrade Emscripten to 2.0.31 and enable LZMA by default ( #9604 )
2021-10-03 16:20:05 +02:00
Jonathan G Rennison
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
2021-09-27 22:47:23 +01:00
Jonathan G Rennison
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
2021-09-22 21:50:02 +01:00
Patric Stout
9c74dc2468
Codechange: validate that all STR_NNN strings are defined and used ( #9518 )
2021-09-02 22:32:10 +02:00
frosch
93fd42b0c3
Doc: guidelines on english.txt or translation changes in PRs. ( #9505 )
2021-08-22 14:27:48 +02:00
Patric Stout
b2eafcc720
Fix: [Actions] changelog assumed major.minor.patch versioning ( #9482 )
...
We now use major.minor versioning, so it failed to pick up the
correct information.
2021-08-15 14:14:13 +02:00
Patric Stout
b67ef1e5b8
Fix: [Actions] Ubuntu 18.04 by default has a compiler too old for OpenTTD ( #9481 )
2021-08-15 13:08:58 +02:00
