Commit Graph

1864 Commits

Author SHA1 Message Date
Jonathan G Rennison
223d542bf1 ChillPP: Remove unnecessary additions to gameopt_settings.ini 2020-01-02 22:11:43 +00:00
Jonathan G Rennison
5dc1027c6b Add initial support for loading ChillPP v14.7 savegames 2020-01-01 23:14:00 +00:00
Jonathan G Rennison
71db9ebc3b NewGRF debug window: Add vehicle cargo and last station lines 2020-01-01 21:49:54 +00:00
Jonathan G Rennison
d56d4ea51f Add initial support for loading JokerPP savegames
See #123
2019-12-28 13:10:32 +00:00
Jonathan G Rennison
fd25596311 Merge upstream PR #7852 into jgrpp
Feature: Show the name of the NewGRF in the build vehicle window

Author: stormcone

# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
2019-12-13 17:28:48 +00:00
Jonathan G Rennison
030e8bf762 Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
2019-12-05 18:13:35 +00:00
stormcone
4def6cf70f Feature: Show the name of the NewGRF in the build vehicle window. 2019-12-02 21:28:29 +01:00
Jonathan G Rennison
2b0c1a5930 Separate allow stations under bridges into settings for: rail, road, docks 2019-11-19 22:51:45 +00: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
e1783be6d1 NewGRF debug window: Add a subset of house properties 2019-10-27 11:11:12 +00:00
Jack McKiernan
f52e605b51 Fix: Solved helicopter takeoff issue with international airports
Helicopters can now take off from just outside the hangars.
2019-10-25 23:42:31 +02:00
Jack McKiernan
9479f45d1a Codechange: Replaced 255's with an enum entry TERMGROUP 2019-10-25 23:42:31 +02:00
Jack McKiernan
d39f889775 Codechange: Replaced 0's in heading field with TO_ALL 2019-10-25 23:42:31 +02:00
Jack McKiernan
d843b73280 Fix #6219: Allow taking off from hangar in commuter airport
Previously, a helicopter in the hangar of a commuter airport would have to wait until HELIPAD2 was free before it could takeoff. Now, a helicopter in the hangar can takeoff from just outside the hangar.
2019-10-25 23:42:31 +02:00
Jack Baron
f159d91572 Fix: add savegame version to trading age setting 2019-10-19 20:31:44 +01:00
Jack Baron
7c9dedb94f Feature: Configure minimum share trading years 2019-10-19 20:31:44 +01:00
Niels Martin Hansen
53f8d0b815 Codechange: Use std::vector for industry tile layouts 2019-10-19 17:16:25 +01:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
a30638bc4a Merge branch 'jgrpp' into jgrpp-nrt 2019-09-16 22:28:35 +01:00
Jonathan G Rennison
d77c2d380f Add VehicleCache fields to vehicle debug inspect window 2019-09-16 21:06:55 +01:00
Jonathan G Rennison
f681e98f0f Debug: Show order indices in vehicle debug/inspection GUI 2019-09-05 20:58:23 +01:00
Jonathan G Rennison
ba9d1a0390 Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
2019-08-29 01:01:45 +01:00
Jonathan G Rennison
9a05ea67d5 Add chicken bits setting
2 bits so far
2019-08-28 19:10:34 +01:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
2019-08-24 10:41:08 +01:00
Jonathan G Rennison
ec892879f4 Add passworded mechanism to change server game settings from client 2019-08-20 20:42:17 +01:00
Jonathan G Rennison
515187058f Add nearby stations to town debug window 2019-08-20 01:45:35 +01:00
Jonathan G Rennison
dbc5f1baed Merge branch 'master' into jgrpp-nrt
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
2019-07-11 20:03:23 +01:00
Jonathan G Rennison
ba8ed880c1 Merge branch 'master' into jgrpp-nrt
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
2019-07-11 19:45:56 +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
Jonathan G Rennison
c13ee0979f Add industry and station rect coords to NewGRF debug window info 2019-06-17 01:34:06 +01:00
Jonathan G Rennison
601afc56dc Add NewGRF debug window info for stations and industries 2019-06-16 13:56:47 +01:00
Jonathan G Rennison
8a3dcfb1c5 Add town cargo production/acceptance cache to town GRF debug window 2019-05-26 21:03:29 +01:00
Michael Lutz
a8b6e9f23c Codechange: Refactor the Freetype font cache into a generic part that does not depend on Freetype and into one that does.
This makes it easier to add other TrueType font rendering engines.
2019-05-14 11:21:36 +01:00
Jonathan G Rennison
af64b5dc18 Add news/advice setting to warn if no depot order in vehicle schedule 2019-05-11 19:58:16 +01:00
Niels Martin Hansen
140a96b3a0 Change: Limit memory allocations for each Squirrel instance
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
2019-05-11 15:34:33 +02:00
Michael Lutz
0344e7a0a1 Fix #7463: Promote scroll mode setting to basic category. 2019-05-11 14:05:52 +02:00
peter1138
51dd751f4a Fix #7565: Incorrect cursor used for placing road/tram tunnels. 2019-05-09 11:51:04 +01:00
Corns McGowan
4d0ee65b51 Change: Set default setting in server browser of "Advertised" to "Yes". (#7568) 2019-05-05 15:18:52 +01:00
Jonathan G Rennison
1ee33c46ef Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
e7a916d2ce Linkgraph: Add asymmetric: equal and nearest demand distribution modes 2019-05-01 20:57:59 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Jonathan G Rennison
8b1ee39ace Setting: Add support for enum type settings 2019-05-01 19:03:00 +01:00
Charles Pigott
644f4c3547 Codechange: Set size of SettingGuiFlag & SettingDescType enums, and use them properly 2019-04-29 17:40:22 +01:00
Charles Pigott
96097b34a5 Codechange: Remove Direction*Byte types 2019-04-29 17:40:22 +01:00
Charles Pigott
931d32f414 Codechange: Remove RailTypeByte type 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
24458e9990 Add various missing override specifiers 2019-04-28 12:24:40 +01:00
Jonathan G Rennison
a6ea1ea408 Allow articulated road vehicles to overtake other vehicles
Add setting
2019-04-27 13:56:49 +01:00