Commit Graph

1827 Commits (e28da50c4f4a0408731293519a56ad65e6d426a2)

Author SHA1 Message Date
Jonathan G Rennison f6d374ade4 Merge branch 'house_placing' into jgrpp
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
9 years ago
Jonathan G Rennison 95b65163e3 Revert back to v2 of house picking/placing patch. 9 years ago
Jonathan G Rennison 4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
9 years ago
Jonathan G Rennison d59252d15b Timetable auto separation is now per vehicle, with a company default.
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
9 years ago
Jonathan G Rennison efcdd6c36f Remove global automated timetable setting. 9 years ago
Jonathan G Rennison ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 9 years ago
Jonathan G Rennison 04b188bd7d Add client setting to show leftover ticks in timetable. 9 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
9 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 9 years ago
Jonathan G Rennison 7bc407e2f8 Merge branch 'infrastructure_sharing-sx' into jgrpp
# Conflicts:
#	src/settings_type.h
#	src/table/settings.ini
9 years ago
Jonathan G Rennison 1818a83e63 Add setting to control whether trains can crash with other companies'. 9 years ago
Jonathan G Rennison 1f5535c0b1 Merge branch 'infrastructure_sharing-sx' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
9 years ago
Jonathan G Rennison a27bdbb3e2 Add company settings to enable competitors' to buy/renew in own depots. 9 years ago
Jonathan G Rennison 31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
9 years ago
Jonathan G Rennison fe2277dfbc Merge branch 'improved_breakdowns' into improved_breakdowns-sx
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
9 years ago
Jonathan G Rennison 5eed9865d6 Improved breakdowns: Various changes and fixes.
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
  from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
  modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
  has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
  is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
9 years ago
Jonathan G Rennison 248ac0e263 Merge branch 'save_ext' into infrastructure_sharing-sx 9 years ago
Jonathan G Rennison e5894b3948 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 9 years ago
Jonathan G Rennison 6992312702 Merge branch 'master' into infrastructure_sharing 9 years ago
Jonathan G Rennison 78cf5ca682 Add setting for linkgraph times to be in non daylength scaled days.
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
9 years ago
patch-import c5f9d8b6de Import reduced tree patch
http://www.tt-forums.net/viewtopic.php?p=890778#p890778

Update to recent trunk, use extended savegame framework.
Add setting help text, tweak setting name.
Pre-calculate tree growth probabilities.
9 years ago
Jonathan G Rennison a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 9 years ago
Jonathan G Rennison 27bdf2a8b6 Merge branch 'ship_collision_avoidance-sx' into jgrpp
Conflicts:
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison b00b1125be Add a dedicated setting to enable ship collision avoidance. 9 years ago
Jonathan G Rennison a8ce1f05bf Increase max value of difficulty.max_loan setting. 9 years ago
Jonathan G Rennison 69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
9 years ago
Jonathan G Rennison 07aba3eb84 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
Jonathan G Rennison 6075dd22e2 Show small square if vehicle owner does not match list owner.
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
9 years ago
Jonathan G Rennison ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 4608ed79bb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 16c5a0a812 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 5a0510e488 Fix dark/lighten colour mappings going to/from yellow flash cycle.
This is problematic for the green company in viewport map owner mode,
where it becomes flashing yellow for slopes and tunnels (if enabled).
9 years ago
Jonathan G Rennison 7dc91d0858 Merge branch 'departure-boards' into departure-boards-sx 9 years ago
Jonathan G Rennison 44d545d220 Merge branch 'master' into departure-boards 9 years ago
Jonathan G Rennison d65ddc8985 Merge branch 'auto_timetables-sx' into jgrpp 9 years ago
Jonathan G Rennison 61aad7ce2a Change the default auto timetable separation rate to 40%.
This is to improve jam-resistance by default.
9 years ago
Jonathan G Rennison b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
9 years ago
Jonathan G Rennison 60a677692e Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
9 years ago
Jonathan G Rennison 26d32269a3 Make auto TT separation rate a company setting.
Move auto TT by default setting to PLYX chunk.
9 years ago
Jonathan G Rennison a380573c32 Merge branch 'save_ext' into auto_timetables-sx 9 years ago
Jonathan G Rennison 6d263226d8 Move order occupancy smoothness to company settings. 9 years ago
Jonathan G Rennison 8001d86350 Merge branch 'save_ext' into order_occupancy-sx 9 years ago
Jonathan G Rennison e606a847c6 Add an un-ordered chunk for extra company settings: PLYX.
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
9 years ago
Jonathan G Rennison e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison 42370dc28d Add company setting to auto-enable auto timetables for new vehicles.
Default: off.
9 years ago
Jonathan G Rennison ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 9 years ago
Jonathan G Rennison 6e505ceab1 Fix missing template definition in company_settings. 9 years ago
Jonathan G Rennison 5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp
Conflicts:
	src/table/settings.ini
9 years ago
Jonathan G Rennison 5a07315405 Add train length and group name to vehicle details window.
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
9 years ago
Jonathan G Rennison bbc131ce47 Merge branch 'jgrpp' into save_ext_spp
Conflicts:
	src/saveload/order_sl.cpp
9 years ago
Jonathan G Rennison 591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
9 years ago
Jonathan G Rennison 9c75a3c477 Enable building rivers in-game.
Controlled by setting, default off.
9 years ago
Jonathan G Rennison 58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 9 years ago
Jonathan G Rennison 64a6f5c0d4 Merge branch 'jgrpp' into save_ext_spp 9 years ago
Jonathan G Rennison efb1ba3337 Add GUI settings and setting/help texts.
Move tree-related functions into their own GUI sub-category.
9 years ago
Jonathan G Rennison 381d11096f Bin no_trees_on_this_level, use exp. decay away from snow line.
Probability of placing an arctic tree is now an exponential decay
function of height distance from the snow line, instead of the previous
50% blocks.
This results in a more gradual thinning out of arctic trees in
each direction.
The algorithm is: p = exp(-3 * distance / range_setting),
using a rather crude approximation of the exponential function.

The no_trees_on_this_level setting is not really useful, and its
dual behaviour to disallow discrete height levels and turn on the
snow line behaviour is unintuitive.
Replace it with a simple on/off setting.
9 years ago
Jonathan G Rennison 3b120c6cbd Merge branch 'save_ext' into everest_treeline-sx 9 years ago
Jonathan G Rennison efe85200f0 Import Everest treeline patch 9 years ago
Jonathan G Rennison f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
9 years ago
Jonathan G Rennison 6643d0a661 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 8faead7e7a Graphically indicate restricted signals by recolouring the signal post.
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
9 years ago
Jonathan G Rennison ba8d8d99b8 Add support for loading SpringPP savegame versions 221 and 222.
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
9 years ago
Jonathan G Rennison b5c453b21e Add generic mechanism to cross-ref settings at load time.
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
9 years ago
Jonathan G Rennison 74e5d97fcb Merge branch 'save_ext' into signal_tunnels_bridges-sx 9 years ago
Jonathan G Rennison 034279c0e8 Merge branch 'save_ext' into jgrpp 9 years ago
Jonathan G Rennison a8cc81d054 Initialiser list fixes for legacy compilers. 9 years ago
Jonathan G Rennison ef5ecdb2c7 Merge branch 'git_findversion_fix' into save_ext 9 years ago
Jonathan G Rennison 1ead315e42 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 9 years ago
Jonathan G Rennison 6d695a1426 Merge branch 'master' into improved_breakdowns 9 years ago
Jonathan G Rennison 9716026809 Merge branch 'jgrpp' into save_ext_spp 9 years ago
Jonathan G Rennison 6088c7fc24 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 671151474b Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 88c150abf7 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
Jonathan G Rennison 25bc8eb1e2 Save/load changes for timetable_separation_rate setting. 9 years ago
Jonathan G Rennison adb3156951 Merge branch 'auto_timetables' into auto_timetables-sx 9 years ago
Jonathan G Rennison 40ad3dea02 Auto separation: Add setting to scale vehicle lateness adjustments.
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.

The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.

Note that this is not savegame compatible.
9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
michi_cc 2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
alberth 438d7a26cc (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 9 years ago
alberth d818e1779c (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 9 years ago
Jonathan G Rennison f0fecda985 Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison fdce64ddae Save/load changes for order occupancy 9 years ago
Jonathan G Rennison 52c07d1f51 Merge branch 'save_ext' into order_occupancy-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison 117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average.
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
Jonathan G Rennison 39608841f2 Initial support for loading savegames from SpringPP v2.0.102/103
Savegame version 220

Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
9 years ago
Jonathan G Rennison 15c2327fd4 Merge branch 'master' into auto_timetables 9 years ago
Jonathan G Rennison 9565e5b9b1 Merge branch 'day_length-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
9 years ago
Jonathan G Rennison 41062cf78e Save/load changes for variable day length patch. 9 years ago
Jonathan G Rennison 454b3c61b0 Merge branch 'save_ext' into day_length-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison d70dbda351 Merge branch 'master' into day_length 9 years ago
patch-import d86a56cbef Import day length patch
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
Jonathan G Rennison 135d159fc1 Merge branch 'infrastructure_sharing-sx' into jgrpp 9 years ago
Jonathan G Rennison e1defe24c7 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
Conflicts:
	src/table/settings.ini
9 years ago
Jonathan G Rennison 65b1586f98 Infra sharing: Fix sharing fee settings not being shown as currency.
Settings were shown as (invalid string).
Fix water/dock sharing fee setting using wrong string.
9 years ago
Jonathan G Rennison 4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
9 years ago
Jonathan G Rennison b3ebb1f729 Infrastructure sharing patch: save/load changes. 9 years ago
Jonathan G Rennison 037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
9 years ago
patch-import ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
Jonathan G Rennison 174779e371 Merge branch 'save_ext' into enhanced_viewport_overlay-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
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
Jonathan G Rennison 20e2f363f1 Merge branch 'vehicle_repair_costs-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
9 years ago
Jonathan G Rennison 6bb8d5087d Vehicle repair costs patch: implement save/load changes. 9 years ago
Jonathan G Rennison 0a7441e56c Merge branch 'save_ext' into vehicle_repair_costs-sx
Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp
9 years ago
patch-import 7537ae2a7e Import vehicle repair costs patch
Strip trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
9 years ago
Jonathan G Rennison ba4e5dd62f Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
	src/vehicle.cpp
9 years ago
Jonathan G Rennison 2e45dac18a Auto timetables patch: save/load changes, document rationale for
moving addition to VehicleFlags
9 years ago
Jonathan G Rennison 33854a138f Merge branch 'save_ext' into auto_timetables-sx 9 years ago
patch-import 80deb3c01d Import auto timetable separation patch
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
Jonathan G Rennison a8c2c394a5 Merge branch 'improved_breakdowns-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
9 years ago
Jonathan G Rennison e91d0e49dc Improved breakdowns: Update save/load code 9 years ago
Jonathan G Rennison d023d0863f Merge branch 'save_ext' into improved_breakdowns-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
patch-import 9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
Jonathan G Rennison 27c70542da Merge branch 'signal_tunnels_bridges-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
	src/signal.cpp
9 years ago
Jonathan G Rennison 8271acadb7 Merge branch 'show_veh_tunnel' into jgrpp 9 years ago
Jonathan G Rennison 9b4b170b2d Merge branch 'town_cargo_adj-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
9 years ago
Jonathan G Rennison 6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
9 years ago
Jonathan G Rennison 0afc054bff Merge branch 'adjacent_crossings-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 9 years ago
Jonathan G Rennison 03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues,
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
9 years ago
patch-import 6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
Jonathan G Rennison 08dc95fea1 Add town cargo patch SLXI/PATX code.
Update setting string.
9 years ago
Jonathan G Rennison 9905e478d4 Merge branch 'save_ext' into town_cargo_adj-sx 9 years ago
Jonathan G Rennison 60377f2262 Merge branch 'master' into town_cargo_adj
Conflicts:
	src/settings_gui.cpp
9 years ago
patch-import 1c9801e6b6 Import town cargo generation factor patch
Adjust whitespace

http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
9 years ago
Jonathan G Rennison 09aa29de8b Add signals on bridges/tunnels SLXI info, move setting to PATX. 9 years ago
Jonathan G Rennison 00f9f75d34 Merge branch 'save_ext' into departure-boards-sx 9 years ago
Jonathan G Rennison 526cb42608 Merge branch 'master' into depature-boards
Conflicts:
	src/table/strgen_tables.h
9 years ago
Jonathan G Rennison 9f79c555da Merge branch 'save_ext' into signal_tunnels_bridges-sx 9 years ago
patch-import 59b0b18aa2 Import signals on tunnels and bridges patch
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
Jonathan G Rennison de14c210db Add progsigs info to SLXI chunk, move setting to PATX chunk. 9 years ago
Jonathan G Rennison b1d8bcfe35 Merge branch 'save_ext' into progsig-sx
Conflicts:
	source.list
	src/saveload/saveload.cpp
9 years ago
patch-import fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
Jonathan G Rennison c57ffc64bc Settings update: add PATX chunk to store additional settings
in an unordered format which is tolerant of extra, missing or reordered
settings.
9 years ago
Jonathan G Rennison 17e8693e62 Initial stubs for extending the save/load version checking/upgrade code,
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
9 years ago
Jonathan G Rennison 5e7638a6d0 Port of old vehicles visible in tunnels patch
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
9 years ago
frosch 67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
frosch 4830497f0b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
frosch 14052de6b2 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 9 years ago
frosch 50a3f44539 (svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes. 9 years ago
alberth 9b946e3bf2 (svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore) 10 years ago
alberth a91f74dbb3 (svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore) 10 years ago
rubidium 7ae2a1764d (svn r27183) -Fix: GCC5 compilation 10 years ago
rubidium 13e3ef53e3 (svn r27183) -Fix: GCC5 compilation 10 years ago
frosch 6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 10 years ago
frosch c639fb0d8e (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 10 years ago
frosch 04b8fe6d0b (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 10 years ago
frosch 310258f283 (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 10 years ago
frosch 3d37abf802 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 10 years ago
frosch 2f7de4fd99 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 10 years ago
frosch f933dec10b (svn r27137) -Fix (r0): Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion. 10 years ago
frosch 4846c7ed6b (svn r27137) -Fix (r0): Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion. 10 years ago
peter1138 2c21d4fbd1 (svn r27048) -Fix (r26158): Position in articulated vehicle is 4D, not 4A. 10 years ago
peter1138 c2dbe23c88 (svn r27048) -Fix (r26158): Position in articulated vehicle is 4D, not 4A. 10 years ago
rubidium 0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
rubidium d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
rubidium 0efe811f74 (svn r27009) -Add: extra level of general map heightness (ChillCore) 10 years ago
rubidium 8d90e86c2c (svn r27009) -Add: extra level of general map heightness (ChillCore) 10 years ago
rubidium 26574124b1 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 10 years ago
rubidium fddeeb5e49 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 10 years ago
peter1138 2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
peter1138 253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
peter1138 ee266b9b9d (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 10 years ago
peter1138 5a924dcbbc (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 10 years ago
rubidium 340ecd7385 (svn r26930) -Add: extra shadings to he heightmap colour tables (Chillcore) 10 years ago
rubidium b08b3bd8e3 (svn r26930) -Add: extra shadings to he heightmap colour tables (Chillcore) 10 years ago
rubidium 4b8d6ee319 (svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111) 10 years ago
rubidium 0176ef274f (svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111) 10 years ago
rubidium ae406cf52e (svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder 10 years ago
rubidium f192045796 (svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder 10 years ago
rubidium fa193ece85 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 10 years ago
rubidium c72d362840 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 10 years ago
rubidium 647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 10 years ago
rubidium ce04c49e3d (svn r26882) -Feature: allow limiting the height of bridges (ic111) 10 years ago
rubidium ab3660278a (svn r26880) -Add: stub settings for limiting bridge and map height 10 years ago
rubidium f41b55f0ff (svn r26880) -Add: stub settings for limiting bridge and map height 10 years ago
rubidium 6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 10 years ago
rubidium 2361aaf601 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 10 years ago
planetmaker 035fedd30b (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 10 years ago
planetmaker 61e129cc22 (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 10 years ago
frosch 59a49a4483 (svn r26614) -Add: Adv. settings window can handle the autosave setting as well. 11 years ago
frosch 0d565ae612 (svn r26614) -Add: Adv. settings window can handle the autosave setting as well. 11 years ago
frosch 7e359e1b8d (svn r26604) -Add: Most of the mapgen settings to advances settings window. 11 years ago
frosch 0c9e666d96 (svn r26604) -Add: Most of the mapgen settings to advances settings window. 11 years ago
frosch fffab86525 (svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI. 11 years ago
frosch 0ba81bff17 (svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI. 11 years ago
frosch b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
11 years ago
frosch 631e8b45fd (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
11 years ago
frosch ce92faf682 (svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor. 11 years ago
frosch 6b61c4608f (svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor. 11 years ago
frosch 1f056ce552 (svn r26374) -Fix [FS#5928]: Mixed up callback mask flags in station inspect window. (adf88) 11 years ago
frosch 62b22bfd2b (svn r26374) -Fix [FS#5928]: Mixed up callback mask flags in station inspect window. (adf88) 11 years ago
fonsinchen 193a20d260 (svn r26323) -Fix: update some constants related to map size. 11 years ago
fonsinchen e4c7c8876b (svn r26323) -Fix: update some constants related to map size. 11 years ago
frosch 968ba79de2 (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch e9c22ef16f (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch cb6aee2f27 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 11 years ago
frosch bc86bf9b12 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 11 years ago
frosch e6f83028f6 (svn r26206) -Fix [FS#5829]: Run everything from ini, obg, obs, obs, ... files through str_validate. 11 years ago
frosch 7247ecf172 (svn r26206) -Fix [FS#5829]: Run everything from ini, obg, obs, obs, ... files through str_validate. 11 years ago
frosch 9a00a23656 (svn r26158) -Fix: NewGRF inspect window lacked several newer variables. 11 years ago
frosch a12fa22a75 (svn r26158) -Fix: NewGRF inspect window lacked several newer variables. 11 years ago
rubidium a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium d2ba772f6a (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium ecfed05729 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 11 years ago
rubidium 6f21593bf6 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 11 years ago
frosch 0d5ab589fe (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 11 years ago
frosch 103b6fffbb (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 11 years ago
planetmaker 91c3c20cc5 (svn r25876) -Codechange: Unify object placement during map creation 11 years ago
planetmaker 8033162bb8 (svn r25876) -Codechange: Unify object placement during map creation 11 years ago
planetmaker dd7cfa310d (svn r25874) -Add: [NewGRF] NewObject property 0x10, bit 13 indicating that object amount scales with water content of map border (e.g. used for lighthouses) 11 years ago
planetmaker 547b1fba45 (svn r25874) -Add: [NewGRF] NewObject property 0x10, bit 13 indicating that object amount scales with water content of map border (e.g. used for lighthouses) 11 years ago
planetmaker 18ea5a8544 (svn r25873) -Codechange: Add property for the amount of generated objects upon map creation to default objects 11 years ago
planetmaker 88286d33ab (svn r25873) -Codechange: Add property for the amount of generated objects upon map creation to default objects 11 years ago
planetmaker 47457831a2 (svn r25872) -Codechange: Add climate property to default objects 11 years ago
planetmaker 6f62458e3b (svn r25872) -Codechange: Add climate property to default objects 11 years ago
planetmaker 173cb005eb (svn r25868) -Fix (r25650): Initialization of default objects swapped costs and dates 11 years ago
planetmaker f5e408fa1c (svn r25868) -Fix (r25650): Initialization of default objects swapped costs and dates 11 years ago
planetmaker 68486be675 (svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo) 11 years ago
planetmaker 5cc4d240f1 (svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo) 11 years ago
planetmaker 768d0ac008 (svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo) 11 years ago
planetmaker eecb4b3506 (svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo) 11 years ago
rubidium ccbb8706a8 (svn r25557) -Fix [FS#5524]: one could build bridges over owned land of another company 11 years ago
rubidium 1e715bfbea (svn r25557) -Fix [FS#5524]: one could build bridges over owned land of another company 11 years ago
rubidium 1cf6dad8f2 (svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
11 years ago
rubidium f9c9ff6ec3 (svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
11 years ago
rubidium 74d3f05fe2 (svn r25507) -Cleanup: double definition 11 years ago
rubidium 6e97b7a6e8 (svn r25507) -Cleanup: double definition 11 years ago
rubidium 2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 7c0f34130c (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 44d584f84a (svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped 11 years ago
rubidium 94a5fe6b92 (svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped 11 years ago
fonsinchen 7b2f8a885e (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 11 years ago
fonsinchen 0fc198cb00 (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 11 years ago
fonsinchen 848ca543a2 (svn r25351) -Add: settings for link graph 11 years ago
fonsinchen a49a4eec6e (svn r25351) -Add: settings for link graph 11 years ago
zuu 7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 11 years ago
zuu a2d84868e7 (svn r25344) -Feature: GUI for viewing story pages 11 years ago
rubidium 2b2706009e (svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w 11 years ago
rubidium f292a87dc4 (svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w 11 years ago
frosch 4518e16da7 (svn r25295) -Feature: Allow saving window sizes as default sizes. 12 years ago
frosch 05c472f08a (svn r25295) -Feature: Allow saving window sizes as default sizes. 12 years ago
frosch f61a2c0273 (svn r25293) -Add: GUI sprite for default window size button. 12 years ago