Commit Graph

429 Commits (5b7db9d849df52c7144434ed57ff5664572d6eac)

Author SHA1 Message Date
Jonathan G Rennison 54494a0a7c Merge branch 'send_money_company' into jgrpp 7 years ago
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
7 years ago
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
7 years ago
Jonathan G Rennison da177d063f Custom bridge heads: Initial implementation 7 years ago
Jonathan G Rennison 8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
9 years ago
frosch ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 9 years ago
frosch 2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 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
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 9 years ago
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 9 years ago
peter1138 217635d357 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 10 years ago
peter1138 58458c6652 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 10 years ago
peter1138 c2d4068a5e (svn r26856) -Codechange: Ensure company face widgets can fit company face. 10 years ago
peter1138 ea33b69798 (svn r26856) -Codechange: Ensure company face widgets can fit company face. 10 years ago
frosch 7a6d2e0110 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 10 years ago
frosch 2a16c33461 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 10 years ago
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 10 years ago
rubidium 0463dbdc9e (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 10 years ago
planetmaker f44d54a9e4 (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 10 years ago
planetmaker 3dd1a6ad2d (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 10 years ago
rubidium 201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
rubidium 83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
frosch f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
frosch 98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
rubidium c4719635e9 (svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on 11 years ago
rubidium 4356510408 (svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on 11 years ago
rubidium 45d3369502 (svn r25516) -Codechange: reduce code duplication in infrastructure statistics window 11 years ago
rubidium ba1e42d057 (svn r25516) -Codechange: reduce code duplication in infrastructure statistics window 11 years ago
rubidium 0a880b87c3 (svn r25515) -Feature [FS#5595]: right align the infrastructure statistics 11 years ago
rubidium c27ce651c9 (svn r25515) -Feature [FS#5595]: right align the infrastructure statistics 11 years ago
rubidium aa9bf82121 (svn r25442) -Codechange: move height and ascender information into the FontCache instances 11 years ago
rubidium d724088a1c (svn r25442) -Codechange: move height and ascender information into the FontCache instances 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
rubidium 0f53f270c1 (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 11 years ago
rubidium 99a08e1e8c (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 11 years ago
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
alberth 37cda0af25 (svn r24655) -Codechange(r18310): Difference between female and male is no longer needed for tie and earrings (found by botankras) 12 years ago
alberth f883454db2 (svn r24655) -Codechange(r18310): Difference between female and male is no longer needed for tie and earrings (found by botankras) 12 years ago
michi_cc d78c4d9ee3 (svn r24131) -Add [FS#1952]: Ctrl-Clicking to change colour of all colour schemes at once. (Roest) 12 years ago
michi_cc 32ab630bda (svn r24131) -Add [FS#1952]: Ctrl-Clicking to change colour of all colour schemes at once. (Roest) 12 years ago
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. 12 years ago
michi_cc 0542e26460 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 12 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
alberth 06597e684c (svn r23704) -Doc: Doxygen comment fixes and additions. 13 years ago
alberth 4af8c2d5e1 (svn r23704) -Doc: Doxygen comment fixes and additions. 13 years ago
truebrain 000ff60e25 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 13 years ago
truebrain e9f584ac21 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 13 years ago
truebrain 49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
truebrain 2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
rubidium 9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
rubidium 58423b26d1 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
michi_cc dc3bd6020e (svn r23428) -Fix (r23415): Initial size of the infrastructure details windows was sometimes too small. 13 years ago
michi_cc 6711026011 (svn r23428) -Fix (r23415): Initial size of the infrastructure details windows was sometimes too small. 13 years ago
frosch 91f577da3c (svn r23424) -Change: Make the company GUI somewhat smaller if there are no shareholders. 13 years ago
frosch 1f9f73d2b6 (svn r23424) -Change: Make the company GUI somewhat smaller if there are no shareholders. 13 years ago
frosch 030483495b (svn r23420) -Change: Put the manager name directly under the picture instead of vertically centering it. 13 years ago
frosch 51da427dae (svn r23420) -Change: Put the manager name directly under the picture instead of vertically centering it. 13 years ago
michi_cc fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
michi_cc d3b7b89493 (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
michi_cc b68ced52c4 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. 13 years ago
michi_cc 6083d6ffb4 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. 13 years ago
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) 13 years ago
rubidium a9bdd04072 (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) 13 years ago
peter1138 d85e57c8df (svn r23022) -Codechange: Support resized checkbox and square icons in company colour selection window. 13 years ago
peter1138 279c651a4d (svn r23022) -Codechange: Support resized checkbox and square icons in company colour selection window. 13 years ago
frosch a80d20fdb1 (svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead. 13 years ago
frosch 1a12008fcf (svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead. 13 years ago
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. 13 years ago
frosch 1bc1a42ea5 (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. 13 years ago
frosch 7b251297c9 (svn r22429) -Add: some constants for specific palette colours used in the GUI. 13 years ago
frosch 5e449b8fae (svn r22429) -Add: some constants for specific palette colours used in the GUI. 13 years ago
frosch 7cc3d3e143 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 13 years ago
frosch 22286bd7b6 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 13 years ago
rubidium d946841eff (svn r22413) -Document: even more stuff 13 years ago
rubidium ff143c6708 (svn r22413) -Document: even more stuff 13 years ago
terkhen a88fe7c2aa (svn r22343) -Change: Remove pixel limiter for query strings. 13 years ago
terkhen 10caf391a1 (svn r22343) -Change: Remove pixel limiter for query strings. 13 years ago
frosch 4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
frosch ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
rubidium dd618051a7 (svn r21412) -Codechange: limit company name by amount of characters, not bytes 14 years ago
rubidium cf61c2f11f (svn r21412) -Codechange: limit company name by amount of characters, not bytes 14 years ago
rubidium 83535a52ea (svn r21408) -Codechange: limit president name by amount of characters, not bytes 14 years ago
rubidium 9a18050646 (svn r21408) -Codechange: limit president name by amount of characters, not bytes 14 years ago
alberth 0722492c1b (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 14 years ago
alberth f5c6fd1a25 (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 14 years ago
rubidium 5ec2bcc0d9 (svn r21157) -Codechange: remove information about the text direction out of the language "list" 14 years ago
rubidium 30637a8340 (svn r21157) -Codechange: remove information about the text direction out of the language "list" 14 years ago
smatz 548a3747e9 (svn r20860) -Cleanup: remove some unused functions and variables 14 years ago
smatz 77fe95f552 (svn r20860) -Cleanup: remove some unused functions and variables 14 years ago
frosch 1596b35ac1 (svn r20849) -Change: Only display liveries in the liverywindow if they are used by some vehicle somewhen (not considering date or such). 14 years ago
frosch 717fcd09c6 (svn r20849) -Change: Only display liveries in the liverywindow if they are used by some vehicle somewhen (not considering date or such). 14 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
frosch ba8d961664 (svn r20470) -Codechange: Make arrow buttons lower and raise like other buttons when clicked. 14 years ago
frosch d496ec65b9 (svn r20470) -Codechange: Make arrow buttons lower and raise like other buttons when clicked. 14 years ago
rubidium 1f2276b785 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 14 years ago
rubidium 3da3d131c6 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 14 years ago
alberth 2157341f90 (svn r20390) -Codechange: Move company vehicle counting to vehicle.cpp. 14 years ago
alberth e0e66b6ed0 (svn r20390) -Codechange: Move company vehicle counting to vehicle.cpp. 14 years ago
rubidium 7fe695dc28 (svn r20328) -Codechange: unify the unmovable related commands and make building lighthouses/transmitters actually happen via a command 14 years ago
rubidium 49cee72fa4 (svn r20328) -Codechange: unify the unmovable related commands and make building lighthouses/transmitters actually happen via a command 14 years ago
frosch 5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
rubidium 8c85b4ce3d (svn r20281) -Codechange: unify case scope closure + break coding style 14 years ago
rubidium e356cb9405 (svn r20281) -Codechange: unify case scope closure + break coding style 14 years ago
terkhen c92b2e9d3c (svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH). 14 years ago
terkhen 88ca183191 (svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH). 14 years ago
alberth c2a871d10b (svn r20043) -Codechange: Introduce vertical alignment for DrawStringMultiLine(). 14 years ago
alberth 22b9bc5157 (svn r20043) -Codechange: Introduce vertical alignment for DrawStringMultiLine(). 14 years ago
yexo df1036f948 (svn r20012) -Fix: when joining a company with a password you could only enter 20 characters of the password 14 years ago
yexo 9683b87466 (svn r20012) -Fix: when joining a company with a password you could only enter 20 characters of the password 14 years ago
rubidium a70fd540fc (svn r19814) -Codechange: give some more unnamed enums a name, in case they consisted of unrelated values use static const (u)int 14 years ago
rubidium 062dd0e24c (svn r19814) -Codechange: give some more unnamed enums a name, in case they consisted of unrelated values use static const (u)int 14 years ago
smatz 5504b1105e (svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit 14 years ago
smatz f051066bc4 (svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit 14 years ago
rubidium a7a2568985 (svn r19090) -Codechange: some comment coding style fixes 14 years ago
rubidium 7a73a7490d (svn r19090) -Codechange: some comment coding style fixes 14 years ago
frosch 94a5c917a5 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 15 years ago
frosch 88019e64e1 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 15 years ago
rubidium 7127338414 (svn r18872) -Codechange: introduce PaletteID and use it 15 years ago
rubidium f94c83a387 (svn r18872) -Codechange: introduce PaletteID and use it 15 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
yexo 152f11e730 (svn r18729) -Fix [FS#3427]: the lock in the company gui was only drawn for your own company 15 years ago
yexo fa23617380 (svn r18729) -Fix [FS#3427]: the lock in the company gui was only drawn for your own company 15 years ago
alberth 31c6f6b706 (svn r18664) -Fix [FS#3449]: Unshade shaded finances window when toggling size. 15 years ago
alberth ba3ef1a2d5 (svn r18664) -Fix [FS#3449]: Unshade shaded finances window when toggling size. 15 years ago
rubidium b13747514c (svn r18652) -Fix: glitches due to having the wrong bounding boxes for the face widgets 15 years ago
rubidium 454e124912 (svn r18652) -Fix: glitches due to having the wrong bounding boxes for the face widgets 15 years ago
alberth e967f04123 (svn r18606) -Codechange: Introduce several forms of zero-size stacked display planes. 15 years ago
alberth 3323d64f28 (svn r18606) -Codechange: Introduce several forms of zero-size stacked display planes. 15 years ago
alberth caa73efe93 (svn r18605) -Codechange: Coding style fixes, prevent useless calls to UpdateWidgetSize(). 15 years ago
alberth 7dbc77a1e7 (svn r18605) -Codechange: Coding style fixes, prevent useless calls to UpdateWidgetSize(). 15 years ago
alberth 0e9dac92d2 (svn r18588) -Feature [FS#2943]: Add shading and unshading of windows. 15 years ago
alberth 91872aca48 (svn r18588) -Feature [FS#2943]: Add shading and unshading of windows. 15 years ago
rubidium 32b86b23b5 (svn r18447) -Change: make some more windows (e.g. graphs, company view) stickyable 15 years ago
rubidium ac4ef286f4 (svn r18447) -Change: make some more windows (e.g. graphs, company view) stickyable 15 years ago
alberth e1e86b872c (svn r18346) -Codechange: Compute size of face part display buttons only once in face window. 15 years ago
alberth bb19a2e757 (svn r18346) -Codechange: Compute size of face part display buttons only once in face window. 15 years ago
alberth 8ce12572a8 (svn r18337) -Codechange: Remove 2x2 {SKIP} in the company finances window + strings. 15 years ago
alberth 548f47af58 (svn r18337) -Codechange: Remove 2x2 {SKIP} in the company finances window + strings. 15 years ago
rubidium da30e736ca (svn r18330) -Cleanup: remove some unneeded includes 15 years ago