Jonathan G Rennison
b3f49672ec
Change default for cargo recalc interval not scaled by day length, to true.
2017-01-21 00:20:25 +00:00
Jonathan G Rennison
1ff60c44bf
Increase max vehicle-type unit setting limits.
2017-01-15 01:32:13 +00:00
Jonathan G Rennison
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
2016-12-26 15:38:56 +00:00
Jonathan G Rennison
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
2016-12-26 15:35:01 +00:00
Jonathan G Rennison
56f173e15e
Merge branch 'master' into save_ext
2016-12-26 15:26:08 +00:00
frosch
9145e5d2b5
(svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type.
2016-12-23 13:38:50 +00:00
frosch
124f386fd1
(svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries.
2016-12-22 20:47:40 +00:00
Jonathan G Rennison
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
2016-11-25 23:24:41 +00:00
Jonathan G Rennison
f5212b27e4
Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1.
2016-11-25 23:12:23 +00:00
Jonathan G Rennison
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
2016-11-20 01:49:10 +00:00
Jonathan G Rennison
10ae23d3b9
Merge branch 'departure-boards' into jgrpp
...
VehicleListIdentifier API changes.
# Conflicts:
# src/departures.cpp
# src/vehicle_gui.cpp
2016-11-11 18:46:15 +00:00
Jonathan G Rennison
31b2a39d02
Merge branch 'save_ext' into departure-boards
...
Adjust calls to GenerateVehicleSortList due to API change.
2016-11-11 18:37:52 +00:00
Jonathan G Rennison
dbd99707b6
Merge branch 'master' into save_ext
2016-11-11 18:27:24 +00:00
frosch
616c02c42e
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
2016-11-05 11:53:03 +00:00
Jonathan G Rennison
f0bcec77fb
Import patch for random town road reconstruction.
...
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438
Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
2016-09-19 23:07:09 +01:00
Jonathan G Rennison
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
2016-09-10 01:03:48 +01:00
Jonathan G Rennison
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
2016-09-10 00:57:05 +01:00
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
Jonathan G Rennison
a6e0b1ac7d
Merge branch 'cpp-11' into save_ext
2016-09-05 23:17:02 +01:00
Jonathan G Rennison
f7af8b8bdc
Silence -Wunused-variable warnings in src/table/townname.h
2016-09-05 23:16:47 +01:00
frosch
533cb7c156
(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)
2016-09-05 19:11:01 +00:00
Jonathan G Rennison
9ae057b8bf
Fix loading of SpringPP savegames.
...
Was broken in jgrpp-0.13.1
2016-07-08 00:35:37 +01:00
Jonathan G Rennison
f0fee802a9
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
2016-07-05 22:34:50 +01:00
Jonathan G Rennison
ed33a62bcd
Merge branch 'tracerestrict' into tracerestrict-sx
2016-07-05 22:19:34 +01:00
Jonathan G Rennison
0ab2abbc23
Add client setting to show train weight ratios in details header.
...
Off by default.
2016-07-05 21:54:43 +01:00
Jonathan G Rennison
8ec1b2200e
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
...
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
2016-07-05 21:20:06 +01:00
Jonathan G Rennison
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
2016-05-12 22:57:42 +01:00
Jonathan G Rennison
95b65163e3
Revert back to v2 of house picking/placing patch.
2016-05-12 22:35:39 +01:00
Jonathan G Rennison
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
2016-05-08 01:12:07 +01:00
Jonathan G Rennison
efcdd6c36f
Remove global automated timetable setting.
2016-05-06 23:33:12 +01:00
Jonathan G Rennison
ff5ee52b94
Add a company setting to control auto-fill timetable rounding.
2016-05-06 23:16:17 +01:00
Jonathan G Rennison
04b188bd7d
Add client setting to show leftover ticks in timetable.
2016-05-06 19:47:46 +01:00
Jonathan G Rennison
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5
Update to v4 of house placing patch.
2016-04-08 19:42:10 +01:00
Jonathan G Rennison
7bc407e2f8
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_type.h
# src/table/settings.ini
2016-02-25 22:31:36 +00:00
Jonathan G Rennison
1818a83e63
Add setting to control whether trains can crash with other companies'.
2016-02-25 22:08:27 +00:00
Jonathan G Rennison
1f5535c0b1
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
2016-02-13 22:14:47 +00:00
Jonathan G Rennison
a27bdbb3e2
Add company settings to enable competitors' to buy/renew in own depots.
2016-02-13 16:51:19 +00:00
Jonathan G Rennison
31a5baf555
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/settings.cpp
2016-02-02 23:09:29 +00:00
Jonathan G Rennison
fe2277dfbc
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
2016-01-31 23:40: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
248ac0e263
Merge branch 'save_ext' into infrastructure_sharing-sx
2016-01-31 11:45:19 +00:00
Jonathan G Rennison
e5894b3948
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
2016-01-31 11:45:08 +00:00
Jonathan G Rennison
6992312702
Merge branch 'master' into infrastructure_sharing
2016-01-31 11:44:54 +00:00
Jonathan G Rennison
78cf5ca682
Add setting for linkgraph times to be in non daylength scaled days.
...
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
2016-01-29 00:26:47 +00:00
patch-import
c5f9d8b6de
Import reduced tree patch
...
http://www.tt-forums.net/viewtopic.php?p=890778#p890778
Update to recent trunk, use extended savegame framework.
Add setting help text, tweak setting name.
Pre-calculate tree growth probabilities.
2016-01-25 23:27:11 +00:00
Jonathan G Rennison
a671f40fc8
Merge branch 'save_ext' into tracerestrict-sx
2016-01-20 22:02:14 +00:00
Jonathan G Rennison
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
2016-01-19 22:38:32 +00:00
Jonathan G Rennison
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
2016-01-19 22:37:23 +00:00