174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
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
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
6bb8d5087d
Vehicle repair costs patch: implement save/load changes.
9 years ago
0a7441e56c
Merge branch 'save_ext' into vehicle_repair_costs-sx
...
Conflicts:
src/saveload/saveload.cpp
src/settings_gui.cpp
9 years ago
7537ae2a7e
Import vehicle repair costs patch
...
Strip trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
9 years ago
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
2e45dac18a
Auto timetables patch: save/load changes, document rationale for
...
moving addition to VehicleFlags
9 years ago
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
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
e91d0e49dc
Improved breakdowns: Update save/load code
9 years ago
d023d0863f
Merge branch 'save_ext' into improved_breakdowns-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
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
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
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
0afc054bff
Merge branch 'adjacent_crossings-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
09be8afd8d
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
9 years ago
08dc95fea1
Add town cargo patch SLXI/PATX code.
...
Update setting string.
9 years ago
9905e478d4
Merge branch 'save_ext' into town_cargo_adj-sx
9 years ago
60377f2262
Merge branch 'master' into town_cargo_adj
...
Conflicts:
src/settings_gui.cpp
9 years ago
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
09aa29de8b
Add signals on bridges/tunnels SLXI info, move setting to PATX.
9 years ago
00f9f75d34
Merge branch 'save_ext' into departure-boards-sx
9 years ago
526cb42608
Merge branch 'master' into depature-boards
...
Conflicts:
src/table/strgen_tables.h
9 years ago
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
79138de1b9
Import departure boards patch
9 years ago
de14c210db
Add progsigs info to SLXI chunk, move setting to PATX chunk.
9 years ago
b1d8bcfe35
Merge branch 'save_ext' into progsig-sx
...
Conflicts:
source.list
src/saveload/saveload.cpp
9 years ago
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
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
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
9b946e3bf2
(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)
9 years ago
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
10 years ago
04b8fe6d0b
(svn r27151) -Add: Allow changing max heightlevel in scenario editor.
10 years ago
3d37abf802
(svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels.
10 years ago
0efe811f74
(svn r27009) -Add: extra level of general map heightness (ChillCore)
10 years ago
2655de52d7
(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.
10 years ago
fa193ece85
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
10 years ago
647a3c8e5f
(svn r26882) -Feature: allow limiting the height of bridges (ic111)
10 years ago
ab3660278a
(svn r26880) -Add: stub settings for limiting bridge and map height
10 years ago
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
59a49a4483
(svn r26614) -Add: Adv. settings window can handle the autosave setting as well.
10 years ago
7e359e1b8d
(svn r26604) -Add: Most of the mapgen settings to advances settings window.
10 years ago
fffab86525
(svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI.
10 years ago
193a20d260
(svn r26323) -Fix: update some constants related to map size.
11 years ago
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
74d3f05fe2
(svn r25507) -Cleanup: double definition
11 years ago
7b2f8a885e
(svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI
11 years ago
848ca543a2
(svn r25351) -Add: settings for link graph
11 years ago
7aa0712644
(svn r25072) -Codechange: Don't require the custom currency to be the last defined one
11 years ago
0f53f270c1
(svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled
12 years ago
dbaad927d7
(svn r24899) -Fix [FS#5434]: Also the station build window needs redrawing when the station spread changes (based on patch by juanjo)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
888df85a3a
(svn r24845) -Add: News ticker sound setting to adv. settings window.
12 years ago
7577ee2340
(svn r24844) -Add: News display settings to adv. settings window.
12 years ago
11bb1086bd
(svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow)
12 years ago
a90bc800e8
(svn r24792) -Add: Readd difficulty settings to advanced settings unless they are already present in other settings windows.
12 years ago
76fef0843c
(svn r24790) -Remove: Classic difficulty profiles.
12 years ago
9ef1c5f4c3
(svn r24789) -Add: Separate setting to control the default settings of newly added scripts and random AIs.
12 years ago
18b97fa062
(svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow)
12 years ago
7bba04866d
(svn r24672) -Add [FS#5356]: Remember the basic/advanced/expert filter selection.
12 years ago
b4c70a51da
(svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow)
12 years ago
ac99094c91
(svn r24590) -Feature: More options for the auto-scroll setting. (adf88)
12 years ago
7fe756fefa
(svn r24270) -Add: Missing descriptions for adv. settings.
12 years ago
92ebd22e85
(svn r24235) -Add: Add help-strings for the settings in the advanced settings window.
12 years ago
cc6b16a4c1
(svn r24234) -Add: Add help-string infrastructure to the ini files
12 years ago
0c80091daa
(svn r24209) -Cleanup: Remove now unused SGF_NOCOMMA value.
12 years ago
f19bc87520
(svn r24206) -Codechange: Move colouring of advanced setting options to the drawing code.
12 years ago
70b2c96c8b
(svn r24194) -Change: Rename the 'signal_side' setting to 'train_signal_side', and add a third option while doing so.
12 years ago
f0b2de579f
(svn r24191) -Fix: If you consider a settings to potentially cause desyncs via NewGRFs and thus disallow changing it in network games, you should probably also sync it to clients.
12 years ago
07f32df363
(svn r24134) -Add: Configurable limits for tree planting.
12 years ago
88cfe6fc9c
(svn r24129) -Feature [FS#3660]: Option to minimise signal distance when dragging over obstacles. (adf88)
12 years ago
0cbc88a1db
(svn r23895) -Revert (r23888): Broken and not even needed anymore in the container format 2 implementation that was committed.
13 years ago
bf7ddd57ea
(svn r23888) -Change: Move the min/max zoom settings to the "misc" section so they are valid before sprites are loaded.
13 years ago
578c3218b0
(svn r23769) -Codechange: make the lag/join start timeouts configurable as well
13 years ago
f6329bf87e
(svn r23764) -Fix [FS#4955]: make default timeouts for certain states lower and configurable
13 years ago
91843ef9ad
(svn r23497) -Add: Advanced display setting to control the linewidth in graphs. (ChillCore)
13 years ago
b92c6ae0b7
(svn r23422) -Fix [FS#4863] (r22797): the default palette setting wasn't applied correctly anymore as the configuration file is loaded after the first NewGRF scan
13 years ago
fc8633e1ac
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
36c06f639a
(svn r23387) -Fix: move ai.script_max_opcode_till_suspend to script.script_max_opcode_till_suspend
13 years ago
b84174fd4d
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
13 years ago
782aee3c2a
(svn r23314) -Add: Add settings to restrict viewport zoom levels.
13 years ago
08efac8549
(svn r23303) -Add: economy.fund_buildings, to disallow funding buildings
13 years ago
896fa9ddf1
(svn r23223) -Codechange: store the last newgrf count in the misc section
13 years ago
41e9da2420
(svn r23169) -Feature: [NoAI] AICONFIG_AI_DEVELOPER flags to hide AI settings unless gui.ai_developer_tools is enabled (Zuu)
13 years ago
15f287d428
(svn r23085) -Fix (r23084): SLE_UINT8 might have been the old type, it's not the same as the length of the variable
13 years ago
41223c8bc9
(svn r23084) -Codechange: get rid of a redundant variable
13 years ago
cac4c2df20
(svn r22807) -Feature-ish: show a message about missing strings in the intro window if a certain (configurable) threshold has been reached and its not a stable release
13 years ago
cc6e55a246
(svn r22797) -Add: progress bar for scanning NewGRFs
13 years ago
56fedc4db9
(svn r22767) -Add: river generation
13 years ago
ad541cb188
(svn r22417) -Add: an advanced setting to specify the default palette to use for NewGRFs without action 14 palette information; this makes the default choice independent from the used base graphics and '-i' option.
13 years ago
75137872d1
(svn r22352) -Change: make YAPF the default pathfinder for ships, don't discourage players from using it
13 years ago
77c8367b93
(svn r22233) -Fix (r22210): value strings for command-pause-level were not shown correctly
14 years ago
b802a7fb77
(svn r22219) -Codechange: Unduplicate npf/yapf strings.
14 years ago
380b2cdc2b
(svn r22217) -Codechange: Unduplicate horizontal positioning strings.
14 years ago
3738a94f98
(svn r22215) -Codechange: Unduplicate original/realistic strings.
14 years ago
Jonathan G Rennison
patch-import
alberth
frosch
rubidium
peter1138
planetmaker
fonsinchen
michi_cc
truebrain
yexo
smatz