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
3 years ago
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
3 years ago
33d9e48bcf
Add setting for inflation dates mode
3 years ago
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
3 years ago
09dc33022c
Add client setting for vehicle naming scheme
3 years ago
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
3 years ago
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
f9dee5aaa0
Feature: Show rainforest under vegetation on small map
3 years ago
e339188ded
Add: a go-to-location button to the LandInfo window.
3 years ago
1432dbac53
Add: another go-to-location button to the sign window.
3 years ago
5bfcd742b8
Change: Relocate rename and location buttons in all windows.
3 years ago
589feba0eb
Change: Relocate vehicle rename and location buttons.
3 years ago
3dbdb1c7e3
Change: remove warning in cheat window and reduce it to a note ( #8538 )
...
Although meant as a funny joke towards the player, our social
standards have changed since 2004, and such "jokes" are no
longer acceptable by the community as a whole.
The only value of the message is that people are informed the
information is stored in the savegame. This is mostly useful for
us, developers, as some of those cheats can have side-effects
which people report.
While at it, styled the GUI a bit better, as the way the text
was presented was odd.
3 years ago
af22a4f2cd
Add: show in the tooltip of disabled toolbar buttons why they are disabled
3 years ago
a6aec252b1
Fix #8153 : Report incompatible cargo/order when autoreplace fails ( #8169 )
3 years ago
9aa39d0af9
Fix #7972 : show invalid orders to stations that don't accept your vehicle ( #8516 )
...
Before it was shown as a normal order, but the vehicle was skipping
it. This was rather unclear to the user. Now it is red and contains
text with some hints what is going on.
The text is prefixed rather than post-fixed, as we have many
post-fixes already.
3 years ago
a3a7928372
Feature: option to auto remove signals when in the way during rail construction ( #8274 )
3 years ago
62cdadb582
Change: move "give money" from client-list to company window
...
This is a much better location for this button, as you send
money from one company to another company, not from player
to player.
This is based on work done by JGRPP in:
f820543391https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311
We did modify it to fix several bugs and clean up the code while
here anyway.
The callback was removed, as it meant a modified client could
prevent anyone from seeing money was transfered. The message
is now generated in the command itself, making that impossible.
3 years ago
94057e9b18
Change: Add some style to GameScript question windows depending on the type
3 years ago
cc5ccc3b45
Fix: a cargos sneaked in; should be cargoes for consistency ( #8383 )
...
(cherry picked from commit e07afaeffb
3 years ago
3088d41ac8
Feature: new velocity unit "tiles/day" ( #8278 )
...
(cherry picked from commit b1cf79da5b
3 years ago
ba4626d450
Add: new economy "frozen" that stops production changes and industry closures ( #8282 )
...
(cherry picked from commit c9fd85528a
3 years ago
488187a423
Fix: next 67 savegame versions are used in PatchPacks; skip them ( #8411 )
...
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.
Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.
(cherry picked from commit d8c8f4e72d
3 years ago
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
3 years ago
2d9fa81bd0
Feature: Plant clumps of trees in editor by dragging on the landscape
3 years ago
ba49fa3b82
Codechange: Rename strings to match their usage.
3 years ago
2bb691f50e
Change: Remove the LAN/Internet combobox from the server list in favour of adding two separate search buttons.
3 years ago
22b9dec960
Feature: Add an option to disable tree growth completely ( #8415 )
3 years ago
3ea0ffa46b
Debug: Add auto-refresh functionality to the debug window
3 years ago
0c5dc5d41e
Change: [Linkgraph] Pause the game when linkgraph jobs lag ( #6470 )
...
Check if the job is still running two date fract ticks before it is due
to join, and if so pause the game until its done.
When loading a game, check if the game would block immediately due to
a job which is scheduled to be joined within two date fract ticks,
and if so pause the game until its done.
This avoids the main thread being blocked on a thread join, which appears
to the user as if the game is unresponsive, as the UI does not repaint
and cannot be interacted with.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
3 years ago
d8c8f4e72d
Fix: next 67 savegame versions are used in PatchPacks; skip them ( #8411 )
...
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.
Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.
3 years ago
e59c400ca6
Feature: Option to group vehicle lists by shared orders
...
This applies to all kinds of vehicle lists, as well as the "vehicle groups" window.
3 years ago
d05be2cff5
Cleanup: Rework the CargoSpec macro for improved readability.
3 years ago
8ac436f507
Add setting to scale primary industry cargo production
3 years ago
e07afaeffb
Fix: a cargos sneaked in; should be cargoes for consistency ( #8383 )
4 years ago
f7b8e7e46c
Fix: prefix the Nth vehicle with "#" when ungrouped
...
This is for consistency; most other objects add a # to indicate
it is the Nth of that object, except for Trains / RVs / Ships /
Aircrafts.
This becomes painfully apparent with unnamed vehicles in groups,
which do get a "#".
4 years ago
ca65f19b03
Feature: Show group name as part of the default vehicle name.
...
Only if the vehicle is member of a group and does not have a user defined name.
4 years ago
b1cf79da5b
Feature: new velocity unit "tiles/day" ( #8278 )
4 years ago
c9fd85528a
Add: new economy "frozen" that stops production changes and industry closures ( #8282 )
4 years ago
535e18b54e
Change: Don't display OS name when the user is exiting the game
4 years ago
270a748b64
Tracerestrict: Add time/date conditional
4 years ago
cde5e8c79d
Add setting to disable continuously updating NewGRF vehicle image
4 years ago
d50f3cd580
Show plans in GUI using plan colour, use prefix for private plans
4 years ago
0902243ab3
Allow changing the colour of plans
4 years ago
b20df78b49
Add feature to append the reverse of an order list
4 years ago
9984f39c96
Add feature to reverse the order of an order list
...
See: #120
4 years ago
38a153017f
One-way road zoning mode
4 years ago
63d3f33fd2
Add display setting for income/cost text effects
4 years ago
cc54886ad1
Fix grammar of random road reconstruction setting help text
4 years ago
6c9988f28b
Debug: Add road/tram type support to NewGRF debug window
4 years ago
781fd14205
Add sort by vehicle count to vehicle purchase window
4 years ago
ca726d79f5
Add company setting for whether to add vehicle to group on copy-clone
4 years ago
84dd35b685
Add drive-through train depot emulation (default off)
4 years ago
2ea3a7d6f4
Add setting for default road/tram types, to match default rail type setting
4 years ago
4c609ba93c
Fix #189 : Typo in STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE_HELPTEXT
4 years ago
f44d75eaf5
Allow building objects by area (1x1 objects only)
...
Add setting (default on)
4 years ago
2d350d26db
Add rate limit for object construction
4 years ago
c908a3afa8
Fix spelling error in tree growth speed setting: extremely slow
4 years ago
abb7b69861
Add slot and counter support to programmable pre-signals
4 years ago
e729875cfb
Make programmable pre-signal GUI less garish
4 years ago
9ee8091ecc
Add conditional order which tests counter value
4 years ago
817bc44a3e
Initial implementation of tracerestrict counter mechanism
4 years ago
d2594ece79
Add routing restrictions action to control news reports about stuck trains
4 years ago
cc6be16422
Add news setting for trains waiting due to routing restrictions
4 years ago
beaeda2990
TBTR: Show empty and full train weights in GUI, and weight ratios if enabled
4 years ago
5b78090a61
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
4 years ago
2b9c633d50
Add leave early if any/all cargoes fully loaded timetable modes
4 years ago
f26143f063
Add setting for alternative linkgraph overlay colour schemes
4 years ago
1fd9c929ef
Increase church/stadium count field size, fix save/load
...
Fix too many error message
4 years ago
ce6cdc551f
Add anywhere mode to ignore house zone scenario editor setting
...
See: #177
4 years ago
157beb05ed
Add settings to ignore date/zone/GRF when placing houses in scenario editor
...
See: #177
4 years ago
b7118b60fe
Add setting to enable multiple churches/stadiums in scenario editor
...
See: #177
4 years ago
3dfbeb07f6
Settings: Add scenario editor section
4 years ago
a10013dd00
Codechange: Spell 'Viewport' consistently
...
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
4 years ago
05dc785f13
Split STR_ORDER_CONDITIONAL_CARGO string into two, adjust format
...
See: #172
4 years ago
7467051331
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
4 years ago
087cae82fc
Add: zero tree growth setting
4 years ago
c39d62c245
Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD
4 years ago
6288abae56
Saveload: Improve error messages for loading unsupported versions
4 years ago
d5ada6a14b
Add setting to control RV re-routing on road layout change
...
Default to road removal only
This is due to poor performance with many RVs when town growth is
continually adding to the road layout
4 years ago
38d42795c8
Add setting to disable vehicle expiry after a given year
4 years ago
f5e9805b10
Store time display settings both in savegame and client, add setting
4 years ago
271fac01a7
Add setting to scale station cargo capacity and rating tolerance by size
4 years ago
77673b731c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
# src/openttd.cpp
# src/station_cmd.cpp
# src/station_func.h
4 years ago
48d2eb703c
Add: INR currency ( #8136 )
...
Co-authored-by: ilayarja97 <ilayarja97@gmail.com>
4 years ago
0202211514
Conditional orders: Add slot acquire modes to train in slot conditional
4 years ago
0100ea4e32
Conditional orders: Add mode to check waiting station cargo via next node
4 years ago
07c9621fcf
Merge branch 'master' into jgrpp
4 years ago
e0d20a44d2
Codechange: Use a dynamic copyright year
4 years ago
ad72fad68e
Fix #148 : Rename STR_MONEY_CHEAT_MULTIPLAYER* strings
4 years ago
1506479f56
Cheat: Add cheats to set inflation income and cost factors
...
See: #124
4 years ago
ab99c16601
Add support for money cheat in multiplayer
...
Add a setting for whether this is permitted by multiplayer clients
4 years ago
bca0187aaf
Schedule dispatch: Warn about and ignore departure slots outside the duration
4 years ago
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
4 years ago
5880f1479f
Feature #7756 : Allow server to supply a reason to kicked/banned clients
...
This commit adds the missing feature of allowing the server owner to
provide a reason for kicking/banning a client, which the client sees in
a pop-up window after being kicked. The implementation extends the
network protocol by adding a new network action called
NETWORK_ACTION_KICKED that is capable of having an error string, unlike
the other network error packages. Additionally, the kick function
broadcasts a message to all clients about the kicked client and the
reason for the kick.
4 years ago
81a1094cc8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/date.cpp
# src/economy.cpp
# src/misc.cpp
# src/newgrf_house.cpp
4 years ago
ab1b8ab209
Scheduled dispatch: Add schedule end time to info line
4 years ago
9917a1daef
Scheduled dispatch: Add hints about dispatch order to timetable window
...
Adjust condition for dispatch order
4 years ago
09b13dd484
Add conditional orders for cargo load percentage and waiting cargo amount
...
See: #90
4 years ago
ee6d808578
TBTR: Template replacements now also apply to child groups
4 years ago
278ddc1f58
Fix missing string code from vehicle list mass action button setting text
4 years ago
4adfe0c9ae
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
4 years ago
7413d65c2a
Cleanup: Unused music GUI strings
4 years ago
eb07e174f1
Fix #7908 , b524f1a: "Show the NewGRF name in the build vehicle window" is missing the "On/Off" display.
4 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
4 years ago
70f9c3c655
Feature: Industry directory cargo filtering
4 years ago
b524f1ae21
Feature: Show the name of the NewGRF in the build vehicle window.
4 years ago
e04ca904a9
Feature: Minimap screenshot
4 years ago
e558aa8ff4
Feature: Screenshot window
4 years ago
2fd871e2af
Feature: Configurable game ending year
...
Functionally reverts 683b65ee1
4 years ago
798e9ee93e
Feature: Add a button to the vehicle advisory news window to open the group window.
5 years ago
fd25596311
Merge upstream PR #7852 into jgrpp
...
Feature: Show the name of the NewGRF in the build vehicle window
Author: stormcone
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
5 years ago
aa8aae9a62
Initial implementation of tracerestrict speed restriction feature
5 years ago
030e8bf762
Rename programmable signals to programmable pre-signals
...
This is to make it less unclear what they actually are and do
5 years ago
4def6cf70f
Feature: Show the name of the NewGRF in the build vehicle window.
5 years ago
2b0c1a5930
Separate allow stations under bridges into settings for: rail, road, docks
5 years ago
ab3a373c73
Merge branch 'master' into jgrpp
5 years ago
fa657c8360
Fix #7631 : 16 out cargo support for industry directory
5 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
ca3c72438e
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
5 years ago
7c9dedb94f
Feature: Configure minimum share trading years
5 years ago
7332c0b673
Tracerestrict: Add load percentage conditional
5 years ago
a30638bc4a
Merge branch 'jgrpp' into jgrpp-nrt
5 years ago
b3431512ee
Add modifier key window for toggling shift/ctrl key states using mouse
5 years ago
6562937899
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
5 years ago
5feb06e3f3
Add: Scale oil refinery edge distance up by map size
...
Also scales oil rig distance up, since they use the same algorithm.
5 years ago
b870596f15
Add #6887 : Option to show zone inside local authority boundary of towns
...
Can be found at town information > local authority window
Layout for button is same as Graph Keys
Turn on/off for every town individually
5 years ago
7a70900227
Fix: Typo in running costs help text
5 years ago
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
5 years ago
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
91c5dee66c
Re-add removed group collapse/expand all buttons
5 years ago
5b09323a58
Add: Currency: NTD, CNY, HKD
5 years ago
8042150a35
Add error messages for vehicle build failure due to wrong depot owner and rail type
5 years ago
af64b5dc18
Add news/advice setting to warn if no depot order in vehicle schedule
5 years ago
e7f6f07599
Add: Show memory allocations by GS and AI in framerate window
5 years ago
140a96b3a0
Change: Limit memory allocations for each Squirrel instance
...
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
5 years ago
a1de834104
Cleanup: Remove unused string.
5 years ago
1ee33c46ef
Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game
5 years ago
e7a916d2ce
Linkgraph: Add asymmetric: equal and nearest demand distribution modes
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
6d3e9093c4
TBTR: Show warning on templates which include unavailable vehicles
5 years ago
a6ea1ea408
Allow articulated road vehicles to overtake other vehicles
...
Add setting
5 years ago
b6733edd17
Feature: Add coverage area display for existing stations.
5 years ago
08284e005d
Fix: Automatic line breaking of the warning
5 years ago
dcb2571888
Add: Warn players that company passwords are not truly secure
5 years ago
1c7b454a57
Merge branch 'pr-7490' into jgrpp
...
# Conflicts:
# src/dock_gui.cpp
# src/water_cmd.cpp
5 years ago
72b72dbec3
Add: Press ctrl to build diagonal rivers in scenario editor.
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
8890436af1
Add #6189 : Groups now count the total number of vehicles in subgroups (3298)
5 years ago
a393c94695
Change #5977 : Use specific error message when attempting to create a circular group hierarchy (3298)
5 years ago
e6bb90543e
Change: Show additional cost and refitted capacity in build vehicle window.
5 years ago
d54b6ac09b
Feature: When filtering purchase list by cargo type, make buy button perform a refit if required.
5 years ago
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
5 years ago
72c5f2b3ee
Remove: DOS support
...
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.
Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.
Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.
By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.
Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
5 years ago
592f591a4b
Cleanup: Unused lang strings
5 years ago
fc5f67123a
Fix e66cec8f86: Permit loading of industry production callback with invalid cargo type.
...
It is only an error if the invalid result is actually used. This will be silently ignored at the moment.
It is still an error if a duplicate cargo type is returned.
5 years ago
80dc7d89ef
Follow gui.population_in_label setting when showing rating in town label
5 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
dd20ccee88
Feature: Industries with neutral stations (e.g. Oil Rig) only supply/accept cargo to/from their neutral station. ( #7234 )
...
This change is a controlled by a game setting, located under Environment ->
Industries which allows toggling the behaviour. It defaults to enabled.
"Company stations can serve industries with attached neutral stations"
When enabled, industries with attached neutral station (such as Oil Rigs) may
also be served by company-owned stations built nearby. This is the traditional
behaviour.
When disabled, these industries may only be served by their neutral station.
Any nearby company-owned stations won't be able to serve them, nor will the
neutral station serve anything else other than the industry.
5 years ago
f58db44ff2
Remove: BeOS support (deprecated by Haiku)
...
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
5 years ago
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
5 years ago
52572cafa6
Add: Option for population-linear town cargo generation
...
Introduce a new default algorithm for town cargo generation (passengers and mail), and a game setting to choose between the new and original algorithm.
The original town cargo generation algorithm has the property of the generated amount relating to the square of each building's population, meaning large towns easily produce more cargo than can realistically be transported. The problem is excessive cargo is amplified if playing with cargodist.
The new algorithm introduced instead has a linear relation to the population. The result is that smaller towns will produce slightly more cargo, while the largest towns will produce about a fourth of what they would with the original algorithm.
Existing savegames will use the original algorithm, while new games will default to the new algorithm.
5 years ago
60c2f0ebc8
Remove now unused town_bridge_over_rail setting, feature in trunk
5 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
5 years ago
3c94bddbc2
Change: make crash chance at short runway independent of plane crash rate setting (there's a cheat for this)
5 years ago
3f327116db
Change: Don't apply forbid 90 deg turn settings to ships.
5 years ago
705fc18b08
Add company setting to advance order when cloning/copying/sharing
...
Advance order if current depot is in order list
5 years ago
7b8db50fd5
Add UI setting for whether to open new vehicle GUI when share-cloning
5 years ago
7e1e2756d4
Add: Show performance of AI and GS in framerate window
5 years ago
00d28a500d
Feature: Add option to adjust font size separately from GUI size. ( #7003 )
...
Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.
5 years ago
36ac643749
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
5 years ago
4c8b358ffe
Add game setting to allow only non-stop orders for ground vehicles
5 years ago
548ec05a48
Add: News menu entry and shortcut for deleting all messages. ( #7240 )
5 years ago
1585eb1a3e
Fix: use more descriptive "spectator" strings for story book and goal dropdown menus
5 years ago
7c31a32c2b
Fix: colour of network specific strings in company dropdown menus
5 years ago
3a77f75bf6
Add GUI setting to control savegame overwrite confirmation dialog
...
Adjust game ID indications in save window UI
5 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
fa53abe864
Doc: Yearly increment.
5 years ago
0bca363401
Add: Warn before overwriting an existing save file
5 years ago
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
6e5b90f4f7
Change: For consistency, add company name to colour scheme window.
5 years ago
a18b0eba5b
Add: more options for translators
5 years ago
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
5 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
5 years ago
f37304f9f5
Cleanup: Remove unused strings
5 years ago
08ffa16d51
Fix 8859381: Display of requires/produces in Build Industry window
...
Change the window to use a dynamically generated string of cargoes,
instead of one of a few fixed-length lists. With up to 16 cargoes
on each list, having 16 with the only difference how many are listed
seems like a bad maintenance idea.
5 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
f4b8a67aed
Fix #6408 : Improve wording of the dragging signal distance tooltips (juanjo) ( #7055 )
5 years ago
0f9d1019e6
Add: Mexican Peso currency
...
OpenTTD doesn't have any pesos, so I've added Mexican pesos,
at its current exchange rate: 1GBP = 24.39MXN, rounded to 24.
5 years ago
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
5 years ago
0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
5 years ago
635c7ca2d5
Merge branch 'save_ext' into more_cond_orders-sx
...
# Conflicts:
# src/lang/english.txt
# src/order_type.h
5 years ago
15a7f9da9d
Fix 13056ae: PR #7017 added new enum value in bad position, move it
5 years ago
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
5 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
5b0cca4b57
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
7f87e3d61c
Add an action 5 type ID remapping mechanism
6 years ago
b1190b32b0
Merge branch 'master' into jgrpp
6 years ago
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
5d8b9de482
Add: Message popup when trying to overwrite a different savegame
6 years ago
1b3ce25c07
Add: Warning in save description when showing a save whith a different id
6 years ago
868c6f924a
Add: Filter box to the save and load windows ( #6974 )
...
Save and heightmap names can be filtered.
6 years ago
9e30fbab34
Fix #6864 : Normalise colour use in Frame rate window
6 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
8b37e5aac2
Implement custom bridge pillar flag support
...
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars
Set values for default bridges and stations
6 years ago
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
83a063f51c
Add train is in slot conditional order
6 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
92a5e59165
Zoning: Add modes to show 2x2 and 3x3 town road grids
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
eed0da60a2
Fix #6622 : Fixes empty company name in news when gamescript constructs a town
6 years ago
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
3e50336079
Add trace restrict train status conditional
6 years ago
6228a336d4
Show the most relevant information in the vehicle list window, based on what the list is sorted on.
...
(cherry picked from commit da2d0e14fecec35dbf805395200b12998c8cc52a)
Minor changes
6 years ago
d8b9e2953e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
98da7019d6
Plans: Make it possible to give plans a name.
...
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
6 years ago
5732e4f7ff
Show reversing and timetable waiting in vehicle status bar
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
9038ac5c00
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
6 years ago
16cf577b61
Feature: Added New Russian Ruble as currency ( #6678 )
6 years ago
ef0a0b0f8e
Implement rail station property 1B, bridge clearance information
6 years ago
b9d7f8e0a7
Disallow building bridges over airports
6 years ago
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
4bdbf3863d
Add setting to allow placing stations under bridges
6 years ago
56bde8ce18
Add setting to allow placing all NewGRF objects under bridges
6 years ago
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
dc8fff2c4d
Add: Hover tool-tips to cargo dest flow legend window.
...
This is to improve the usability of the window.
The two-letter abbreviations are not always clear, in particular
when using a large number of cargoes.
The company colours can be ambiguous when there are a large
number of companies.
6 years ago
7fed8fe004
Fix #6553 : Make viewport button text unambiguous.
6 years ago
11ba094582
Feature #4186 : Append '(City)' behind cities in the town directory (sbr)
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
1b4db7d86c
Trace restrict: Add wait at entrance PBS for reservation ending here
6 years ago
e82ccad052
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
6 years ago
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
408cee123d
Fix: One-way roads could be over-built by road stops (regardless of road owner.)
6 years ago
921101ed06
Feature: Baseset music for TTD DOS and TTO data
6 years ago
d2d8a86814
Add setting: station rating waiting time tolerance depends on cargo class
6 years ago
eaa32f5ad5
Change: Use name of cargo instead of Passengers/Mail in town statistics. ( #6801 )
...
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
6 years ago
f2072319cb
Add autosave_on_network_disconnect setting to GUI
6 years ago
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
98ade153d2
Fix colour definition for conditional order invalid slot string
6 years ago
683b46a5b5
Cleanup: Remove unused strings from language files
6 years ago
19f5a6cbb0
Feature #6090 : Change music set during gameplay
6 years ago
bb809e35ce
Change: Less intrusive "no music" message from Music window
6 years ago
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
78588d8ce5
First implementation of conditional order checking slot occupancy
...
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
6 years ago
8e903b0a85
Merge branch 'departure-boards' into jgrpp
6 years ago
d2ca8914ac
Departure Boards: Allow Ctrl-Click on vehicle type buttons to show type exclusively
...
(cherry picked from commit a834d3cd452fe28e2c32fb953d41c0bd0ce20494)
See: #36
6 years ago
6ec78ff4b0
Add UI setting to disable mass action buttons for top-level vehicle lists
6 years ago
53dd010f3b
Add way to mass cancel vehicle go to depot/service
6 years ago
2821599f6b
Better handle out of track and depot through load cases
...
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
6 years ago
7aab49e282
Add setting to enable through loading in UI
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
91464af737
(svn r27980) -Doc: Yearly increment
6 years ago
b1592787eb
(svn r27980) -Doc: Yearly increment
6 years ago
ed04845514
Merge branch 'ship_collision_avoidance' into jgrpp
6 years ago
64c8985cd7
Remove 90 degree comment
6 years ago
4a0d949d83
Merge branch 'master' into jgrpp
6 years ago
dda20d08c1
Merge branch 'improved_breakdowns' into jgrpp
...
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
7 years ago
0a80aec634
Implement critical breakdown speed reduction for road vehicles
7 years ago
0d1cc32b19
(svn r27952) -Change: Reword texts in industry view, when stockpiling is used.
7 years ago
150ef3999c
(svn r27952) -Change: Reword texts in industry view, when stockpiling is used.
7 years ago
c4897f92df
Timetable GUI: Add warnings for conditional order timetabling.
7 years ago
1defb8aafd
Add "Freight" type to vehicle list cargo type filter
7 years ago
097cf9b0b1
Add UI setting to control whether cargo filter drop down is shown
7 years ago
51e018c9a4
Merge branch 'departure-boards' into jgrpp
7 years ago
07ca7cfb8c
Add show passenger and show freight buttons to departure window
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
414d5b2c8a
Add warning/info messages to timetable GUI
7 years ago
aa138baec9
Add UI setting for whether programmable signals shown in UI (default off)
...
Add setting subcategory for advanced signal features
7 years ago
5199e19213
Move timetable interface settings to GUI subcategory
7 years ago
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
c3a9eca1a9
Add town growth setting, rate depends on proportion of transported cargo
7 years ago
36a712a579
Add very and extremely slow options to town growth rate setting
7 years ago
a3f30a30df
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
2eae80bbfe
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
2e7e712f06
Ctrl+click on shared list button in order/timetable window to add veh to group
7 years ago
ac016eae5e
Add client setting to enable shared order group window for single vehicles
7 years ago
9ed0541e77
Import town bridges over rails patch
...
Add setting (default off)
From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
7 years ago
4db69283c1
Add setting to disable removing sea/rivers
7 years ago
4e963be69b
Merge branch 'scheduled-dispatch-sx' into jgrpp
7 years ago
4e96150f88
Scheduled Dispatch: Fix wrong tooltip on delay button
7 years ago
64d9cdd6f0
Merge branch 'tracerestrict-sx' into jgrpp
7 years ago
b004c1998f
Merge branch 'tracerestrict' into tracerestrict-sx
7 years ago
7986367c1f
Tracerestrict: Add program append management action.
7 years ago
965938c0f5
Merge branch 'scheduled-dispatch-sx' into jgrpp
7 years ago
bbd2e6f2f5
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
7 years ago
350c2bb24f
Make trains break down after collision with road vehicle.
7 years ago
bcbe74f339
Adjust formatting of schedule dispatch summary.
...
Use different string if departure hasn't left yet.
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
e15b3bb032
Fix typo in text string for maximum schedule slot delay.
7 years ago
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
5a2fe49457
Add setting for transfer payment mode from source, minus transfers.
...
This is to reduce large negative payments for the final leg.
7 years ago
bfb8f6f32e
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
7 years ago
c44141bad6
Add conditional to test slot occupancy state.
...
Bump tracerestrict version.
7 years ago
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
4d21d6f81c
Merge branch 'chunnel' into jgrpp
7 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
3084cac654
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
f3ed6765a5
Add Ctrl+Click to scroll to plan.
7 years ago
a3d21411e7
Add a 'Show All' button to plans GUI.
7 years ago
eddd635f00
Chunnel: Make error reporting consistent with tunnel length reporting at cursor.
...
Error reporting should be in tune with occurrence of events.
7 years ago
0772236986
Add a release slot at front of train slot action.
...
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
7 years ago
7dbf99fa33
Add UI setting to hide adv tracerestrict features from GUI
...
Hide wait at PBS and slot features.
7 years ago
927323dcb1
Add trace restrict slot membership conditional.
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
7194e19380
Merge branch 'save_ext' into tracerestrict-sx
7 years ago
5a2d482c28
Tracerestrict: Add wait at PBS signal action.
7 years ago
2549def764
Chunnel: Use separate container function for chunnel related conditions.
7 years ago
0e68f9db70
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
d934ef9b00
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
0887289e3d
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
7 years ago
19d56a33e8
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
7 years ago
f9f2d37a8e
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/saveload/saveload.cpp
7 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
1f70279419
(svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu)
7 years ago
da608f6214
(svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu)
7 years ago
b110c9c259
(svn r27800) -Change: Rename long aircraft string names of the preview window
7 years ago
dda71fab19
(svn r27800) -Change: Rename long aircraft string names of the preview window
7 years ago
fa5fd39c23
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
7 years ago
319de74d99
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
7 years ago
e2e9bd0b25
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
7 years ago
ad88588481
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
de24fed9d1
Chunnel: Tunnels are only allowed to cross sea.
7 years ago
bc61ff380a
(svn r27777) -Doc: Yearly increment
7 years ago
15032bd765
(svn r27777) -Doc: Yearly increment
7 years ago
212f6ce6ef
Chunnel: Add setting to enable construction, default off.
7 years ago
02b33e7f64
Chunnel: Add error text for too many tunnels.
7 years ago
13a716980a
Chunnel: String text adjustments.
7 years ago
Jonathan G Rennison
SamuXarick
frosch
Patric Stout
Chris Stevens
Kuhnovic
dP
jostephd
Niels Martin Hansen
Bernard Teo
Xaroth Brook
stormcone
Owen Rudge
TechGeekNZ
Yourself
TrevorShelton
Ilayaraja
glx
Bjarni Thor
TELK
pnda
S. D. Cloudt
Jack Baron
Gabda
nikolas
iigmir
peter1138
Charles Pigott
PeterN
Johannes E. Krause
Greg Carlin
Joan Josep
Alberth289346
Eddi-z
damfr
Oskari Leppäaho
Max Maton
keldorkatarn
ScumbagDog
HackaLittleBit
alberth
innocenat