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

2522 Commits

Author SHA1 Message Date
Jonathan G Rennison
ed1b842ad3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
 2023-09-15 20:44:22 +01:00
Jonathan G Rennison
c8817d7f4e Merge branch 'master' into jgrpp 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
 2023-09-12 20:06:47 +01:00
Michael Lutz
5cc623cb3c Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.

(cherry picked from commit a6f2f3c042)
 2023-09-10 20:50:57 +01:00
Jonathan G Rennison
f6eadf19c6 Replace vehicle tile hash 
Use robin hood hash of TileIndex
Retain linked list of vehicles on the same tile
 2023-09-10 16:19:19 +01:00
Jonathan G Rennison
c0598d34bf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console.cpp
#	src/os/os2/os2.cpp
#	src/os/unix/font_unix.cpp
#	src/strgen/strgen.h
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
 2023-09-02 20:48:58 +01:00
Jonathan G Rennison
a0e3885acc Add airport tile variables to get airport type local ID and layout 2023-08-26 15:01:10 +01:00
Jonathan G Rennison
e72744cc77 Debug: Show airport type/layout in debug window 2023-08-26 14:11:54 +01:00
Jonathan G Rennison
547c00b465 Settings: Only write out config on setting change for persistent changes 2023-08-24 17:27:47 +01:00
Jonathan G Rennison
1eb1b0ffcb Debug: Show cargo packet info if cargo is reserved 2023-08-23 21:29:01 +01:00
Jonathan G Rennison
b0538a00e0 Add setting for whether to allow converting town road to non-house types 
See: 51e22617
 2023-08-20 17:53:08 +01:00
Jonathan G Rennison
19835b51ee Move StationCargoList and FlowStatMap out of GoodsEntry struct 
Move them into a new GoodsEntryData struct referenced
using a std::unique_ptr from GoodsEntry.
The unique_ptr may be nullptr if the cargo list and flow stat map
are both empty (this is the case for unused cargoes).

This reduces GoodsEntry from 128 to 24 bytes,
and Station from 8680 to 2024 bytes,
(on Linux x86_64).
 2023-08-19 21:24:29 +01:00
Jonathan G Rennison
c7712bbd20 Debug: Shpw station GoodsEntry info in station debug window 2023-08-18 23:13:30 +01:00
Jonathan G Rennison
2ae4e5bdc1 Change road vehicle path cache to be optional and use ring buffers 
Show path cache in debug window
 2023-08-16 15:17:56 +01:00
Jonathan G Rennison
8a14d8c246 Add setting to also limit acceleration when using realistic braking 2023-08-09 00:16:28 +01:00
Tyler Trahan
748ff13a6d Change: Enable "Forbid 90 degree turns" setting by default 
(cherry picked from commit 4decd2aa48)
 2023-07-31 18:22:58 +01:00
Daniel Hill
924b2ab9ec Add an optional "(City)" in Viewport labels 2023-07-30 22:06:51 +01:00
Jonathan G Rennison
4c88256183 De-duplicate string IDs used for viewport town labels 2023-07-30 21:47:03 +01:00
Jonathan G Rennison
ebcf8b336c Add SET_COLOUR string code 2023-07-30 21:47:03 +01:00
Jonathan G Rennison
8af0dc223c Debug: Improve display of rail/road/tram type labels 
Click to show individual compatible/powered types
 2023-07-18 22:54:55 +01:00
Jonathan G Rennison
11bf8e22d7 Add setting to show order number in vehicle view window 2023-07-17 19:02:01 +01:00
Jonathan G Rennison
c6c69fa3da Add setting for long-term autosaves 
A second set of autosaves for whenever the main set wraps around to 0
 2023-07-09 10:02:57 +01:00
Jonathan G Rennison
126b31a744 Improve colouring of restricted signal posts with original TTD graphics 2023-07-08 19:12:39 +01:00
RoqueDeicide
c57bfa479a [Feature] Added waypoint viewport tooltips. 2023-07-06 14:53:09 +04:00
Jonathan G Rennison
3e03cebad1 Simplify industry_tooltip_show_stockpiled setting 
See: #564
 2023-07-04 23:50:53 +01:00
RoqueDeicide
84e5aba1d7 [Change] Reworked stockpile settings into 1 dropdown. 2023-07-04 11:11:59 +04:00
RoqueDeicide
733f53dc9a Merge branch 'tooltip_extension' into jgrpp 2023-07-03 19:59:29 +04: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
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
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
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
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
Richard Wheeler
3b2934c479 Change: Make terraforming point selection sprite visible at >2x zoom out (#11017) 2023-06-27 10:47:42 -04:00
Jonathan G Rennison
55c07eed59 Change: Add separate setting for server sent commands per frame limit (#11023) 
Set a higher default value for this setting.
Use the higher of this and existing commands per frame limit
setting for server-originating commands, e.g. GS.

This is to support the GSAsyncMode class.
This also avoids undue throttling when more than one
script is in operation (e.g. AIs).
 2023-06-27 12:32:45 +01:00
Jonathan G Rennison
9a5df29648 Adjustments for PR #556 
Setting text/condition, tooltip condition
 2023-06-25 00:04:11 +01:00
RoqueDeicide
829db8e4f9 Feature: A setting to bring back old tile tooltip behavior. 
If enabled, the setting allows tooltips for tiles, such as industries, to show instantly, when otherwise they would require a right-click.
 2023-06-25 00:11:01 +04:00
glx22
b1fb209bed Add: {COLOUR} control code to allow colour changes at runtime 2023-06-20 19:05:10 +02:00
Jonathan G Rennison
dadebfa759 Debug: Show engine cargo/refit values 2023-06-18 10:05:48 +01:00
Jonathan G Rennison
051cb29f7a Debug: Show engine misc flags for all vehicle types 2023-06-18 10:05:29 +01:00
Jonathan G Rennison
d6787c4731 Fix f9f1cb21: Setting saveload type 
See: #548
 2023-06-14 22:29:12 +01:00
Jonathan G Rennison
b18d3c9603 Network: Auto-kick clients after too many failed rcon/settings attempts 2023-06-14 21:58:35 +01:00
Jonathan G Rennison
f9f1cb2190 Fix crash when changing AI interval setting 
See: #548
 2023-06-14 21:02:26 +01:00
Jonathan G Rennison
ccdca8ae52 Add setting to increase size of main toolbar 2023-06-09 19:21:28 +01:00
Jonathan G Rennison
02549c5224 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp
 2023-06-08 00:01:38 +01:00
Jonathan G Rennison
d3fbe88a9c Add setting for departure boards duration when using minutes 
Default to 24 hours
 2023-06-07 02:20:32 +01:00
Jonathan G Rennison
bc00753996 NewGRF stations: Remove extended version of varuiable 68 2023-06-06 21:35:39 +01:00