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

16116 Commits

Author SHA1 Message Date
Jonathan G Rennison
ec08a32c94 Perform SpringPP airport checks before calling AfterLoadVehicles. 
This is because AfterLoadVehicles may indirectly check airport
properties via the NewGRF code.

Defer missing GRF error message output until the end of AfterLoadGame
to avoid obscuring any earlier errors.
 2015-09-06 19:48:43 +01:00
Jonathan G Rennison
6bd9f09e97 Merge branch 'tracerestrict-sx' into jgrpp 2015-09-05 23:15:44 +01:00
Jonathan G Rennison
366291ce20 Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-05 23:15:28 +01:00
Jonathan G Rennison
776c93ca55 Fix use of nullptr, which broke compilation on legacy compilers. 2015-09-05 23:15:19 +01:00
Jonathan G Rennison
4f17596ad9 Merge branch 'master' into jgrpp 2015-09-05 12:38:53 +01: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
translators
54eb340998 (svn r27394) -Update from WebTranslator v3.0: 
frisian - 25 changes by BAJansen
 2015-09-03 17:45:12 +00:00
Jonathan G Rennison
c6854afcef Pause the game instead of blocking when link graph jobs lag. 
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
 2015-09-03 18:36:30 +01:00
Jonathan G Rennison
5108a71240 SpringPP load: remove wait for cargo orders. 2015-09-02 21:25:33 +01:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +01:00
Jonathan G Rennison
c751bba17c Bump SLXI tracerestrict version due to reserve through new feature. 2015-09-02 21:07:08 +01:00
Jonathan G Rennison
8f4c216b3f Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-02 21:03:14 +01:00
Jonathan G Rennison
73b69c5594 Validate type of all instructions, log validation failures at load. 
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
 2015-09-02 20:51:30 +01:00
Jonathan G Rennison
d9acfc4599 Fix validation of dual item instructions. 2015-09-02 19:13:30 +01:00
Jonathan G Rennison
e2435c7169 Only run trace restrict programs if they contain relevant actions. 
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
 2015-09-02 18:35:56 +01:00
Jonathan G Rennison
06a1d7c5c9 Add reserve through action to trace restrict programs. 
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
06cc930e47 Improve insertion and removal of 'or if' conditionals. 
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
2edfccd187 SpringPP load: Fix loading when day-length > 1 
Adjust value of _date_fract.
 2015-08-31 19:42:34 +01:00
translators
246df66229 (svn r27391) -Update from WebTranslator v3.0: 
english_US - 2 changes by Supercheese
 2015-08-31 17:45:13 +00:00
Jonathan G Rennison
32dffceaa0 Merge branch 'order_occupancy-sx' into jgrpp 2015-08-31 16:36:02 +01:00
Jonathan G Rennison
e9d3e6fad2 Merge branch 'order_occupancy' into order_occupancy-sx 2015-08-31 16:35:34 +01:00
Jonathan G Rennison
0cf7428f85 Fix crash in competitor orders GUI. 
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
 2015-08-31 16:35:24 +01:00
Jonathan G Rennison
ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 2015-08-31 10:22:39 +01:00
Jonathan G Rennison
44a41ba13e Fix traffic light removal not deleting animated tile. 2015-08-31 09:58:42 +01:00
Jonathan G Rennison
6e505ceab1 Fix missing template definition in company_settings. 2015-08-31 09:58:10 +01:00
Jonathan G Rennison
60ba68cc69 Update departure board to handle changed minutes. 
Use scaled date ticks internally.
 2015-08-30 19:40:58 +01:00
Jonathan G Rennison
0b22a8e5c6 Changes to timetable GUI to handle minutes change. 
Use scaled date ticks internally.
Update date entry GUI.
 2015-08-30 19:38:52 +01:00
Jonathan G Rennison
29809f2001 Time in minutes is no longer scaled by day length. 
Time in minutes now based on the existing date ticks * the day length,
plus the tick skip counter, instead of just the date ticks.
Change the format of the {DATE_WALLCLOCK_*} string params
to use date ticks scaled by the day length, as above.
Update status bar clock.
 2015-08-30 18:54:59 +01:00
translators
ee8bee5e31 (svn r27390) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-08-30 17:45:17 +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
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
8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-26 23:08:51 +01:00
Jonathan G Rennison
33233e8575 Fix references to renamed variables. 
Update comment on Order::UpdateJumpCounter.
 2015-08-26 23:07:02 +01:00
Jonathan G Rennison
ffdd845b1c Merge branch 'master' into more_cond_orders 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
 2015-08-26 22:51:47 +01:00
Jonathan G Rennison
ea5c33029b Fix various whitespace and style issues. 2015-08-26 22:49:08 +01:00
Jonathan G Rennison
218758fc86 Remove some of the Russian translations, as they are out-of-sync. 2015-08-26 22:35:09 +01:00
patch-import
c757a97214 Import more conditional orders patch 
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
 2015-08-26 22:28:20 +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
805986811a Merge branch 'save_ext' into jgrpp 2015-08-26 19:08:18 +01:00
Jonathan G Rennison
bdf0216bf0 Avoid closing nested templates with >> for backwards compatibility. 2015-08-26 19:07:48 +01:00
Jonathan G Rennison
659b6b7337 PATX settings: Various changes to support legacy compilers. 2015-08-26 19:00:45 +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
e257b23cba Merge branch 'tracerestrict-sx' into jgrpp 2015-08-25 18:26:52 +01:00
Jonathan G Rennison
6c32cca5b9 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-25 18:26:37 +01:00
Jonathan G Rennison
38aaf8a921 Fix compilation on legacy compilers. 2015-08-25 18:22:18 +01:00
Jonathan G Rennison
58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 2015-08-22 01:29:53 +01:00