Pavel Stupnikov
|
f39a00d676
|
Feature: Set exclusive access to industry from GS (#8115)
(cherry picked from commit 9a45a0f535)
|
2020-12-27 21:07:41 +00:00 |
|
Niels Martin Hansen
|
4d97fbc814
|
Feature: Influence industry production changes from GS (#7912)
(cherry picked from commit b7751c483e)
|
2020-12-27 21:07:41 +00:00 |
|
Pavel Stupnikov
|
ba4626d450
|
Add: new economy "frozen" that stops production changes and industry closures (#8282)
(cherry picked from commit c9fd85528a)
|
2020-12-27 20:32:34 +00:00 |
|
Jonathan G Rennison
|
c82f31bf03
|
Fix industry production scaling of periodic production callback
|
2020-12-24 19:11:10 +00:00 |
|
Jonathan G Rennison
|
8ac436f507
|
Add setting to scale primary industry cargo production
|
2020-12-21 20:47:44 +00:00 |
|
Jonathan G Rennison
|
2ad446369d
|
Cache animated tile speed, use btree map for animated tiles
|
2020-11-26 00:19:51 +00:00 |
|
Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
2020-10-01 23:18:39 +01:00 |
|
Jonathan G Rennison
|
886ffeeb82
|
Merge branch 'pr-8312' into jgrpp
|
2020-09-21 19:34:34 +01:00 |
|
frosch
|
e544f8b1f2
|
Fix #8311, b98c7763de: Industry probability at map generation was scaled differently when set via property or callback.
|
2020-09-20 22:30:47 +02:00 |
|
Jonathan G Rennison
|
3adeff1883
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
|
2020-06-30 21:43:04 +01:00 |
|
Michael Lutz
|
6d3c2edc59
|
Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy.
Smooth economy is only used when the corresponding setting is enabled and the industries does not use the production callback.
|
2020-06-28 15:33:37 +02:00 |
|
Jonathan G Rennison
|
d37d08ebb3
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_func.h
|
2020-05-14 00:40:16 +01:00 |
|
dP
|
f2a9a1e2a5
|
Fix #8137: New clients can't join (desync) after funding an industry
|
2020-05-13 08:43:01 +01:00 |
|
dP
|
7bd52970a1
|
Codechange: Refactor FindStationsAroundTiles to avoid code duplication
|
2020-05-13 08:43:01 +01:00 |
|
Jonathan G Rennison
|
7949de2c05
|
Add a minimum visible height and no ground tile parameter to DrawTileProc.
Filter out tile parts which are entirely outside the drawing area.
|
2020-03-05 23:06:01 +00:00 |
|
Jonathan G Rennison
|
dd99fd646d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
|
2020-01-20 18:36:55 +00:00 |
|
Jonathan G Rennison
|
c3223903ed
|
Codechange: Cache resolved town, station and industry name strings
|
2020-01-12 19:37:43 +00:00 |
|
Jonathan G Rennison
|
f1734e7815
|
Change: Only resort industry directory window on production change if necessary
|
2020-01-12 19:37:43 +00:00 |
|
Jonathan G Rennison
|
964739f235
|
Industry directory window: Only resort on production change if necessary
|
2020-01-06 18:22:21 +00:00 |
|
Jonathan G Rennison
|
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
|
2020-01-06 18:45:51 +00:00 |
|
Niels Martin Hansen
|
86107028a4
|
Fix: Allow old NewGRF industries to blank out in/out cargo slots (#7882)
|
2019-12-29 14:36:45 +01:00 |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
glx
|
00c2a98cf3
|
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
Jonathan G Rennison
|
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
|
2019-11-12 18:43:10 +00:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Jonathan G Rennison
|
ca3c72438e
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
|
2019-11-06 17:49:00 +00:00 |
|
Jonathan G Rennison
|
2be619ea88
|
Fix #7820: Heap use after free when removing oil rig
|
2019-11-03 00:39:38 +01:00 |
|
Jonathan G Rennison
|
fe4fa46da3
|
Fix heap use after free when removing oil rig
|
2019-11-02 20:55:14 +00:00 |
|
glx22
|
880680304d
|
Fix 53f8d0b81: signed/unsigned warnings (#7803)
|
2019-10-26 01:34:19 +02:00 |
|
Niels Martin Hansen
|
53f8d0b815
|
Codechange: Use std::vector for industry tile layouts
|
2019-10-19 17:16:25 +01:00 |
|
abmyii
|
ac21118736
|
Fix #7703: Prevent sounds being produced by inactive industries (#7752)
|
2019-10-12 10:16:16 +02:00 |
|
Jonathan G Rennison
|
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
|
2019-08-24 11:00:41 +01:00 |
|
Niels Martin Hansen
|
5feb06e3f3
|
Add: Scale oil refinery edge distance up by map size
Also scales oil rig distance up, since they use the same algorithm.
|
2019-08-17 22:02:22 +01:00 |
|
Jonathan G Rennison
|
7ed86e7488
|
Merge branch 'jgrpp' into jgrpp-nrt
|
2019-07-29 22:50:51 +01:00 |
|
Jonathan G Rennison
|
942dd35380
|
Add game events for industry create/destroy
|
2019-07-29 18:48:59 +01:00 |
|
Jonathan G Rennison
|
d3e0c3787f
|
Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
2019-07-13 20:34:52 +01:00 |
|
Jonathan G Rennison
|
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
|
2019-07-08 16:19:07 +01:00 |
|
peter1138
|
f538179878
|
Feature: Multi-tile docks and docking points.
|
2019-06-30 16:46:32 +02:00 |
|
Jonathan G Rennison
|
92c48d6897
|
Fix padded tile area being used for industries in FindStationsAroundTiles
|
2019-06-17 02:31:15 +01:00 |
|
Jonathan G Rennison
|
96f000226e
|
Exclude virtual trains from various vehicle list iterations
|
2019-05-27 17:56:41 +01:00 |
|
Jonathan G Rennison
|
b91ee6fb4b
|
Improve performance of name sorting in industry list window
|
2019-05-12 18:55:25 +01:00 |
|
Charles Pigott
|
5b34c8019f
|
Codechange: Remove Company/OwnerByte types
|
2019-04-29 17:40:22 +01:00 |
|
Jonathan G Rennison
|
0d93ecb6bf
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
|
2019-04-16 18:03:08 +01:00 |
|
PeterN
|
abe8cf4985
|
Codechange: Replace duplicated code with TileArea::Expand() (#7467)
|
2019-04-13 14:12:34 +01:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
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
|
2019-03-27 18:12:04 +00:00 |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
2019-03-26 20:15:57 +00:00 |
|
PeterN
|
a4073895ae
|
Fix #7411: Use industry production callback (if used) on initial industry cargo generation. (#7412)
|
2019-03-25 19:30:23 +00:00 |
|
Jonathan G Rennison
|
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
|
2019-03-13 03:38:26 +00:00 |
|