Commit Graph

16158 Commits (3ad3f90f7a3272196e6a60ad920ebbab0a8cea7d)

Author SHA1 Message Date
frosch 63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 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
Jonathan G Rennison 6b0e63e054 Merge branch 'improved_breakdowns-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 15f3abf47d Fix typo in save/load ext feature enum name for improved breakdown. 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 46103362c3 Fix for loading of SPP games games with aircraft. 9 years ago
Jonathan G Rennison 4fb0f9bacc SPP loader: Adjust inflation cost scaling on load.
SpringPP divides all prices by the difficulty factor, effectively making
things about 8 times cheaper. Adjust the inflation factor to compensate
for this, as otherwise the game is unplayable on load if inflation has
been running for a while. To avoid making things too cheap, clamp the
price inflation factor to no lower than the payment inflation factor.
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 bd10b0fb0b Merge branch 'departure-boards-sx' into jgrpp 9 years ago
Jonathan G Rennison 365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 9 years ago
Jonathan G Rennison d5f9709c56 Merge branch 'departure-boards' into departure-boards-sx 9 years ago
Jonathan G Rennison 1795fb5953 Fix departure boards with orders with timetabled 0 travel times,
e.g. those with depot service orders.
9 years ago
Jonathan G Rennison 346cebab43 Merge branch 'master' into departure-boards 9 years ago
Jonathan G Rennison f820bbe0c5 Merge branch 'auto_timetables' into auto_timetables-sx 9 years ago
Jonathan G Rennison d24f7763cc Fix auto timetable separation to handle non-station orders sensibly. 9 years ago
Jonathan G Rennison 34e41a2e26 Timetable GUI: Allow clearing of timetable time fields which are at 0.
Allow explicitly setting timetable time fields to 0 without clearing them.
9 years ago
Jonathan G Rennison 15c2327fd4 Merge branch 'master' into auto_timetables 9 years ago
rubidium eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 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
rubidium ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 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 45d060f46f Day length patch: minor tweak to timetable lateness calculation.
_date_fract should also be multiplied by day length factor.
9 years ago
Jonathan G Rennison d70dbda351 Merge branch 'master' into day_length 9 years ago
Jonathan G Rennison e0bc6e0cf6 Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
Jonathan G Rennison a48652ac6f Merge branch 'save_ext' into tracerestrict-sx
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
Jonathan G Rennison 316b3a4acc Merge branch 'master' into save_ext 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
frosch 9f72662ecc (svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font. 9 years ago
frosch c9120cd714 (svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines. 9 years ago
translators a9200aa69a (svn r27364) -Update from WebTranslator v3.0:
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
9 years ago
alberth 894f69e1fd (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 9 years ago
alberth 48485a6a5a (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 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 6c971f9a55 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 8386cc3c1b Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 5540374227 Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode.
Don't use water tile accessors on aqueduct bridge heads.
9 years ago
Jonathan G Rennison 6d6d2f2f0a Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp 9 years ago
Jonathan G Rennison bde8f04f73 Town rating label: Fix viewport tiny strings having wrong colour for
"very good" and "excellent" ratings.
9 years ago
Jonathan G Rennison b7f1019dc7 Merge branch 'master' into town-rating-label
Conflicts:
	src/town_cmd.cpp
9 years ago
Jonathan G Rennison 84f9274640 Merge branch 'save_ext' into departure-boards-sx 9 years ago
Jonathan G Rennison 0055e283f1 Merge branch 'save_ext' into improved_breakdowns-sx 9 years ago
Jonathan G Rennison 2f8d330307 Merge branch 'save_ext' into infrastructure_sharing-sx 9 years ago
Jonathan G Rennison e30d7c2164 Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame(). 9 years ago
translators f95759139b (svn r27359) -Update from WebTranslator v3.0:
swedish - 1 changes by planetmaker
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 44ed3cb3bd Merge branch 'town-rating-label' into jgrpp
Conflicts:
	src/lang/english.txt
	src/town_cmd.cpp
9 years ago
patch-import 33d395ad59 Import town rating label patch
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
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 44d3c84a11 Save/load changes for enhanced viewport patch: plans. 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 03b6c41c67 Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION. 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
Jonathan G Rennison 938babfe7b Vehicle repair costs patch: whitespace fixes. 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 7a3fb02d5a Merge branch 'house_placing' into jgrpp 9 years ago
Jonathan G Rennison 3ec3842ad4 Fix town_gui.h header file not being in imported diff
Use copy from http://www.tt-forums.net/viewtopic.php?p=1099696#p1099696
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
Jonathan G Rennison 0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end,
whitespace & style, fix lang strings.
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 163423e7b5 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison a38c98d10a Bump SLXI tracerestrict version due to PBS entry and PF penalty new features. 9 years ago
Jonathan G Rennison c4565f6bb0 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 76707fb72a Change pf penalty restriction value button to preset values and a custom option.
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
9 years ago
Jonathan G Rennison c7f4b3fe6f Merge branch 'smallmap-screenshot' into jgrpp 9 years ago
Jonathan G Rennison 948b4e1d5e Implement taking smallmap screenshots.
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
9 years ago
Jonathan G Rennison ce34225b0e Merge branch 'house_placing' into jgrpp 9 years ago
patch-import 19dcbb1cb9 Import Picking and placing single houses in scenario editor patch
Minor whitespace fixes

http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
Jonathan G Rennison 675993805b Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
Jonathan G Rennison 09f8ff420f Merge branch 'tracerestrict' into tracerestrict-sx
Conflicts:
	src/tracerestrict_gui.cpp
9 years ago
Jonathan G Rennison a0520b8937 Initial implementation of PBS entry signal condition variable.
TODO: see how the efficiency of this can be improved.
9 years ago
Jonathan G Rennison 116bd41101 Initial support for multi-item instructions.
This involves various changes to instruction modification actions,
and the GUI code.
9 years ago
Jonathan G Rennison e4ccea350b Merge branch 'wait_in_depot-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison 1fbd4a9d1d Timetable wait in depot: Add info to SLXI chunk. 9 years ago
Jonathan G Rennison a3b0057011 Merge branch 'save_ext' into wait_in_depot-sx 9 years ago
Jonathan G Rennison 2f9ebebf02 Merge branch 'master' into wait_in_depot 9 years ago
Jonathan G Rennison 4d1c4d18be Timetable wait in depot: minor whitespace/style changes. 9 years ago
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
Jonathan G Rennison a2eac188de Merge branches 'save_ext', 'tracerestrict-sx', 'departure-boards-sx', 'town_cargo_adj-sx', 'signal_tunnels_bridges-sx', 'adjacent_crossings-sx' and 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison bc8b2d9826 Merge branch 'save_ext' into tracerestrict-sx 9 years ago
Jonathan G Rennison 77ec2aac58 Merge branch 'save_ext' into progsig-sx 9 years ago
Jonathan G Rennison 8fe9a7430c Merge branch 'save_ext' into departure-boards-sx 9 years ago
Jonathan G Rennison 012ce322d5 Merge branch 'save_ext' into town_cargo_adj-sx 9 years ago
Jonathan G Rennison 6ac6759b00 Merge branch 'save_ext' into signal_tunnels_bridges-sx 9 years ago
Jonathan G Rennison 7cc71ce2a5 Merge branch 'save_ext' into adjacent_crossings-sx 9 years ago
Jonathan G Rennison eadeb51535 Merge branch 'master' into save_ext 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 a8a726464c Merge branch 'save_ext' into improved_breakdowns-sx 9 years ago
Jonathan G Rennison 047395c663 Remove unnecessary and buggy field-packing in struct SlXvFeatureTest. 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
Jonathan G Rennison 80d52eb20e Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
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 b6a1866ded Merge branch 'max_grfs' into jgrpp 9 years ago
patch-import 8f5ef2ae01 Import and rebase Max NewGRFs patch
Fix trailing whitespace, clean up code a bit

http://www.tt-forums.net/viewtopic.php?p=894743#p894743
9 years ago
Jonathan G Rennison 3c9c0acba1 Merge branch 'measurement_tool' into jgrpp 9 years ago
patch-import 9dfdd8bce8 Import measurement patch
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
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
translators 163c30570b (svn r27358) -Update from WebTranslator v3.0:
catalan - 25 changes by juanjo
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 78b2e5babb Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp 9 years ago
Jonathan G Rennison 2bcbeea011 Merge branch 'progsig-sx' into jgrpp
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
9 years ago
Jonathan G Rennison de76316634 Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
Jonathan G Rennison 09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 9 years ago
Jonathan G Rennison b8ef887cc1 Merge branch 'save_ext' into adjacent_crossings-sx 9 years ago
patch-import 4117808b9d Import adjacent crossings patch (v3.1)
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=836749#p836749
9 years ago
Jonathan G Rennison 74bccb5d50 Zoning: Implement ownership checks, and station facility checks for industries. 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
patch-import 45b5145396 Add group info patch
Fix whitespace, add NOSAVE comment in vehicle struct

http://www.tt-forums.net/viewtopic.php?f=33&t=72855
9 years ago
Jonathan G Rennison 08dc95fea1 Add town cargo patch SLXI/PATX code.
Update setting string.
9 years ago
patch-import c72b29cfd0 Import upgrade airport patch
http://www.tt-forums.net/viewtopic.php?f=33&t=35867
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 6c81f8f35b Add departure boards and timetable tick status to SLXI info.
Implementing converting timetable start date to/from ticks/days in
afterload code.
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
Jonathan G Rennison 22a5c6d459 Minor fixes in CmdRemoveSingleSignal
Whitespace fixes
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
translators e6782df9ba (svn r27357) -Update from WebTranslator v3.0:
catalan - 181 changes by juanjo
9 years ago
Jonathan G Rennison de14c210db Add progsigs info to SLXI chunk, move setting to PATX chunk. 9 years ago
Jonathan G Rennison 3a3280e536 Merge branch 'save_ext' into progsig-sx 9 years ago
Jonathan G Rennison b3e102fe52 Fix length mismatch in PATX loader. 9 years ago
Jonathan G Rennison 5d680d9154 Implement version setting in SlXvSetCurrentState
Call in ClearSaveLoadState
9 years ago
Jonathan G Rennison b1d8bcfe35 Merge branch 'save_ext' into progsig-sx
Conflicts:
	source.list
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison c562e7c6fb Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 804cfad053 Add override keywords for tracerestrict GUI code 9 years ago
Jonathan G Rennison d8a8e75bbf Merge branch 'override-keyword' into tracerestrict 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 0b09a7ac61 Add a conditional define for the override keyword.
Use of the override keyword can prevent various types of problems when
the base method signature is changed, but derived overriding methods are
not. This is conditional to maintain compatibility with legacy compilers.
9 years ago
Jonathan G Rennison d99ebb4976 Add tracerestrict SLXI version info and special case loading from
tracerestrict branch without SLXI.
9 years ago
Jonathan G Rennison bda3343107 Merge branch 'save_ext' into tracerestrict-sx
Conflicts:
	src/saveload/saveload.cpp
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 bde094fe01 Initial implementation of SLXI chunk save/load 9 years ago
Jonathan G Rennison a3980dc6ba Move SlRead/SlWrite functions to saveload.h
Add SlGetBytesRead and SlGetBytesWritten functions.
9 years ago
Jonathan G Rennison 4508cfbf93 Add format-style versions of SlError and SlErrorCorrupt. 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
frosch 4eb6ce863a (svn r27354) -Fix (r27343): Actually make it work. (rubidium) 9 years ago
translators 66418db43e (svn r27352) -Update from WebTranslator v3.0:
catalan - 134 changes by juanjo
9 years ago
translators 18e7b67864 (svn r27347) -Update from WebTranslator v3.0:
slovenian - 15 changes by matej1245
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
Jonathan G Rennison 2c5bfc5486 Merge branch 'master' into tracerestrict 9 years ago
Jonathan G Rennison 9fc308b70e Update land info window to indicate if signal tile is restricted. 9 years ago
alberth 67366cf03d (svn r27346) -Feature: Make the object placement gui an independent window. 9 years ago
alberth e36a82c3e6 (svn r27345) -Fix-ish: Hide selected view if no object selected. 9 years ago
alberth b1f1647303 (svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions. 9 years ago
Jonathan G Rennison 5474ee3e40 Add entry direction condition variable. 9 years ago
Jonathan G Rennison 3dd51e96b8 Bulk documentation update, and a few style fixes. 9 years ago
Jonathan G Rennison 75869cae41 Add train can carry cargo condition variable. 9 years ago
Jonathan G Rennison 3a7a81e02f Add GUI support for else if, or if and else blocks.
Add another drop-down to change between these.
Opening if blocks cannot be converted to/from these.
9 years ago
Jonathan G Rennison fedf618978 Add last visited station condition. 9 years ago
Jonathan G Rennison 2296fc85e6 Add next order condition variable. 9 years ago
Jonathan G Rennison ffed0c194a Add current order (station, waypoint or depot) condition variable.
Adjust item bit allocations:
* Increase cond flags from 2 bits to 3 bits, for future expansion.
* Use 2 bits remaining in adjacent gap for an auxiliary type field.
  This is used for the type (station, waypoint, etc.) of order tests.
Perform a linear scan of the program pool when deleting a station,
waypoint or depot.
9 years ago
Jonathan G Rennison 0be3b053d5 Add maximum train speed condition variable. 9 years ago
Jonathan G Rennison 627288277e Implement reset, copy, share and unshare of trace restrict programs.
Add documentation on data storage model, wrt lookup, mapping and sharing.
9 years ago
Jonathan G Rennison 5f1b148cf9 Initial minimal working tracerestrict implementation.
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
frosch 13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 9 years ago
frosch 730c2177bf (svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite. 9 years ago
frosch bd50600f5b (svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding. 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
translators 932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0:
frisian - 42 changes by BAJansen
9 years ago
translators 55c177c26d (svn r27338) -Update from WebTranslator v3.0:
frisian - 8 changes by BAJansen
9 years ago
translators f6a3faf927 (svn r27337) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by Gavin
9 years ago
translators 28f9637aed (svn r27336) -Update from WebTranslator v3.0:
greek - 36 changes by Jubilee
9 years ago
translators 28e885dd51 (svn r27335) -Update from WebTranslator v3.0:
greek - 24 changes by Jubilee
9 years ago
frosch 80df194341 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 9 years ago
translators 99ed8df797 (svn r27333) -Update from WebTranslator v3.0:
greek - 7 changes by Jubilee
9 years ago
frosch 86825a745c (svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2. 9 years ago
frosch 2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 9 years ago
frosch f16fc69e95 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 9 years ago
frosch 04e9978f1f (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 9 years ago
frosch fc902d354f (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 9 years ago
translators d25934580f (svn r27327) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
translators 81ec32199f (svn r27326) -Update from WebTranslator v3.0:
simplified_chinese - 6 changes by Gavin
9 years ago
translators b50eddaea2 (svn r27325) -Update from WebTranslator v3.0:
catalan - 4 changes by juanjo
9 years ago
frosch d1c2eae95d (svn r27324) -Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines. (noticed by adf88) 9 years ago
frosch e55f1adfa8 (svn r27323) -Fix: Spelling. 9 years ago