Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,900 Commits 12 Branches 178 Tags 449 MiB
b598abed3d
Commit Graph

50 Commits

Author SHA1 Message Date
Jonathan G Rennison
5ae74ecf8e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/core/format.hpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc/endian_buffer.hpp
#	src/music/music_driver.hpp
#	src/newgrf_gui.cpp
#	src/rail_cmd.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/strgen/strgen.cpp
#	src/strings.cpp
#	src/timetable_cmd.cpp
#	src/town.h
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/widgets/road_widget.h
 2023-12-17 00:37:16 +00:00
Jonathan G Rennison
c929f7075e Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
 2023-11-19 13:00:21 +00:00
Christopher Lee
763f0eb1f0
Add: LSB_RELEASE_ID Linuxmint to .deb package (#11390) 2023-11-08 01:27:50 +01:00
Niels Martin Hansen
41de0d46f3 Feature: Help and manuals access window 2023-09-13 16:11:08 +02:00
Niels Martin Hansen
2cff43251e Add: Install additional documentation files with the game 
Also include it in Emscripten packages
 2023-09-13 16:11:08 +02:00
Jonathan G Rennison
ae9b416684 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
 2023-02-11 23:05:22 +00:00
Byoungchan Lee
12f9fbcf39
Fix: [CMake] remove cpack warning on fedora when lsb_release exists (#10437) 2023-02-01 07:41:41 +00:00
Bouke Haarsma
887b760c88
Change: Strip symbols from bundles except macOS (#10072) 2022-10-10 13:42:54 +01:00
Bouke Haarsma
d0dcb6547e
Change: Don't strip symbols from bundles (#10071) 2022-10-07 12:56:45 +02:00
Jonathan G Rennison
c4e2175cc9 Merge branch 'master' into jgrpp 2022-04-29 18:00:33 +01:00
Nik Nyby
44713a68ed
Add: [CMake] support rpm for fedora and rhel (#9861) 2022-04-19 02:11:42 +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
Owen Rudge
3ce7e31f64 Feature: Sign Windows builds 2021-05-26 13:40:44 +01:00
Jonathan G Rennison
ba418f9d0d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/simplified_chinese.txt
#	src/network/core/tcp_content.cpp
#	src/network/core/udp.cpp
#	src/network/network_server.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/table/gameopt_settings.ini
 2021-04-25 01:23:52 +01:00
Loïc Guilloux
8395c6532e
Fix 799eb31: [CMake] Don't include regression AIs in bundles (#9068) 2021-04-20 18:46:15 +02:00
Jonathan G Rennison
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
 2021-04-11 02:39:33 +01:00
Jonathan G Rennison
5e14b54a0c Merge branch 'master' into jgrpp 2021-04-05 17:51:45 +01:00
Loïc Guilloux
799eb31ff1
Change: [CMake] Copy AI/GS compatibility files to build dir (#8906) 2021-04-02 10:15:45 +02:00
Jonathan G Rennison
264b1ac370 CPack: Change various package fields to JGRPP values 2021-03-13 12:00:18 +00:00
glx22
35a228f78f Add: [CMake] Install menu and media files 2021-03-09 22:42:25 +01:00
Jonathan G Rennison
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
 2021-02-19 15:38:34 +00:00
Owen Rudge
395e015282 Change: Convert .md to .rtf for Windows/Mac packages 2021-02-08 23:23:24 +00:00
Patric Stout
05df7996a4
Feature: [Actions / CMake] support for generic linux builds (#8641) 
These bundles can be opened on any "modern" Linux machine with
a driver that SDL2 supports.

Machines needs at least glibc 2.15, which was released 10 years ago.
It is build with CentOS 7 as base, and only assumes the following
libraries are available on the system:
- libc
- libdl
- libgcc_s
- libpthread
- librt
- libstdc++

All other libraries the game depends on are bundled together with
the game, so users don't need any library installed to use this
bundle. The downside of course is that this increases the binary
size a bit: 30 MiB of libraries are in this bundle.

RPATH is used to make ld-linux find the folder libraries are
stored in; however, system libraries are always used before these,
in the assumption libraries on the user system are more up-to-date.

Using -DOPTION_PACKAGE_DEPENDENCIES=ON switches on packaging
of libraries in the "lib" folder. This requires CMake 3.16 to
be installed; otherwise it will fail.
 2021-02-05 12:31:27 +01:00
Jonathan G Rennison
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
 2021-02-01 18:58:36 +00:00
Jonathan G Rennison
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
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2021-01-30 18:27:35 +00:00
Jonathan G Rennison
cb69611248 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp
 2021-01-29 18:27:36 +00:00
Owen Rudge
a2bd0a14e1 Feature: [Actions] ARM64 builds for Windows 2021-01-18 08:57:58 +00:00
Owen Rudge
2d9e164ec4 Fix: [Actions] Give Universal Mac packages the "universal" suffix 2021-01-18 08:57:39 +00:00
Owen Rudge
0a129bc810 Change: Label Mac builds as "macos" instead of "macosx" 2021-01-16 10:04:51 +00:00
Charles Pigott
10090d0ac6 Add: [CMake] Explicitly support txz for Arch Linux 2021-01-02 19:47:14 +00:00
Patric Stout
0c3ddc5436
Fix: support non-ubuntu/debian Linux variants with LSB support (#8408) 
This now generates a warning, as we would still like people to
make a Pull Request to support the target. But it does continue
with packing to a txz.
 2020-12-21 21:32:29 +01:00
Patric Stout
6228dde3da Fix: [bundle] postfix the distribution for Linux bundles 2020-12-19 18:26:29 +01:00
Patric Stout
b8217610ce Fix: [bundle] postfix the architecture for Mac OS bundles 
This in preparation for other architectures, like arm64.
 2020-12-19 18:26:29 +01:00
Patric Stout
7cdf7c7ca0 Fix: [bundle] custom launch.sh is no longer required for Mac OS 
Co-authored-by: Owen Rudge <owen@owenrudge.net>
 2020-12-19 18:26:29 +01:00
Jonathan G Rennison
940b5e7a2f Merge branch 'master' into jgrpp 2020-11-04 17:55:00 +00:00
Jelle van der Waa
b6615b2cd4 Fix: make reproducible by not embedding timestamps 
By default gzip embeds a timestamps which makes building it twice
not reproducible, passing -n skips this embedding behaviour.

Motivation: https://reproducible-builds.org
 2020-10-15 22:01:12 +01:00
Jonathan G Rennison
d85a529f87 Merge branch 'master' into jgrpp 2020-10-14 17:38:23 +01:00
Charles Pigott
348c231e12 Codechange: Make codestyle for CMake files consistent for 'control' statements 2020-09-25 14:43:13 +01:00
Jonathan G Rennison
737ced9f50 Merge branch 'master' into jgrpp 2020-07-07 17:28:19 +01:00
glx22
97592c4093 Add: [CMake] Allow renaming of openttd binary 2020-07-02 21:18:14 +02:00
glx22
53de5b5c55 Fix: [CMake] Restore man file compression 2020-07-02 21:18:14 +02:00
Jonathan G Rennison
15d32bcd19 CMake: Disable stripping in bundle 2020-07-01 21:52:21 +01:00
Jonathan G Rennison
efaf935cbf CMake: Remove reference to empty bin/data dir 2020-07-01 00:36:10 +01:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
Dan Church
506598a80a Fix: [CMake] Fix install paths using GNUInstallDirs 2020-06-18 21:18:53 +01:00
glx22
8ef3d8f584 Revert f51e66f6: creating zip bundle fails for MacOS 2020-06-10 21:10:00 +02:00
glx22
3d76677594 Fix: Generate windows installer only for stable releases 2020-06-08 09:49:26 +01:00
glx22
f51e66f697 Fix: Restore zip bundle for MacOS 2020-06-08 09:49:26 +01:00
Patric Stout
b7643b1d36 Add: create bundles via CPack 
CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more.
 2020-06-05 19:36:05 +02:00