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

853 Commits

Author SHA1 Message Date
Jonathan G Rennison
a8ce1f05bf Increase max value of difficulty.max_loan setting. 2015-12-09 23:56:09 +00:00
Jonathan G Rennison
69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
 2015-12-09 01:03:37 +00:00
Jonathan G Rennison
07aba3eb84 Merge branch 'tracerestrict' into tracerestrict-sx 2015-12-09 01:01:59 +00:00
Jonathan G Rennison
a93714a720 Add setting to show restricted electric signals using the default sprites. 
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
 2015-12-09 01:01:37 +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
Jonathan G Rennison
4608ed79bb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-12 20:14:38 +00:00
Jonathan G Rennison
16c5a0a812 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-11-12 20:14:23 +00:00
Jonathan G Rennison
5a0510e488 Fix dark/lighten colour mappings going to/from yellow flash cycle. 
This is problematic for the green company in viewport map owner mode,
where it becomes flashing yellow for slopes and tunnels (if enabled).
 2015-11-12 20:14:08 +00:00
Jonathan G Rennison
d65ddc8985 Merge branch 'auto_timetables-sx' into jgrpp 2015-10-30 23:02:20 +00:00
Jonathan G Rennison
61aad7ce2a Change the default auto timetable separation rate to 40%. 
This is to improve jam-resistance by default.
 2015-10-30 23:01:59 +00:00
Jonathan G Rennison
b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
 2015-10-25 21:50:14 +00:00
Jonathan G Rennison
60a677692e Merge branch 'order_occupancy-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
 2015-10-25 21:47:07 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting. 
Move auto TT by default setting to PLYX chunk.
 2015-10-25 21:41:25 +00:00
Jonathan G Rennison
a380573c32 Merge branch 'save_ext' into auto_timetables-sx 2015-10-25 21:41:20 +00:00
Jonathan G Rennison
6d263226d8 Move order occupancy smoothness to company settings. 2015-10-25 21:37:27 +00:00
Jonathan G Rennison
8001d86350 Merge branch 'save_ext' into order_occupancy-sx 2015-10-25 21:36:21 +00:00
Jonathan G Rennison
e606a847c6 Add an un-ordered chunk for extra company settings: PLYX. 
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
 2015-10-25 21:35:40 +00:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles. 
Default: off.
 2015-09-03 23:27:26 +01:00
Jonathan G Rennison
ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 2015-08-31 10:22:39 +01:00
Jonathan G Rennison
6e505ceab1 Fix missing template definition in company_settings. 2015-08-31 09:58:10 +01: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
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp 
Conflicts:
	src/saveload/order_sl.cpp
 2015-08-26 23:26:18 +01:00
Jonathan G Rennison
591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
 2015-08-26 19:09:38 +01:00
Jonathan G Rennison
9c75a3c477 Enable building rivers in-game. 
Controlled by setting, default off.
 2015-08-25 23:44:28 +01:00
Jonathan G Rennison
58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 2015-08-22 01:29:53 +01:00
Jonathan G Rennison
64a6f5c0d4 Merge branch 'jgrpp' into save_ext_spp 2015-08-21 23:00:57 +01:00
Jonathan G Rennison
efb1ba3337 Add GUI settings and setting/help texts. 
Move tree-related functions into their own GUI sub-category.
 2015-08-21 21:17:18 +01:00
Jonathan G Rennison
381d11096f Bin no_trees_on_this_level, use exp. decay away from snow line. 
Probability of placing an arctic tree is now an exponential decay
function of height distance from the snow line, instead of the previous
50% blocks.
This results in a more gradual thinning out of arctic trees in
each direction.
The algorithm is: p = exp(-3 * distance / range_setting),
using a rather crude approximation of the exponential function.

The no_trees_on_this_level setting is not really useful, and its
dual behaviour to disallow discrete height levels and turn on the
snow line behaviour is unintuitive.
Replace it with a simple on/off setting.
 2015-08-21 21:17:18 +01:00
Jonathan G Rennison
3b120c6cbd Merge branch 'save_ext' into everest_treeline-sx 2015-08-21 18:16:30 +01:00
Jonathan G Rennison
efe85200f0 Import Everest treeline patch 2015-08-21 18:16:15 +01:00
Jonathan G Rennison
f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
 2015-08-20 00:39:26 +01:00
Jonathan G Rennison
6643d0a661 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-20 00:38:06 +01:00
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post. 
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
 2015-08-19 21:56:22 +01:00
Jonathan G Rennison
ba8d8d99b8 Add support for loading SpringPP savegame versions 221 and 222. 
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
 2015-08-18 23:08:34 +01:00
Jonathan G Rennison
b5c453b21e Add generic mechanism to cross-ref settings at load time. 
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
 2015-08-17 20:11:30 +01:00
Jonathan G Rennison
034279c0e8 Merge branch 'save_ext' into jgrpp 2015-08-16 14:36:26 +01:00
Jonathan G Rennison
a8cc81d054 Initialiser list fixes for legacy compilers. 2015-08-16 14:36:07 +01:00
Jonathan G Rennison
ef5ecdb2c7 Merge branch 'git_findversion_fix' into save_ext 2015-08-16 14:27:46 +01:00
Jonathan G Rennison
9716026809 Merge branch 'jgrpp' into save_ext_spp 2015-08-15 15:24:21 +01:00
Jonathan G Rennison
6088c7fc24 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-15 00:32:15 +01:00
Jonathan G Rennison
671151474b Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/settings_gui.cpp
 2015-08-11 21:43:12 +01:00
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
Jonathan G Rennison
88c150abf7 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-08-11 21:41:48 +01:00
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
 2015-08-11 21:41:41 +01:00
Jonathan G Rennison
25bc8eb1e2 Save/load changes for timetable_separation_rate setting. 2015-08-11 21:24:56 +01:00
Jonathan G Rennison
adb3156951 Merge branch 'auto_timetables' into auto_timetables-sx 2015-08-11 21:24:05 +01:00
Jonathan G Rennison
40ad3dea02 Auto separation: Add setting to scale vehicle lateness adjustments. 
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.

The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.

Note that this is not savegame compatible.
 2015-08-11 21:20:01 +01:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00