dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,972 Commits 1 Branch 0 Tags
6578d94e6361b56bdc80204fbbcb450742eeba9e
Commit Graph

1473 Commits

Author SHA1 Message Date
Jonathan G Rennison
f0fecda985 Merge branch 'order_occupancy-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
 2015-08-09 23:45:21 +01:00
Jonathan G Rennison
117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average. 
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
 2015-08-09 23:39:55 +01:00
Jonathan G Rennison
15c2327fd4 Merge branch 'master' into auto_timetables 2015-08-09 17:07:41 +01:00
Jonathan G Rennison
9565e5b9b1 Merge branch 'day_length-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
 2015-08-09 13:51:36 +01:00
patch-import
d86a56cbef Import day length patch 
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
 2015-08-09 11:23:15 +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
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
Jonathan G Rennison
938babfe7b Vehicle repair costs patch: whitespace fixes. 2015-08-04 23:39:02 +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
Jonathan G Rennison
33854a138f Merge branch 'save_ext' into auto_timetables-sx 2015-08-04 21:30:30 +01:00
Jonathan G Rennison
0ebf8b6b0b Fixes to auto timetable patch: move new VehicleFlags to end, 
whitespace & style, fix lang strings.
 2015-08-04 21:29:19 +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
e4ccea350b Merge branch 'wait_in_depot-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-03 01:12:16 +01:00
Jonathan G Rennison
2f9ebebf02 Merge branch 'master' into wait_in_depot 2015-08-03 01:06:55 +01:00
Jonathan G Rennison
4d1c4d18be Timetable wait in depot: minor whitespace/style changes. 2015-08-03 01:06:42 +01:00
patch-import
d8c5de188f Import timetabling wait time in depots patch 
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
 2015-08-03 01:06:12 +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
Jonathan G Rennison
d023d0863f Merge branch 'save_ext' into improved_breakdowns-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-02 23:01:56 +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
Jonathan G Rennison
8271acadb7 Merge branch 'show_veh_tunnel' into jgrpp 2015-08-02 18:25:08 +01:00
Jonathan G Rennison
78b2e5babb Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp 2015-08-02 18:17:44 +01:00
patch-import
45b5145396 Add group info patch 
Fix whitespace, add NOSAVE comment in vehicle struct

http://www.tt-forums.net/viewtopic.php?f=33&t=72855
 2015-08-02 12:35:18 +01:00
Jonathan G Rennison
5e7638a6d0 Port of old vehicles visible in tunnels patch 
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
 2015-07-30 00:32:55 +01:00
planetmaker
da9a1d0c14 (svn r27222) -Fix [FS#6278]: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles. 2015-04-09 18:17:43 +00:00
planetmaker
55f42eaa1f (svn r27222) -Fix [FS#6278]: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles. 2015-04-09 18:17:43 +00:00
frosch
891e4c40ce (svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty. 2015-02-14 12:53:07 +00:00
frosch
2e1be6081d (svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty. 2015-02-14 12:53:07 +00:00
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 2014-09-20 15:31:26 +00:00
rubidium
6c2abf0930 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 2014-09-20 15:31:26 +00:00
frosch
5853f9c714 (svn r26756) -Fix (r26747): Ground vehicle breakdown smoke was not supposed to be available yet, since it is a looping animation. 2014-08-23 13:31:20 +00:00
frosch
52fd95915a (svn r26756) -Fix (r26747): Ground vehicle breakdown smoke was not supposed to be available yet, since it is a looping animation. 2014-08-23 13:31:20 +00:00
frosch
c6cd861997 (svn r26755) -Fix (r26747) [FS#6093]: Silence MSVC warning. 2014-08-23 10:44:32 +00:00
frosch
17872c8be1 (svn r26755) -Fix (r26747) [FS#6093]: Silence MSVC warning. 2014-08-23 10:44:32 +00:00
frosch
e704ab3921 (svn r26747) -Feature: [NewGRF] Advanced visual effects with multiple effect sprites independent of spawning model. 2014-08-17 14:53:11 +00:00
frosch
c30e137685 (svn r26747) -Feature: [NewGRF] Advanced visual effects with multiple effect sprites independent of spawning model. 2014-08-17 14:53:11 +00:00
frosch
156fed1b61 (svn r26746) -Codechange: Separate enums for visual effect type and spawning model. 2014-08-17 14:52:48 +00:00
frosch
17e88d644a (svn r26746) -Codechange: Separate enums for visual effect type and spawning model. 2014-08-17 14:52:48 +00:00
frosch
07077c2088 (svn r26745) -Codechange: Deduplicate calls to CreateEffectVehicleRel for vehicle visual effects. 2014-08-17 14:52:32 +00:00
frosch
d263fcce82 (svn r26745) -Codechange: Deduplicate calls to CreateEffectVehicleRel for vehicle visual effects. 2014-08-17 14:52:32 +00:00
rubidium
498556d6ce (svn r26706) -Fix [FS#6015] (r20644): wrong breakdown sound was played for ships 2014-07-27 18:16:03 +00:00