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
3 years ago
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
3 years ago
23497dea35
Github: Enable blank issues, remove contact links section
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
98e653dacc
Fix #9386 : compilers failing to compile with LTO by using variants instead of new + unique_ptr
...
With std::variant all memory can be figured out at compile time, so the compiler needs to keep track of fewer elements. It also saves out a unique_ptr and its memory management, over a slight impact for resolving a setting.
3 years ago
1ed7afc0a8
Change: [GitHub] use an issue form to let people fill in bug report / crashes ( #9400 )
3 years ago
f86c66cbd7
Codechange: [Actions] Improve MSYS2 setup time ( #9360 )
3 years ago
acb6348ba6
Add: [Actions] msys2/MinGW CI ( #8698 )
3 years ago
3ce7e31f64
Feature: Sign Windows builds
3 years ago
3477405e86
Change: [Actions] use newly created Actions instead of custom shell-scripting ( #9284 )
3 years ago
c53d9991ee
Add: [Actions] Check CI annotations to detect compile warnings ( #9217 )
3 years ago
282d5d302d
Change: [Actions] Add a 2 minutes timeout for regression test ( #9166 )
3 years ago
8eb27e1ac7
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/lang/japanese.txt
# src/network/core/config.h
# src/network/core/packet.cpp
# src/network/core/tcp.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui_base.h
3 years ago
27031b396f
Change: [Actions] Reword bug/crash report instructions ( #9104 )
3 years ago
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
3 years ago
2e39ac5ba2
Add: [GitHub] use issue templates to make it more clear what we expect from users ( #9092 )
4 years ago
d0159f2452
Github: Disable CI build workflow on push to master
4 years ago
edfa04286b
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/polish.txt
# src/lang/portuguese.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.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
4 years ago
5e14b54a0c
Merge branch 'master' into jgrpp
4 years ago
2a9825b8de
Add: [Actions] Debian Bullseye release build ( #8921 )
4 years ago
9639e77297
Fix: [Actions] "is-tag" variable is the 5th element, not 6th
...
The 6th is "is-stable-tag", but it is currently broken in meaning.
Betas and RCs are considered "stable", but final releases are not.
This is the reason it was working for RC1, but not for the final
release.
4 years ago
64a8c38d2f
Fix: [Actions] update environment variable for AWS region ( #8827 )
4 years ago
92eb93561c
Github: Add workflow dispatch trigger for CI builds
4 years ago
eab32e8861
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/lang/serbian.txt
4 years ago
db0993f500
Change: [Actions] Also check dedicated build
4 years ago
26dcd0734e
Github: Disable release upload jobs
4 years ago
d7b76df1f5
Github: Fix revision logging in release workflow
4 years ago
6482a48099
Github: Adjust version file info in release workflow
4 years ago
84a7ab180e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/lang/greek.txt
# src/table/settings.ini
4 years ago
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
4 years ago
cd4c8ecbf3
Add: [Actions] Allow partial cache invalidation on dependencies change
4 years ago
b284d34277
Add: Support Zstandard(zstd) savegame compression
...
(cherry picked from commit 6f0aeaf2c5436550c93205e704624957e9abc969)
4 years ago
70e4845915
Change: [Actions] Use only CMake, CTest and CPack
4 years ago
90adac8f09
Change: [Actions] stop using 'run-vcpkg' action for Release
4 years ago
58640824d1
Change: [Actions] stop using 'run-cmake' action for Release
4 years ago
2fd2950eb5
Change: [Actions] stop using 'run-vcpkg' action for CI
4 years ago
30ae019095
Change: [Actions] stop using 'run-cmake' action for CI
4 years ago
68a0a4d1b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/newgrf_config.cpp
4 years ago
b124c49ea4
Fix: [Actions] Also run CI against libsdl1.2 for every pull request
4 years ago
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
4 years ago
cb8e1706b2
Fix: [Actions] if SDL2 is installed, it is always picked over SDL1
...
So no need to install both SDL1 and SDL2, that gives a false idea
of reality.
4 years ago
d3df4674f9
Fix: [Actions] build our allegro driver too in our CI
...
This prevents us breaking it without realising.
4 years ago
d3b50b9c47
Fix: [Actions] Use vcpkg to provide libpng on macOS
4 years ago
6755ff63e1
Add: [OSX] Native font rendering without using FreeType.
4 years ago
f181037bed
Change: [Actions] Also run CI for VS2017
4 years ago
395e015282
Change: Convert .md to .rtf for Windows/Mac packages
4 years ago
da4c404f3d
Fix: [Actions] Use same vcpkg commit for CI on macOS as release builds
4 years ago
4f0692c437
Codechange: [Actions] Document better why we build our own fluidsynth ( #8646 )
...
nielsmh nicely correct us in #8641 , pointing out the old comment
is not telling a complete truth. The result is the same, but it
is better to not mislead future-us.
4 years ago
Jonathan G Rennison
rubidium42
Patric Stout
Loïc Guilloux
Owen Rudge
Tyler Trahan
Charles Pigott
glx22
dP
Michael Lutz