Jonathan G Rennison
|
ffef1c9e44
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
|
2021-10-25 18:10:15 +01:00 |
|
Jonathan G Rennison
|
4042480806
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
|
2021-10-08 18:12:04 +01:00 |
|
Jonathan G Rennison
|
2e022d5194
|
Move game events to new event_logs header/cpp files
|
2021-10-04 20:43:50 +01:00 |
|
Jonathan G Rennison
|
0b0d154788
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
|
2021-09-22 21:50:02 +01:00 |
|
Patric Stout
|
28e90769f7
|
Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
|
2021-06-03 17:30:00 +02:00 |
|
glx22
|
5799402f7a
|
Codechange: Rename window related DeleteXXX to match new behaviour
|
2021-05-29 21:08:25 +02:00 |
|
rubidium42
|
2e136285e1
|
Codechange: move from C-string to std::string for DoCommand
|
2021-05-29 19:02:18 +02:00 |
|
William Davis
|
879de9781b
|
Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)
(cherry picked from commit 881e1da51d)
|
2021-05-14 18:15:00 +01:00 |
|
glx22
|
38c97e1492
|
Codechange: Replace TILE_AREA_LOOP with range-based for loops
|
2021-05-13 00:13:54 +02:00 |
|
William Davis
|
881e1da51d
|
Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)
|
2021-05-08 11:02:30 +01:00 |
|
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
|
2021-04-11 02:39:33 +01:00 |
|
Patric Stout
|
fece1c57ca
|
Codechange: Suppress warnings when asserts are disabled (#8917)
|
2021-04-01 11:16:19 +02:00 |
|
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
|
2021-02-21 11:54:24 +00:00 |
|
frosch
|
d9b4413bc9
|
Codechange: rename sound ids to make more sense. (#8701)
|
2021-02-20 19:01:04 +01:00 |
|
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
|
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
|
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 |
|
dP
|
bab7de6cf2
|
Feature: Allow GameScripts to add additional text to Industry view window
|
2021-01-22 09:50:53 +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 |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
2021-01-08 11:16:18 +01:00 |
|
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 |
|
glx22
|
d8605ad18d
|
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
|
2020-12-27 10:28:46 +00:00 |
|
Jonathan G Rennison
|
c82f31bf03
|
Fix industry production scaling of periodic production callback
|
2020-12-24 19:11:10 +00:00 |
|
Pavel Stupnikov
|
9a45a0f535
|
Feature: Set exclusive access to industry from GS (#8115)
|
2020-12-22 14:29:48 +01:00 |
|
Niels Martin Hansen
|
b7751c483e
|
Feature: Influence industry production changes from GS (#7912)
|
2020-12-22 14:21:31 +01:00 |
|
Jonathan G Rennison
|
8ac436f507
|
Add setting to scale primary industry cargo production
|
2020-12-21 20:47:44 +00:00 |
|
Pavel Stupnikov
|
c9fd85528a
|
Add: new economy "frozen" that stops production changes and industry closures (#8282)
|
2020-12-14 23:35:07 +01: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 |
|
frosch
|
df5362a008
|
Fix #8311, b98c7763de: Industry probability at map generation was scaled differently when set via property or callback.
|
2020-09-24 19:29:52 +02: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 |
|