Jonathan G Rennison
|
edfa04286b
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.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/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
|
3 years ago |
Patric Stout
|
fece1c57ca
|
Codechange: Suppress warnings when asserts are disabled (#8917)
|
3 years ago |
|
Jonathan G Rennison
|
dfecdf3afb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/dock_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/terraform_gui.cpp
# src/vehicle.cpp
# src/video/allegro_v.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/dedicated_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
3 years ago |
frosch
|
d9b4413bc9
|
Codechange: rename sound ids to make more sense. (#8701)
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
dP
|
bab7de6cf2
|
Feature: Allow GameScripts to add additional text to Industry view window
|
3 years ago |
|
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.
|
3 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
|
Pavel Stupnikov
|
f39a00d676
|
Feature: Set exclusive access to industry from GS (#8115)
(cherry picked from commit 9a45a0f535)
|
4 years ago |
Niels Martin Hansen
|
4d97fbc814
|
Feature: Influence industry production changes from GS (#7912)
(cherry picked from commit b7751c483e)
|
4 years ago |
|
Pavel Stupnikov
|
ba4626d450
|
Add: new economy "frozen" that stops production changes and industry closures (#8282)
(cherry picked from commit c9fd85528a)
|
4 years ago |
glx22
|
d8605ad18d
|
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
|
4 years ago |
|
Jonathan G Rennison
|
c82f31bf03
|
Fix industry production scaling of periodic production callback
|
4 years ago |
|
Pavel Stupnikov
|
9a45a0f535
|
Feature: Set exclusive access to industry from GS (#8115)
|
4 years ago |
|
Niels Martin Hansen
|
b7751c483e
|
Feature: Influence industry production changes from GS (#7912)
|
4 years ago |
|
Jonathan G Rennison
|
8ac436f507
|
Add setting to scale primary industry cargo production
|
4 years ago |
|
Pavel Stupnikov
|
c9fd85528a
|
Add: new economy "frozen" that stops production changes and industry closures (#8282)
|
4 years ago |
|
Jonathan G Rennison
|
2ad446369d
|
Cache animated tile speed, use btree map for animated tiles
|
4 years ago |
|
Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
4 years ago |
|
frosch
|
df5362a008
|
Fix #8311, b98c7763de4: Industry probability at map generation was scaled differently when set via property or callback.
|
4 years ago |
|
Jonathan G Rennison
|
886ffeeb82
|
Merge branch 'pr-8312' into jgrpp
|
4 years ago |
|
frosch
|
e544f8b1f2
|
Fix #8311, b98c7763de4: Industry probability at map generation was scaled differently when set via property or callback.
|
4 years ago |
|
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
|
4 years ago |
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.
|
4 years ago |
|
Jonathan G Rennison
|
d37d08ebb3
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_func.h
|
4 years ago |
|
dP
|
f2a9a1e2a5
|
Fix #8137: New clients can't join (desync) after funding an industry
|
4 years ago |
|
dP
|
7bd52970a1
|
Codechange: Refactor FindStationsAroundTiles to avoid code duplication
|
4 years ago |
|
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.
|
4 years ago |
|
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
|
4 years ago |
|
Jonathan G Rennison
|
c3223903ed
|
Codechange: Cache resolved town, station and industry name strings
|
5 years ago |
|
Jonathan G Rennison
|
f1734e7815
|
Change: Only resort industry directory window on production change if necessary
|
5 years ago |
|
Jonathan G Rennison
|
964739f235
|
Industry directory window: Only resort on production change if necessary
|
5 years ago |
|
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
|
5 years ago |
|
Niels Martin Hansen
|
86107028a4
|
Fix: Allow old NewGRF industries to blank out in/out cargo slots (#7882)
|
5 years ago |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 years ago |
|
glx
|
00c2a98cf3
|
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
|
5 years ago |
|
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
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
ca3c72438e
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
2be619ea88
|
Fix #7820: Heap use after free when removing oil rig
|
5 years ago |
|
Jonathan G Rennison
|
fe4fa46da3
|
Fix heap use after free when removing oil rig
|
5 years ago |
glx22
|
880680304d
|
Fix 53f8d0b81: signed/unsigned warnings (#7803)
|
5 years ago |
|
Niels Martin Hansen
|
53f8d0b815
|
Codechange: Use std::vector for industry tile layouts
|
5 years ago |
abmyii
|
ac21118736
|
Fix #7703: Prevent sounds being produced by inactive industries (#7752)
|
5 years ago |
|
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
|
5 years ago |
|
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.
|
5 years ago |
|
Jonathan G Rennison
|
7ed86e7488
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
Jonathan G Rennison
|
942dd35380
|
Add game events for industry create/destroy
|
5 years ago |