dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,626 Commits 1 Branch 0 Tags
26fb0940c6e2b9866d3eefd619eebc08c8fa3d99
Commit Graph

1230 Commits

Author SHA1 Message Date
Jonathan G Rennison
e03d97eab6 Improved breakdowns: Fix string parameter count issues. 
Fix whitespace.
 2016-01-31 23:24:17 +00:00
Jonathan G Rennison
5eed9865d6 Improved breakdowns: Various changes and fixes. 
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
  from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
  modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
  has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
  is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
 2016-01-31 22:55:25 +00:00
Jonathan G Rennison
2c9029703b Add menu item to vehicle list to change order target. 
Allow moving depot/station/waypoint orders to a different depot/etc.
 2016-01-27 20:02:35 +00:00
Jonathan G Rennison
9826c2481e Merge branch 'order_occupancy-sx' into jgrpp 2016-01-24 02:52:05 +00:00
Jonathan G Rennison
2955610575 Add order occupancy average. 
Show overall average instead of % char in toggle button.
Add a sort mode.
 2016-01-24 02:51:40 +00:00
Jonathan G Rennison
b51dd34fe4 Merge branch 'lifetime_profit-sx' into jgrpp 
Conflicts:
	src/saveload/afterload.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/vehicle_gui.cpp
 2016-01-01 15:04:54 +00:00
Jonathan G Rennison
179e6df800 Change lifetime profit display string to avoid breaking translations. 2016-01-01 14:46:21 +00:00
patch-import
71be17729e Import vehicle lifetime profit patch v3 
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
 2016-01-01 13:35:29 +00:00
Jonathan G Rennison
6075dd22e2 Show small square if vehicle owner does not match list owner. 
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
 2015-11-20 23:55:02 +00:00
patch-import
0823f58ddc Original patch from McZapkie 2015-11-19 19:27:10 +00:00
Jonathan G Rennison
ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-18 23:33:00 +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
ba955956cb (svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable. 2015-10-30 17:27:21 +00:00
frosch
0974f5489b (svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable. 2015-10-30 17:27:21 +00:00
Jonathan G Rennison
5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp 
Conflicts:
	src/table/settings.ini
 2015-08-30 17:10:19 +01:00
Jonathan G Rennison
5a07315405 Add train length and group name to vehicle details window. 
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
 2015-08-30 17:09:43 +01:00
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
 2015-08-06 23:11:49 +01: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
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
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
 2015-08-05 21:25:13 +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
80d52eb20e Improved breakdowns patch: fix various issues 
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
 2015-08-02 23:00:39 +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
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138
0889145dc5 (svn r27024) -Codechange: Adjust spacing on small order list. 2014-10-18 16:12:48 +00:00
peter1138
f5d964bdbd (svn r27024) -Codechange: Adjust spacing on small order list. 2014-10-18 16:12:48 +00:00
rubidium
890f50d491 (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 2014-10-14 11:23:41 +00:00
rubidium
a72dd0480c (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 2014-10-14 11:23:41 +00:00
peter1138
6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
f7f49c15a3 (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 2014-10-04 16:40:23 +00:00
peter1138
ce9fab58bc (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 2014-10-04 16:40:23 +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
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 2014-04-23 20:13:33 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
1f067c8529 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 2013-11-11 18:58:15 +00:00
rubidium
be4355edd3 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 2013-11-11 18:58:15 +00:00
alberth
0df874d18d (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 2013-10-01 20:35:06 +00:00
alberth
999e76d305 (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 2013-10-01 20:35:06 +00:00
alberth
03f2d5ded7 (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 2013-10-01 20:22:38 +00:00
alberth
26dbdafeed (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 2013-10-01 20:22:38 +00:00
alberth
736359623b (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 2013-10-01 20:16:44 +00:00
alberth
5437a588a0 (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 2013-10-01 20:16:44 +00:00
frosch
de8a325d6e (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 2013-06-30 14:38:45 +00:00
frosch
f128c61595 (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 2013-06-30 14:38:45 +00:00
frosch
2967eb8749 (svn r25541) -Cleanup: No need to clear a bit which is never set. 2013-06-30 14:38:20 +00:00
frosch
c640289d7f (svn r25541) -Cleanup: No need to clear a bit which is never set. 2013-06-30 14:38:20 +00:00