Commit Graph

50040 Commits

Author SHA1 Message Date
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
61e7b8c52a Debug: Include vehicle type and unit number in scope_dumper::VehicleInfo 2021-02-01 17:30:41 +00:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
2021-02-01 17:07:34 +00:00
Jonathan G Rennison
1d1b105299 Fix auto remove signals functionality 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
082d9021d0 Only use more specific texts for money sending where available 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
d978ffcb59 Fix train braking model not being set to original on load 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
2021-01-31 01:11:12 +00:00
Jonathan G Rennison
43b0ddc558 Use tile railtype for curve speed look ahead
See: 0f91cb04
2021-01-31 01:08:47 +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
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +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
7cf4621b1c Merge branch 'master' into jgrpp 2021-01-30 14:01:54 +00:00
Jonathan G Rennison
c4f63661bb Revert "Feature #7962: Improve rendering of large viewports"
This reverts commit e82333cf77.
2021-01-30 14:01:37 +00:00
Jonathan G Rennison
f7f28f6ebd Revert "Feature #7962: Significantly improve sprite sorter performance"
This reverts commit 5ca8a0bda9.
2021-01-30 14:01:33 +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
Jonathan G Rennison
dddcd6d441 Merge branch 'pr-213' into jgrpp 2021-01-29 18:18:39 +00:00
Jonathan G Rennison
09dc33022c Add client setting for vehicle naming scheme 2021-01-29 18:16:42 +00:00
Jonathan G Rennison
43980639de Merge branch 'master' into jgrpp
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp
2021-01-29 17:45:15 +00:00
TELK
cd1fd5f352 Update: Korean translation for ed0ffb6 2021-01-29 14:59:30 +09:00
Jonathan G Rennison
4e0804b791 Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed 2021-01-29 02:13:08 +00:00
Jonathan G Rennison
b711f94d1c Fix FollowTrainReservation following outwards from end depot 2021-01-28 23:25:07 +00:00
Jonathan G Rennison
87c87649b8 Fix lookahead init inside a signalled tunnel/bridge only filling interior 2021-01-28 22:28:20 +00:00
Jonathan G Rennison
9506a33443 Don't treat loading trains specially when enabling realistic braking 2021-01-28 22:27:23 +00:00
Jonathan G Rennison
62fffddb3f Don't mark train stuck if no reachable track in TryPathReserve 2021-01-28 22:23:06 +00:00
Jonathan G Rennison
628077d0bb Fix missing stop due to speed when entering station with lookahead 2021-01-28 22:22:11 +00:00
Jonathan G Rennison
d913083c37 Print warning instead of asserting for invalid NewGRF string IDs 2021-01-28 19:03:18 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking
Add setting to select train braking model.
2021-01-28 19:03:18 +00:00
Jonathan G Rennison
2b02318c7e Add int64 cube root and square root functions 2021-01-26 00:00:35 +00:00
Jonathan G Rennison
ac5b0d8017 Fix crash in auto-separation when all orders removed 2021-01-25 02:21:02 +00:00
Jonathan G Rennison
1838e8939f Improve handling of reversing inside bidi signalled tunnel/bridge
Avoid train crashes when reversing trains either side of entrance tile
2021-01-25 02:20:38 +00:00
Jonathan G Rennison
2a82491a2e Fix reservation not cleared from far end of signalled tunnel when removing 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
01c051793c Allow referencing waypoints in news items 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
ac6581ac8f Lang: Fix string codes in german.txt 2021-01-24 22:42:40 +00:00
Jonathan G Rennison
8e825c8b0e Merge pull request #212 from kruemelmagic/kruemelchen-language-german
Update: German translation by kruemelmagic
2021-01-24 16:16:42 +00:00
kruemelmagic
7072bc2fac Update German language by Kruemelchen
Update to be on par with v. 0.39.2
2021-01-23 13:55:28 +01:00
Charles Pigott
a252679a12 Doc: Prepare for 1.11.0-beta1 release 2021-01-22 11:13:57 +01:00
Charles Pigott
b61670f929 Doc: Forwardport changelog & doc changes from 1.10 branch 2021-01-22 11:13:57 +01:00
dP
bab7de6cf2 Feature: Allow GameScripts to add additional text to Industry view window 2021-01-22 09:50:53 +00:00
Pavel Stupnikov
4b42ecb0f6 Feature: Add tile parameter for GSCompany.ChangeBankBalance to show text effect if needed (#8573) 2021-01-22 10:28:26 +01:00
Andy
3345d54ad9 Doc: add a png representation of the palette overlaid with indexes (decimal) (#8547) 2021-01-22 10:26:45 +01:00
translators
33e27e9480 Update: Translations from eints
estonian: 15 changes by siimsoni
russian: 23 changes by Ln-Wolf
2021-01-21 18:42:13 +00:00
translators
6e1581a17d Update: Translations from eints
german: 2 changes by Wuzzy2
russian: 13 changes by Ln-Wolf
2021-01-20 18:44:27 +00:00
translators
27caabdb91 Update: Translations from eints
german: 23 changes by Wuzzy2
russian: 70 changes by Ln-Wolf
2021-01-19 18:41:55 +00:00
frosch
b3d048dfcf Change: [NewGRF] industry special flag 19 now specifically targets only passenger production, instead of the second cargo of any water-based industry. (#8590)
This behavior is less surprising to NewGRF authors, and may even be intentional behavior for some industries.
2021-01-18 22:42:10 +01:00
Michael Lutz
a190b00af1 Fix #8589, 653e7fa548: Motion counter is NewGRF-visible but not saved, leading to desyncs. (#8591)
(cherry picked from commit 7da224d29d)
2021-01-18 20:59:54 +00:00
Jonathan G Rennison
e0893de5c3 Set tunnel/bridge PBS exit to red when leaving 2021-01-18 20:57:55 +00:00
Jonathan G Rennison
aacb70d371 Debug: Extend random debug logging to also include state checksum updates 2021-01-18 20:57:55 +00:00
Michael Lutz
7da224d29d Fix #8589, 653e7fa548: Motion counter is NewGRF-visible but not saved, leading to desyncs. (#8591) 2021-01-18 21:11:38 +01:00
Owen Rudge
a2bd0a14e1 Feature: [Actions] ARM64 builds for Windows 2021-01-18 08:57:58 +00:00
Owen Rudge
6d95ed53dc Feature: Add support for rdtsc for ARM-based Windows (MSVC) 2021-01-18 08:57:58 +00:00