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
|
7 months ago |
|
Jonathan G Rennison
|
d4f39ea6c2
|
Remove "Show order management button" setting
Now always enabled
|
7 months ago |
|
Jonathan G Rennison
|
fc1c47cbd2
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
|
7 months ago |
|
Jonathan G Rennison
|
524af62b8e
|
Remove now-unused autosave strings
|
7 months ago |
|
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
|
9 months ago |
|
Jonathan G Rennison
|
02aecca5ae
|
Conditional order: Replace "next station" with manually set station
|
10 months ago |
|
Jonathan G Rennison
|
0f8d8ca485
|
TBTR: Fix layout of top panel in RTL languages
|
10 months ago |
|
Jonathan G Rennison
|
3b8d8aeb6a
|
TBTR: Adjust config buttons/text in main window
Clarify refit and depot options
Adjust layout
|
10 months ago |
|
Jonathan G Rennison
|
4c88256183
|
De-duplicate string IDs used for viewport town labels
|
11 months ago |
|
Jonathan G Rennison
|
5f385a5573
|
De-duplicate string IDs used for station rating tooltips
|
11 months ago |
|
Jonathan G Rennison
|
7744ccf3f3
|
Extra strings: Move "JUST" strings to a no-translate section
|
11 months ago |
|
Jonathan G Rennison
|
73b9028bcc
|
Merge PR #574 into jgrpp
|
11 months ago |
JakMel
|
83575b6a3e
|
Update: Czech translation, fixes to commit 8f887b7
|
11 months ago |
|
JakMel
|
8f887b7487
|
Update: Czech translation up to 0.54.4.
|
11 months ago |
|
Jonathan G Rennison
|
99b883298e
|
Add help text for the various viewport map settings
|
12 months ago |
|
Jonathan G Rennison
|
05be624294
|
Remove gui.viewport_map_scan_surroundings setting, now always enabled
|
12 months ago |
|
Jonathan G Rennison
|
326d0c329c
|
Remove some unnecessary colour strings
|
1 year ago |
|
Jonathan G Rennison
|
bac8f032da
|
Re-add company shares
|
1 year ago |
|
Jonathan G Rennison
|
6091d7470c
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/release-macos.yml
# src/company_gui.cpp
# src/linkgraph/linkgraph.cpp
# src/newgrf_debug_gui.cpp
# src/strgen/strgen_base.cpp
# src/timetable_gui.cpp
|
1 year ago |
|
Jonathan G Rennison
|
9a4512f789
|
Remove linkgraph duration not day length scaled setting
Now always enabled
|
1 year ago |
|
Jonathan G Rennison
|
84914129a5
|
Fix wrong string order for about menu dropdown texts
|
1 year ago |
|
Jonathan G Rennison
|
86aeb16f55
|
Fix wrong string ordering for town growth setting
|
1 year ago |
|
Jonathan G Rennison
|
2829a6fdf7
|
strgen: Split non-upstream translated strings into separate file
|
1 year ago |