dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,180 Commits 1 Branch 0 Tags
d1b98855de1f96149b36a013595aa53aff78c573
Commit Graph

1756 Commits

Author SHA1 Message Date
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
 2019-01-02 16:09:44 +00:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01:00
Jonathan G Rennison
e3207a77fb Add setting to control if and how land purchasing is permitted 2018-11-26 18:25:17 +00:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
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
 2018-11-17 19:49:05 +00:00
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
 2018-11-05 12:53:36 +00:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
8859381d30 Add: Industries can produce and accept up to 16 different cargoes 2018-11-03 21:43:54 +01:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
 2018-10-29 18:33:15 +00:00
Samu
eff09c43cd Fix #4109: Add more water checks to the Oil Rig layout 
Prevents Oil Rig docking tile from becoming unreachable by ships when spawning next to each other.
 2018-10-25 20:09:42 +02:00
Jonathan G Rennison
ce4e2ca3c3 Add setting to enable flipping direction of all train types in depot 2018-09-11 06:08:02 +01:00
Jonathan G Rennison
fb3cb9c3d2 Enable NewGRF debug window for non-GRF vehicles 2018-08-15 03:14:53 +01:00
cirdan
f41a125d8e Raise the maximum number of bridge types to 16 
Raise the maximum number of possible bridge types to 16. The new
bridge types have default properties that make them unavailable at
any year and bridge length, so they cannot be used unless a NewGRF
overrides them.

(cherry picked from commit da399d7bf278ba32fb9f14af65cfcefe5d276e71)
 2018-08-07 22:42:36 +01:00
Jonathan G Rennison
76a7b70cad Implement NewGRF Station var 0x42 (rail type) for unbuilt stations 2018-08-01 01:37:23 +01:00
Jonathan G Rennison
a84fbcb219 Change bridges over stations/objects settings from expert to advanced 2018-07-30 01:56:52 +01:00
Jonathan G Rennison
4bdbf3863d Add setting to allow placing stations under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
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
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
 2018-07-02 18:41:39 +01:00
Charles Pigott
2aacddd412 Codechange: lengthof is not defined for runtime-length strings, use sizeof instead 2018-06-27 22:54:46 +02:00
Niels Martin Hansen
4fb76db42f Feature #986: Automatic save when losing connection to a network game 2018-06-23 15:22:31 +02:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
Jonathan G Rennison
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
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
55083a0f65 Merge branch 'save_ext' into jgrpp 2018-06-07 06:45:18 +01:00
Jonathan G Rennison
3caf92c514 Fix default for orderproc not being set in table/win32_settings.ini 2018-06-07 06:41:46 +01:00
Jonathan G Rennison
a8cfc9fe90 Debug: Add vehicle index and flag dump to NewGRF debug window 2018-06-05 19:09:03 +01:00
Jonathan G Rennison
d2d8a86814 Add setting: station rating waiting time tolerance depends on cargo class 2018-06-04 20:43:05 +01:00
Jonathan G Rennison
f2072319cb Add autosave_on_network_disconnect setting to GUI 2018-05-30 08:36:48 +01:00
Jonathan G Rennison
7559db2bbb Merge remote-tracking branch 'nielsmh/bug986' into jgrpp 2018-05-30 08:19:22 +01:00
Niels Martin Hansen
db5abdd78a Feature #986: Automatic save when losing connection to a network game 2018-05-26 18:35:54 +02:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +01:00
Jonathan G Rennison
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
 2018-05-03 23:54:51 +01:00
PeterN
cfe6a8ea4f Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
4bcd05a620 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	findversion.sh
 2018-04-27 01:33:39 +01:00
Jonathan G Rennison
b90c5b9618 Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2018-04-26 23:59:13 +01:00
PeterN
3b32075e8a Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737) 
This replaces the internal SCC_PREVIOUS_COLOUR swap.
 2018-04-19 19:33:21 +01:00
Pavel Stupnikov
9175c349da Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726) 2018-04-17 18:41:31 +01:00
keldorkatarn
9ab2b8fa3e FIX: {PREVIOUS_COLOUR} string control code was not activated for some reason. The logic for it is in place. 
(cherry picked from commit 9d7c265fdca7884db26b3c2d0f856cc18a751c54)

Fixes: #41
 2018-04-17 16:11:19 +01:00
Jonathan G Rennison
6ec78ff4b0 Add UI setting to disable mass action buttons for top-level vehicle lists 2018-03-29 20:39:25 +01:00
Jonathan G Rennison
7aab49e282 Add setting to enable through loading in UI 2018-03-29 18:52:54 +01:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
 2018-03-11 22:16:19 +00:00
Jonathan G Rennison
16c67ea484 Merge branch 'master' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/saveload/saveload.cpp
#	src/stdafx.h
#	src/vehicle.cpp
 2018-03-11 22:10:21 +00:00
frosch
59dd7be686 (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
frosch
91bcc210cf (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
peter1138
86829c54c4 (svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots. 2018-03-05 21:24:48 +00:00