Commit Graph

174 Commits

Author SHA1 Message Date
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
52dadc9252 Merge branch 'master' into jgrpp 2017-07-27 18:41:43 +01:00
frosch
b8456196ef (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +00:00
Jonathan G Rennison
e6bbbfc58e Make company finance window max money value non-static. 2017-04-12 17:46:27 +01:00
Jonathan G Rennison
5ba7bf9da7 Fix company finance window being too small when first opened. 2017-04-11 18:59:47 +01:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
patch-import
f820543391 Import give money to company patch
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
2017-03-02 00:09:23 +00:00
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
2017-02-05 20:43:56 +00:00
Jonathan G Rennison
da177d063f Custom bridge heads: Initial implementation 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
2015-10-31 10:53:00 +00:00
frosch
ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
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
2015-08-06 22:55:09 +01:00
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
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138
217635d357 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 2014-09-28 19:19:47 +00:00
peter1138
c2d4068a5e (svn r26856) -Codechange: Ensure company face widgets can fit company face. 2014-09-20 09:18:22 +00:00
frosch
7a6d2e0110 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 2014-04-27 15:30:53 +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
planetmaker
f44d54a9e4 (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 2014-03-18 20:53:34 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
frosch
f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
rubidium
c4719635e9 (svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on 2013-06-29 13:19:19 +00:00
rubidium
45d3369502 (svn r25516) -Codechange: reduce code duplication in infrastructure statistics window 2013-06-29 13:11:52 +00:00
rubidium
0a880b87c3 (svn r25515) -Feature [FS#5595]: right align the infrastructure statistics 2013-06-29 12:41:43 +00:00
rubidium
aa9bf82121 (svn r25442) -Codechange: move height and ascender information into the FontCache instances 2013-06-23 15:32:09 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
rubidium
0f53f270c1 (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 2013-02-04 20:29:38 +00:00
frosch
eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 2012-12-08 17:18:51 +00:00
frosch
3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
alberth
37cda0af25 (svn r24655) -Codechange(r18310): Difference between female and male is no longer needed for tie and earrings (found by botankras) 2012-10-31 20:54:19 +00:00
michi_cc
d78c4d9ee3 (svn r24131) -Add [FS#1952]: Ctrl-Clicking to change colour of all colour schemes at once. (Roest) 2012-04-17 19:43:38 +00:00
michi_cc
7f06f392f7 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 2012-02-11 22:43:39 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
alberth
06597e684c (svn r23704) -Doc: Doxygen comment fixes and additions. 2012-01-01 17:22:32 +00:00
truebrain
000ff60e25 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 2011-12-16 16:27:45 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
rubidium
9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 2011-12-10 13:54:10 +00:00
michi_cc
dc3bd6020e (svn r23428) -Fix (r23415): Initial size of the infrastructure details windows was sometimes too small. 2011-12-04 13:27:24 +00:00
frosch
91f577da3c (svn r23424) -Change: Make the company GUI somewhat smaller if there are no shareholders. 2011-12-04 11:59:08 +00:00
frosch
030483495b (svn r23420) -Change: Put the manager name directly under the picture instead of vertically centering it. 2011-12-04 10:47:57 +00:00
michi_cc
fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 2011-12-03 23:40:46 +00:00
michi_cc
b68ced52c4 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. 2011-12-03 23:40:08 +00:00
rubidium
9e9ea7fa81 (svn r23331) -Fix [FS#4851] (rCS, r148): abort building/moving HQ when clicking on the button again, just like when building rail, stations, etc (sbr) 2011-11-26 12:53:05 +00:00
peter1138
d85e57c8df (svn r23022) -Codechange: Support resized checkbox and square icons in company colour selection window. 2011-10-11 17:32:17 +00:00
frosch
a80d20fdb1 (svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead. 2011-10-03 17:24:31 +00:00
frosch
9340a1d68e (svn r22619) -Fix [FS#4662]: Consider the size of the vehicle sprite for the lineheight in the company GUI. This also makes the widget containing the sprite not skip drawing it, if the bounds of the widget are outside of the drawing area though the sprite actually needs drawing. 2011-07-02 14:37:03 +00:00
frosch
7b251297c9 (svn r22429) -Add: some constants for specific palette colours used in the GUI. 2011-05-06 21:13:29 +00:00
frosch
7cc3d3e143 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 2011-05-04 17:45:16 +00:00