dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,634 Commits 1 Branch 0 Tags
ee4e82c1b6d732f31d11bdce6869dbc21efcaed3
Commit Graph

55634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
f3adb13e34 Re-arrange translation files 2023-07-04 23:53:23 +01:00
Jonathan G Rennison
b487cb6605 Merge PR #564 into jgrpp 2023-07-04 23:51:33 +01:00
Jonathan G Rennison
3e03cebad1 Simplify industry_tooltip_show_stockpiled setting 
See: #564
 2023-07-04 23:50:53 +01:00
Jonathan G Rennison
5d7721a2d4 Fix handling of free wagons in depot tooltip 
See: #564
 2023-07-04 23:49:50 +01:00
Jonathan G Rennison
359ba9de68 String handling adjustments for PR #564 2023-07-04 23:49:50 +01:00
Patric Stout
27f305696c Fix: disable hardware acceleration when GPU driver crashed the game last attempt (#10928) 
(cherry picked from commit 0e56a73fb8)
 2023-07-04 19:01:52 +01:00
Jonathan G Rennison
0cb7e253e9 Change fmt include in debug_fmt.h 2023-07-04 19:01:52 +01:00
Jonathan G Rennison
ee5272dc4e Crashlog: Fix font logging 2023-07-04 19:01:52 +01:00
RoqueDeicide
84e5aba1d7 [Change] Reworked stockpile settings into 1 dropdown. 2023-07-04 11:11:59 +04:00
RoqueDeicide
cadb2f3afc [Change] Added ability for detailed depot viewport tooltips to show single lines, if possible. Made some suggested adjustments. 2023-07-04 08:49:18 +04:00
RoqueDeicide
f01112f3fe Merge branch 'JGRennison:jgrpp' into jgrpp 2023-07-04 07:59:38 +04:00
Rubidium
978c83e13d Fix: false positive warning in fmt library (backport ef55d4f of upstream fmt) 
(cherry picked from commit 10e12154f5)
 2023-07-04 00:31:19 +01:00
Niels Martin Hansen
f55027a8f4 Fix: Layouter not taking stripped formatting codes into account when mapping visual coordinates to/from original string 
(cherry picked from commit 103d88ee33)
 2023-07-04 00:30:21 +01:00
Niels Martin Hansen
1793a5881d Fix: Layouter::GetCharAtPosition counting wrong 
Bug introduced in commit 60399e

(cherry picked from commit ed3f14686d)
 2023-07-04 00:30:12 +01:00
Rubidium
78d28d432b Codechange: allocate enough memory to layout the strings 
(cherry picked from commit 96fef9f643)
 2023-07-04 00:30:02 +01:00
Jonathan G Rennison
1e5bc2c12b Merge branch 'master' into jgrpp 2023-07-04 00:26:00 +01:00
Jonathan G Rennison
d75c489466 Add various missing includes 2023-07-03 23:44:54 +01:00
Jonathan G Rennison
c0d47da4a7 Add missing includes to town_type.h, network_survey.h, pool_type.hpp 2023-07-03 23:15:04 +01:00
Jonathan G Rennison
0bf41dc1ff Change gamelog to use std::vector 
Move LoadCheckData to its own header
 2023-07-03 22:42:59 +01:00
Jonathan G Rennison
5ae5ac3701 Add missing includes to cargo_type.h 2023-07-03 21:21:15 +01:00
Jonathan G Rennison
b8bb0d820a Add missing includes to newgrf_config.h 
See: #563
 2023-07-03 21:16:20 +01:00
RoqueDeicide
733f53dc9a Merge branch 'tooltip_extension' into jgrpp 2023-07-03 19:59:29 +04:00
RoqueDeicide
736c650b6c [Change] Make town viewport tooltips functionally equivalent to town labels. 2023-07-03 19:14:27 +04:00
Jonathan G Rennison
51a66b9590 Link graph: Fix FlowStat::ScaleToMonthly scaling 
Fixes: e1cce4d9
 2023-07-03 01:14:57 +01:00
Jonathan G Rennison
e1cce4d9f7 Link graph: Store last compression in scaled date ticks 
Higher accuracy than using dates at high day legnths
 2023-07-02 16:58:17 +01:00
Fedello
2936bf370f Update Galician Translations (#562) 
* 🌐 Update Galician Translations

* 🌐 Update Galician Translations

* Add missing translation

---------

Co-authored-by: pvillaverde <pvillaverde@qualigy.com>
 2023-07-02 12:09:23 +01:00
Jonathan G Rennison
ead18b2af2 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
 2023-07-02 12:02:36 +01:00
RoqueDeicide
5af7be6d17 [Feature] Added station viewport tooltips. 2023-07-01 22:59:00 +04:00
RoqueDeicide
1071235aee [Feature] Added depot viewport tooltips. 2023-07-01 22:58:24 +04:00
Jonathan G Rennison
1ad82c200a Don't refresh viewports when changing smallmap height mode 2023-07-01 17:22:46 +01:00
Jonathan G Rennison
d2e29b33d1 Remove upper limit from give money command 
See: #537
 2023-07-01 12:12:32 +01:00
Jonathan G Rennison
8fea927ed1 Add setting for whether to shade height in viewport map mode 
See: #550
 2023-07-01 12:03:36 +01:00
Jonathan G Rennison
99b883298e Add help text for the various viewport map settings 2023-07-01 11:22:18 +01:00
Jonathan G Rennison
05be624294 Remove gui.viewport_map_scan_surroundings setting, now always enabled 2023-07-01 11:00:59 +01:00
Jonathan G Rennison
5d746f8971 Don't use scheduled dispatch for predicted times in GUI when disabled 
See: #559
 2023-07-01 10:04:44 +01:00
Jonathan G Rennison
28a764f319 Fix order backup not copying dispatch schedules when not enabled 
See: #559
 2023-07-01 03:03:04 +01:00
Jonathan G Rennison
d09b504bc5 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h
 2023-07-01 02:42:51 +01:00
Jonathan G Rennison
87ee18b6b9 Add close/delete window function aliases for upstream 2023-06-30 23:34:27 +01:00
RoqueDeicide
33ee78f9ac [Feature] Extended functionality of industry viewport tooltips. 
Added ability to turn them off or to show any combination of the following: name, required, stockpiled or produced cargoes.
 2023-06-30 15:55:12 +04:00
Jonathan G Rennison
01c6705339 Fix text rendering with 8bpp-simple blitter 
First member of string_colourremap was never assigned
Ensure that it is set to 0
 2023-06-29 17:00:09 +01:00
Jonathan G Rennison
d55ba23a87 Fix dual pane purchase window with mixed wagon/loco variant trees 
Use top-level variant engine for the loco/wagon categorisation

See: #558
 2023-06-28 19:27:49 +01:00
Jonathan G Rennison
5415b596b0 Handle case where VehicleLengthChanged called on engine without a GRF 2023-06-28 19:03:56 +01:00
RoqueDeicide
8eea01717f [Feature] A setting to allow town name tile tooltips to always or never be displayed. 2023-06-28 16:11:51 +04:00
RoqueDeicide
d6041744ca [Change] Moved tooltip-related settings to a dedicated category. 2023-06-28 15:14:29 +04:00
Jonathan G Rennison
3b2e917ca4 Enable vehicle variable 61 for ships 
Bump multi_part_ships feature version, add to documentation
 2023-06-26 00:18:11 +01:00
Jonathan G Rennison
e94f9699de Picker tool: Remember rail/road/tram as last used when opening from picker 2023-06-25 00:04:11 +01:00
Jonathan G Rennison
fbffb4c24c TBTR: Remove wrong tooltips in template window group, template panels 
See: #555
 2023-06-25 00:04:11 +01:00
Jonathan G Rennison
698de52d13 Settings GUI: Fix station rating tooltip mode being in wrong section 2023-06-25 00:04:11 +01:00
Jonathan G Rennison
9a5df29648 Adjustments for PR #556 
Setting text/condition, tooltip condition
 2023-06-25 00:04:11 +01:00
Jonathan G Rennison
4fae774cb5 Merge PR #556 into jgrpp 2023-06-24 23:48:08 +01:00