dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,194 Commits 1 Branch 0 Tags
1ce89305832b78412f828f37d6bd923d011947cc
Commit Graph

57194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Nelson
f268c90bd3 Change: Use sparse padding for content download window. (#11501) 2023-11-27 23:17:16 +00:00
Peter Nelson
ab1a4c6c80 Change: Don't restart playback when toggling playlist shuffle. 
Instead update the selected playlist entry for the current song.
 2023-11-27 23:16:41 +00:00
Peter Nelson
6c91c4b99d Fix: Invalidate playlist window when (un)shuffling playlist. 2023-11-27 23:16:41 +00:00
Peter Nelson
4c6ccb5248 Change: Try stopping extmidi player with SIGINT first. (#11404) 
This may give the player a chance to issue MIDI note-off commands.

The kill/waitpid cycle is also less aggressive, waiting 50ms each time.
 2023-11-27 20:39:22 +00:00
Richard Wheeler
a856fbeca9 Fix: Incorrect mask files for NE river slopes (#11503) 2023-11-27 13:00:20 +00:00
Peter Nelson
e3622da408 Fix #11500: Rename Textfile GUI's LinkType to HyperlinkType. (#11502) 
This disambiguates it with LinkType in league tables.
 2023-11-27 10:06:46 +00:00
Richard Wheeler
2b92577f5c Fix: Add shading to river slopes 
Adds a 32bpp shading to the river rapids/slopes to make them more visible. Requires a bump of original graphics grfs to use container version 2. Fixes #9031
 2023-11-26 23:54:10 +01:00
Peter Nelson
46098449b6 Fix 7cfcf65: cargo_filter_criteria is now a CargoID instead of a index. (#11497) 2023-11-26 19:30:22 +00:00
Jonathan G Rennison
977758b9ca Version: Committing version data for tag: jgrpp-0.56.0 2023-11-26 18:46:25 +00:00
Peter Nelson
7bee955a4b Change: Set height of larger heightmap/scenario worldgen buttons by text height. (#11496) 
This allows the button height to scale properly by font size.
 2023-11-26 17:56:51 +00:00
Jonathan G Rennison
ca23e31986 Add railtype variable for adjacent crossing information 2023-11-26 17:29:27 +00:00
Peter Nelson
872fdcbbab Change: When building NewGRFs, use grfid (from grfcodec) to calculate NewGRF MD5 hash. (#11492) 
This allows for v2 container NewGRFs to be created. Hashes are needed for building the baseset metadata, so the .hash files are stored the source tree so they can be built if grfcodec and grfid are not present.

The hash of openttd.grf is not actually needed, but it is simpler to leave it in than handle only orig_extra.grf.
 2023-11-26 15:59:41 +00:00
Jonathan G Rennison
a3371fccc6 Remove Cheats/ExtraCheats distinction 
It is not necessary as there is no longer a need to preserve
the size/order of struct Cheats
 2023-11-26 11:32:26 +00:00
Jonathan G Rennison
c5a292c0df Fix #11493: Incorrect flow values in LinkGraphJob::EdgeAnnotation (#11494) 2023-11-25 20:57:20 +00:00
translators
c6b9227dbb Update: Translations from eints 2023-11-25 18:37:21 +00:00
Tyler Trahan
3902acb13d Codechange: Define a TickCounter variable type for TimerGameTick::counter 2023-11-25 11:50:46 -05:00
Tyler Trahan
d28caa3ced Codechange: Use ticks for timetable start date 2023-11-25 11:50:46 -05:00
Peter Nelson
bc1d49ebf4 Codechange: Add missing ar from Toolb. 2023-11-25 16:45:01 +00:00
Peter Nelson
5489b9fc0c Codechange: Undo #11447, drop down list divider lines are now explicit. 2023-11-25 16:45:01 +00:00
Peter Nelson
667be98ce8 Codechange: List toolbar menu items and dividers explicitly. 
This makes it clearer what items will be shown in the list, allows for non-consecutive
string IDs, and means unused enum values are not necessary.
 2023-11-25 16:45:01 +00:00
Jonathan G Rennison
7d65fbd6e8 Link graph: Fix incorrect job start/join dates when loading upstream saves 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
acc54fabfe Link graph: Fix last_compression adjustments for link graph jobs 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
4874381943 Link graph: Fix date shifting after max year 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
b03064e55b Fix IniLoadSettings 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
21b49a213e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h
 2023-11-25 14:14:00 +00:00
Peter Nelson
7fb369c732 Fix: extmidi did not move on to next song after playing ends. (#11469) 
`song` is no longer a C-style string so cannot be cleared by writing a NUL char.
Use `.clear()` to properly clear a std::string.

(cherry picked from commit 08778094f4)
 2023-11-25 13:35:29 +00:00
Peter Nelson
96d4538055 Fix #11437: Flipped shorter rail vehicles disappear in windows. (#11446) 
Mixed signed/unsigned strikes again, causing an incorrect sprite offset for shortened vehicles.

(cherry picked from commit 43aa91a7f5)
 2023-11-25 13:35:03 +00:00
Peter Nelson
480e03360b Fix #9545: Crash when all cargo types are disabled. (#11432) 
This is not a very useful state, but it's nice to not crash.

Some parts of the game don't (yet) check for cargo types being redefined, that is out-of-scope here.

(cherry picked from commit bbd64bbe2b)
 2023-11-25 13:34:53 +00:00
Patric Stout
0b226865d5 Fix cda6f24f: don't ignore binary-dir if it happens to be working-dir (#11431) 
Some of our code ignores the SP_WORKING_DIR for some actions, which
means that if, for example, your SP_BINARY_DIR is the same as your
SP_WORKING_DIR, neither is scanned.

Instead, only add SP_WORKING_DIR if it is unique.

(cherry picked from commit c059ce0c97)
 2023-11-25 13:34:43 +00:00
Peter Nelson
63ed5de957 Fix: Some NWidget lists were not properly closed. (#11425) 
(cherry picked from commit d4a77411a5)
 2023-11-25 13:33:18 +00:00
Rubidium
57efeec5bb Fix: allow same length server password in the UI 
(cherry picked from commit a849b4e175)
 2023-11-25 13:32:55 +00:00
Peter Nelson
609eb46ba7 Fix 233aac5: Set newline default comment for new groups. (#11411) 
The newline space between ini groups is actually recorded as a comment of the group. This got inadvertantly dropped in #11364.

(cherry picked from commit 35a7770fde)
 2023-11-25 13:31:04 +00:00
Jonathan G Rennison
2a31095118 Merge branch 'master' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/console_cmds.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/hotkeys.cpp
#	src/network/core/tcp_connect.cpp
#	src/network/core/tcp_listen.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_engine.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_station.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/macosx/osx_main.cpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h
#	src/timer/timer_manager.h
#	src/timer/timer_window.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/vehicle_cmd.h
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_func.h
#	src/window_gui.h
 2023-11-25 13:30:06 +00:00
Jonathan G Rennison
38df621e62 Improve train speed adaptation with realistic braking 
Take into account recorded speeds at signals along the reservation
As noted in the lookahead

See: #613
 2023-11-25 00:23:27 +00:00
Peter Nelson
47eabe0cd9 Fix 7cfcf65: Check if last-remembered build vehicle cargo filter is valid. (#11486) 
This can be invalid when switching between games with different cargoes loaded.
 2023-11-23 22:46:22 +00:00
Jonathan G Rennison
3f90910bb8 Show train speed adaptation info in debug window 2023-11-23 18:19:18 +00:00
Jonathan G Rennison
c9a205c707 Train speed adaptation: Move IsOutOfDate to be a method 2023-11-23 17:59:27 +00:00
Peter Nelson
096da3e59f Fix #11407: Don't steal focus from dropdown menus. (#11484) 2023-11-22 19:09:20 +00:00
Jonathan G Rennison
85e1146fab Documentation: Fix typo in NewGRF additions (NML) document 2023-11-21 20:56:06 +00:00
Peter Nelson
09d01bd015 Fix: Restore original cargo legend 'blob' dimensions. (#11480) 
An off-by-one in a previous life made the 'blob' too narrow.
 2023-11-21 19:51:24 +00:00
Peter Nelson
c2f19fed24 Fix: Widget without tooltip should use STR_NULL not STR_EMPTY. (#11482) 2023-11-21 19:35:47 +00:00
Peter Nelson
c18a1494b7 Codechange: Remove FONT_HEIGHT_... macros. (#11481) 
These make it look like we're dealing with a constant, but actually each is a call to `GetCharacterHeight(...)`.
 2023-11-21 19:04:24 +00:00
translators
96ec9c1b47 Update: Translations from eints 
indonesian: 67 changes by ekaknl22
 2023-11-21 18:40:02 +00:00
Jonathan G Rennison
154df0bb7d Fix some unused variable warnings when asserts are disabled 2023-11-20 23:59:08 +00:00
Peter Nelson
0d60dc0353 Fix 96d98d08: Crash in text layouter due to trying to find height of string with zero-width. 
96d98d08 removed the hardcoded minimum width in favour of all-calculated widths, however this does not work when determining multiline text sizes.
 2023-11-20 23:09:20 +00:00
Peter Nelson
62d4fd0572 Codechange: Add method to guess the width/height required for a multiline string. 
This is necessary for widget layouts where a minimum width is not yet known during UpdateWidgetSize().
 2023-11-20 23:09:20 +00:00
Peter Nelson
f281525492 Codechange: Add method to resize both width and height of a widget. 2023-11-20 23:09:20 +00:00
Peter Nelson
d04fd4602d Codechange: Assert that max width passed to GetStringHeight is non-zero. 
Max width of zero will cause text layouters to crash, potentially after exhausting memory first.
 2023-11-20 23:09:20 +00:00
Peter Nelson
0578b8eaa9 Change: Use picker-spacing for scenario found town window. (#11478) 2023-11-20 23:06:15 +00:00
Jonathan G Rennison
0d4d4a9cac Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
 2023-11-20 22:27:05 +00:00