dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,343 Commits 1 Branch 0 Tags
f0fecda985ad440037adc65f5a20988458b99214
Commit Graph

22343 Commits

This Branch
This Branch
All Branches
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
fdce64ddae Save/load changes for order occupancy 2015-08-09 23:43:55 +01:00
Jonathan G Rennison
52c07d1f51 Merge branch 'save_ext' into order_occupancy-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-09 23:40:25 +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
bd10b0fb0b Merge branch 'departure-boards-sx' into jgrpp 2015-08-09 17:11:17 +01:00
Jonathan G Rennison
365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 2015-08-09 17:11:11 +01:00
Jonathan G Rennison
d5f9709c56 Merge branch 'departure-boards' into departure-boards-sx 2015-08-09 17:09:06 +01:00
Jonathan G Rennison
1795fb5953 Fix departure boards with orders with timetabled 0 travel times, 
e.g. those with depot service orders.
 2015-08-09 17:08:57 +01:00
Jonathan G Rennison
346cebab43 Merge branch 'master' into departure-boards 2015-08-09 17:08:45 +01:00
Jonathan G Rennison
f820bbe0c5 Merge branch 'auto_timetables' into auto_timetables-sx 2015-08-09 17:08:26 +01:00
Jonathan G Rennison
d24f7763cc Fix auto timetable separation to handle non-station orders sensibly. 2015-08-09 17:07:50 +01:00
Jonathan G Rennison
34e41a2e26 Timetable GUI: Allow clearing of timetable time fields which are at 0. 
Allow explicitly setting timetable time fields to 0 without clearing them.
 2015-08-09 17:07:46 +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
Jonathan G Rennison
41062cf78e Save/load changes for variable day length patch. 2015-08-09 13:50:06 +01:00
Jonathan G Rennison
454b3c61b0 Merge branch 'save_ext' into day_length-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-09 12:10:05 +01:00
Jonathan G Rennison
45d060f46f Day length patch: minor tweak to timetable lateness calculation. 
_date_fract should also be multiplied by day length factor.
 2015-08-09 12:07:57 +01:00
Jonathan G Rennison
d70dbda351 Merge branch 'master' into day_length 2015-08-09 12:04:23 +01:00
Jonathan G Rennison
e0bc6e0cf6 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-09 11:57:32 +01:00
Jonathan G Rennison
a48652ac6f Merge branch 'save_ext' into tracerestrict-sx 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
 2015-08-09 11:57:09 +01:00
Jonathan G Rennison
316b3a4acc Merge branch 'master' into save_ext 2015-08-09 11:24:06 +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
translators
a9200aa69a (svn r27364) -Update from WebTranslator v3.0: 
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
 2015-08-08 17:45:27 +00:00
alberth
894f69e1fd (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 2015-08-08 13:19:38 +00:00
alberth
48485a6a5a (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 2015-08-08 10:06:24 +00:00
rubidium
bc199a4fe1 (svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier 2015-08-08 08:54:49 +00:00
rubidium
501ee2105a (svn r27360) -Feature: allow configuring pkg-config in one go for all libraries 2015-08-08 08:52:21 +00:00
Jonathan G Rennison
135d159fc1 Merge branch 'infrastructure_sharing-sx' into jgrpp 2015-08-07 22:02:59 +01:00
Jonathan G Rennison
e1defe24c7 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 
Conflicts:
	src/table/settings.ini
 2015-08-07 22:02:38 +01:00
Jonathan G Rennison
65b1586f98 Infra sharing: Fix sharing fee settings not being shown as currency. 
Settings were shown as (invalid string).
Fix water/dock sharing fee setting using wrong string.
 2015-08-07 22:01:16 +01:00
Jonathan G Rennison
6c971f9a55 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-07 21:31:05 +01:00
Jonathan G Rennison
8386cc3c1b Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-08-07 21:30:50 +01:00
Jonathan G Rennison
5540374227 Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode. 
Don't use water tile accessors on aqueduct bridge heads.
 2015-08-07 21:30:33 +01:00
Jonathan G Rennison
6d6d2f2f0a Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp 2015-08-07 20:38:58 +01:00
Jonathan G Rennison
bde8f04f73 Town rating label: Fix viewport tiny strings having wrong colour for 
"very good" and "excellent" ratings.
 2015-08-07 20:34:46 +01:00
Jonathan G Rennison
b7f1019dc7 Merge branch 'master' into town-rating-label 
Conflicts:
	src/town_cmd.cpp
 2015-08-07 20:30:56 +01:00
Jonathan G Rennison
84f9274640 Merge branch 'save_ext' into departure-boards-sx 2015-08-07 20:17:08 +01:00
Jonathan G Rennison
0055e283f1 Merge branch 'save_ext' into improved_breakdowns-sx 2015-08-07 20:16:35 +01:00
Jonathan G Rennison
2f8d330307 Merge branch 'save_ext' into infrastructure_sharing-sx 2015-08-07 20:16:19 +01:00
Jonathan G Rennison
e30d7c2164 Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame(). 2015-08-07 20:12:25 +01:00
translators
f95759139b (svn r27359) -Update from WebTranslator v3.0: 
swedish - 1 changes by planetmaker
 2015-08-07 17:45:12 +00: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
b3ebb1f729 Infrastructure sharing patch: save/load changes. 2015-08-06 23:02:47 +01:00
Jonathan G Rennison
037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-06 23:01:01 +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
44ed3cb3bd Merge branch 'town-rating-label' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/town_cmd.cpp
 2015-08-06 01:25:11 +01:00
patch-import
33d395ad59 Import town rating label patch 
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
 2015-08-06 00:19:40 +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
44d3c84a11 Save/load changes for enhanced viewport patch: plans. 2015-08-05 21:33:47 +01:00