dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,279 Commits 1 Branch 0 Tags
376a45d9fc475c7b67b65e41f42bf9daadc9d376
Commit Graph

520 Commits

Author SHA1 Message Date
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
 2015-08-06 22:24:28 +01:00
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
 2015-08-05 21:54:11 +01:00
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
 2015-08-05 21:24:30 +01:00
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
 2015-08-04 23:59:12 +01:00
Jonathan G Rennison
0a7441e56c Merge branch 'save_ext' into vehicle_repair_costs-sx 
Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp
 2015-08-04 23:56:05 +01:00
patch-import
7537ae2a7e Import vehicle repair costs patch 
Strip trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
 2015-08-04 23:38:35 +01:00
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
 2015-08-04 22:08:59 +01:00
patch-import
80deb3c01d Import auto timetable separation patch 
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
 2015-08-04 21:27:23 +01:00
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
 2015-08-02 23:43:19 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +01:00
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
 2015-08-02 18:45:32 +01:00
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
 2015-08-02 18:24:45 +01:00
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
 2015-08-02 18:23:25 +01:00
Jonathan G Rennison
0afc054bff Merge branch 'adjacent_crossings-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-02 18:18:41 +01:00
Jonathan G Rennison
09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 2015-08-02 17:49:25 +01:00
Jonathan G Rennison
60377f2262 Merge branch 'master' into town_cargo_adj 
Conflicts:
	src/settings_gui.cpp
 2015-08-02 00:04:04 +01:00
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
 2015-08-01 23:56:58 +01:00
patch-import
59b0b18aa2 Import signals on tunnels and bridges patch 
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
 2015-08-01 20:25:59 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
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.
 2015-08-01 17:06:43 +01:00
rubidium
c017c18c26 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 2014-10-21 16:58:15 +00:00
peter1138
aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 2014-10-12 20:43:25 +00:00
peter1138
2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
frosch
4132e4e7e3 (svn r26986) -Change: Rename 'Advanced Settings' to just 'Settings'. 2014-10-09 21:16:29 +00:00
peter1138
ae22f8ab55 (svn r26959) -Codechange: GUI-scale for settings window. 2014-10-04 20:34:43 +00:00
rubidium
babe50da92 (svn r26886) -Change (r26885): the max height setting belongs more in the limitations section of the settings 2014-09-21 12:35:34 +00:00
rubidium
fa193ece85 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 2014-09-21 12:25:04 +00:00
rubidium
647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 2014-09-21 11:40:11 +00:00
peter1138
657c108d32 (svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button. 2014-09-20 10:23:38 +00:00
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 2014-09-13 13:30:31 +00:00
frosch
ef3ca2047b (svn r26678) -Codechange: Simplify settings widget layout. (Juanjo) 2014-07-08 20:06:45 +00:00
frosch
f8def6184b (svn r26629) -Fix [FS#6012]: If the video driver fails to supply a list of resolutions, display an error message. 2014-06-05 17:14:16 +00:00
frosch
5fd223ae9b (svn r26623) -Codechange: Make SettingsEntry and SettingsPage polymorphic classes. 2014-06-01 12:14:32 +00:00
frosch
202c4ebd40 (svn r26622) -Codechange: Construct settings tree on the heap instead of using static arrays. 2014-06-01 11:51:24 +00:00
frosch
59a49a4483 (svn r26614) -Add: Adv. settings window can handle the autosave setting as well. 2014-05-25 15:02:04 +00:00
frosch
7e359e1b8d (svn r26604) -Add: Most of the mapgen settings to advances settings window. 2014-05-21 18:07:30 +00:00
frosch
90f0ba840f (svn r26536) -Change: Reshuffle advanced settings tree. 2014-04-27 20:52:56 +00:00
frosch
e811c54d1d (svn r26533) -Codechange: Rename some strings 2014-04-27 20:40:52 +00:00
frosch
fffab86525 (svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI. 2014-04-27 15:35:31 +00:00
frosch
9430dfe7fa (svn r26525) -Remove: Screenshot format setting from GUI. 2014-04-27 15:13:46 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
alberth
9c2ba28589 (svn r26322) -Feature: Warn the user about empty setting search results too. 2014-02-09 13:06:35 +00:00
alberth
27849aad18 (svn r26321) -Feature: Warn the user about missing setting search results due to filtering. 2014-02-09 13:05:46 +00:00
alberth
e3583b4cd1 (svn r26320) -Add: Label for both the filter category and filter type in the advanced settings window. 2014-02-09 13:04:50 +00:00
rubidium
4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
frosch
2a71d05478 (svn r25864) -Fix: Use the actual sprite dimensions for sizing the dropdown arrow of dropdown widgets. 2013-10-13 19:18:30 +00:00
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)
 2013-06-29 09:47:18 +00:00
fonsinchen
848ca543a2 (svn r25351) -Add: settings for link graph 2013-06-09 12:56:35 +00:00