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
5 years ago
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
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
Jonathan G Rennison
92c48d6897
Fix padded tile area being used for industries in FindStationsAroundTiles
5 years ago
Jonathan G Rennison
96f000226e
Exclude virtual trains from various vehicle list iterations
5 years ago
Jonathan G Rennison
b91ee6fb4b
Improve performance of name sorting in industry list window
5 years ago
Charles Pigott
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
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
6 years ago
PeterN
abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() ( #7467 )
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
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
6 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
PeterN
a4073895ae
Fix #7411 : Use industry production callback (if used) on initial industry cargo generation. ( #7412 )
6 years ago
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
6 years ago
Peter Nelson
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
6 years ago
peter1138
94b40fd530
Codechange: Convert IndustryVector to a std::set.
6 years ago
peter1138
ed6084523d
Codechange: Convert StationList from SmallVector to std::set.
6 years ago
PeterN
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.
6 years ago
Jonathan G Rennison
08998d95ba
De-virtualise tile animation calls
6 years ago
Jonathan G Rennison
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
Niels Martin Hansen
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
Niels Martin Hansen
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
PeterN
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
Jonathan G Rennison
740e4543c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
7 years ago
frosch
6347e5f11e
(svn r27932) -Fix (r0) [FS#6639]: Forest, candyfloss forest and battery farm skipped the first animation frame.
7 years ago
frosch
3f819029f4
(svn r27932) -Fix (r0) [FS#6639]: Forest, candyfloss forest and battery farm skipped the first animation frame.
7 years ago
Jonathan G Rennison
a69a0b1557
Fix not being able to build water industries when removing water is disabled
7 years ago
Jonathan G Rennison
80d56307c7
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/vehicle_sl.cpp
# src/window.cpp
8 years ago
peter1138
7e915f8bc7
(svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries.
8 years ago
peter1138
27033a2231
(svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries.
8 years ago
HackaLittleBit
1ac8f66de1
Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
Jonathan G Rennison
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
Jonathan G Rennison
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
rubidium
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
rubidium
9daf7e749c
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
alberth
db47d62069
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
alberth
87dd209784
(svn r26729) -Feature: Warn about missing industries after generating a map.
10 years ago
rubidium
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
rubidium
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
planetmaker
5c3891fe3c
(svn r26457) -Codechange: Remove unused parameter from SetIndustryCompleted
11 years ago
planetmaker
2aa545a842
(svn r26457) -Codechange: Remove unused parameter from SetIndustryCompleted
11 years ago
frosch
6040da6654
(svn r26328) -Fix: Warnings and compilation failures.
11 years ago
frosch
03169121c2
(svn r26328) -Fix: Warnings and compilation failures.
11 years ago
rubidium
7b342616db
(svn r26312) -Codechange: iterate the nearby tiles instead of the industry list for a conflicting industry when the number of industries is really large (MJP)
11 years ago
rubidium
c7629735a3
(svn r26312) -Codechange: iterate the nearby tiles instead of the industry list for a conflicting industry when the number of industries is really large (MJP)
11 years ago
rubidium
732ae5b600
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
11 years ago
rubidium
30a95966ec
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
11 years ago
zuu
16a6a26919
(svn r25853) -Codechange: Simplify SetupFarmFieldFence by replacing the Axis and north parameter with a direction parameter and taking adventage of the new unified SetFence function (cirdan, LordAro)
11 years ago
zuu
e50478c053
(svn r25853) -Codechange: Simplify SetupFarmFieldFence by replacing the Axis and north parameter with a direction parameter and taking adventage of the new unified SetFence function (cirdan, LordAro)
11 years ago
zuu
27b153d16a
(svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro)
11 years ago
zuu
fb5dc7762b
(svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro)
11 years ago
zuu
3ca56bed7a
(svn r25850) -Codechange: Merge IsBadFarmFieldTile and IsValidFarmFieldTile into IsSuitableForFarmField (cirdan, LordAro)
11 years ago
zuu
e7c6786016
(svn r25850) -Codechange: Merge IsBadFarmFieldTile and IsValidFarmFieldTile into IsSuitableForFarmField (cirdan, LordAro)
11 years ago
zuu
e124838db5
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
zuu
dfb5663313
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
alberth
41ddef3018
(svn r25238) -Feature: Display imminent closure of an industry in its view window.
12 years ago
alberth
1b5b4db690
(svn r25238) -Feature: Display imminent closure of an industry in its view window.
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
frosch
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
zuu
577ba4bb67
(svn r24623) -Feature: Allow GameScripts to construct and prospect industries without having a sponsor
12 years ago
zuu
0826994821
(svn r24623) -Feature: Allow GameScripts to construct and prospect industries without having a sponsor
12 years ago
frosch
15bf9e9f03
(svn r24513) -Add: [Script] ScriptIndustryType::IsProcessingIndustry.
12 years ago
frosch
bcac3d16b6
(svn r24513) -Add: [Script] ScriptIndustryType::IsProcessingIndustry.
12 years ago
frosch
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
13 years ago
frosch
a8c88f43b6
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
13 years ago
frosch
c6af35c085
(svn r24283) -Codechange: Add AddTileNewsItem function to preemptively deduplicate code.
13 years ago
frosch
a0be398da9
(svn r24283) -Codechange: Add AddTileNewsItem function to preemptively deduplicate code.
13 years ago
frosch
3f036c6af2
(svn r24186) -Feature: [NewGRF] Callback to set industry production level on construction. (andythenorth)
13 years ago
frosch
16b310d8ce
(svn r24186) -Feature: [NewGRF] Callback to set industry production level on construction. (andythenorth)
13 years ago
frosch
059b4b985f
(svn r24185) -Codechange: Deduplicate some only partly deduplicated code.
13 years ago
frosch
789c95d4b8
(svn r24185) -Codechange: Deduplicate some only partly deduplicated code.
13 years ago
rubidium
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
13 years ago
rubidium
41e5c839e0
(svn r24179) -Codechange: move some variables of Town to TownCache
13 years ago
frosch
142725e8ab
(svn r24107) -Fix [FS#5143] (r3181): Glass-sprite of bubble-generator was not drawn anymore for completely constructed tiles.
13 years ago
frosch
c425368a17
(svn r24107) -Fix [FS#5143] (r3181): Glass-sprite of bubble-generator was not drawn anymore for completely constructed tiles.
13 years ago
frosch
afb3cbbbfc
(svn r24040) -Fix [FS#5095]: Improve error messages wrt. the placement restrictions of banks, water towers and toy shops.
13 years ago
frosch
a1f2ad880d
(svn r24040) -Fix [FS#5095]: Improve error messages wrt. the placement restrictions of banks, water towers and toy shops.
13 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
alberth
06597e684c
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
alberth
4af8c2d5e1
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
truebrain
bc78328918
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
truebrain
77b7366c29
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
rubidium
24263638bf
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
rubidium
3d88c74389
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
yexo
20f83ba002
(svn r23458) -Fix: don't assume all industries that cut trees have tile 0,0
...
-Fix: wait until all tiles of an industry are completed before starting to cut trees
13 years ago
yexo
2b1a380902
(svn r23458) -Fix: don't assume all industries that cut trees have tile 0,0
...
-Fix: wait until all tiles of an industry are completed before starting to cut trees
13 years ago
truebrain
af1b3cc070
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
truebrain
98103121d4
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
yexo
0566a6cfda
(svn r23168) -Feature [FS#1824]: always draw fences around field tiles
13 years ago
yexo
5c838ff1c3
(svn r23168) -Feature [FS#1824]: always draw fences around field tiles
13 years ago
frosch
a608cbab5d
(svn r23148) -Change: [NewGRF] Check the results of various callbacks for validness.
13 years ago
frosch
52774235eb
(svn r23148) -Change: [NewGRF] Check the results of various callbacks for validness.
13 years ago