Jonathan G Rennison
5108a71240
SpringPP load: remove wait for cargo orders.
9 years ago
Jonathan G Rennison
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison
c751bba17c
Bump SLXI tracerestrict version due to reserve through new feature.
9 years ago
Jonathan G Rennison
8f4c216b3f
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
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.
9 years ago
Jonathan G Rennison
d9acfc4599
Fix validation of dual item instructions.
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
Jonathan G Rennison
de270a2702
Version: Committing version data for tag: jgrpp-0.3.2
9 years ago
Jonathan G Rennison
2edfccd187
SpringPP load: Fix loading when day-length > 1
...
Adjust value of _date_fract.
9 years ago
Jonathan G Rennison
cbfdb4c94c
Version: Committing version data for tag: jgrpp-0.3.1
9 years ago
Jonathan G Rennison
32dffceaa0
Merge branch 'order_occupancy-sx' into jgrpp
9 years ago
Jonathan G Rennison
e9d3e6fad2
Merge branch 'order_occupancy' into order_occupancy-sx
9 years ago
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.
9 years ago
Jonathan G Rennison
1723c0f302
Version: Committing version data for tag: jgrpp-0.3.0
9 years ago
Jonathan G Rennison
ce15bdc08f
Merge branch 'save_ext_spp' into jgrpp
9 years ago
Jonathan G Rennison
44a41ba13e
Fix traffic light removal not deleting animated tile.
9 years ago
Jonathan G Rennison
6e505ceab1
Fix missing template definition in company_settings.
9 years ago
Jonathan G Rennison
9287fa6554
Merge branch 'version_utils' into jgrpp
9 years ago
Jonathan G Rennison
1b8166b198
Enable embedding versioning info into the repo
...
Add a script to write a .ottdrev style file: .ottdrev-vc, which also
includes a SHA-256 hash of the source tree.
Modify findversion.sh to use this file if no VCS info can be found,
and use the source tree hash to set the modified status.
Include leading digits of hash in version string if different,
this is to make it easier to distinguish between modified or
non-release versions.
Add function to create release tag and create/commit .ottdrev-vc
in one go.
9 years ago
Jonathan G Rennison
60ba68cc69
Update departure board to handle changed minutes.
...
Use scaled date ticks internally.
9 years ago
Jonathan G Rennison
0b22a8e5c6
Changes to timetable GUI to handle minutes change.
...
Use scaled date ticks internally.
Update date entry GUI.
9 years ago
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.
9 years ago
Jonathan G Rennison
5d7ad2ba7b
Merge branch 'vehicle_details_gui_additions' into jgrpp
...
Conflicts:
src/table/settings.ini
9 years ago
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.
9 years ago
Jonathan G Rennison
bbc131ce47
Merge branch 'jgrpp' into save_ext_spp
...
Conflicts:
src/saveload/order_sl.cpp
9 years ago
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
9 years ago
Jonathan G Rennison
77bcd5f2c2
More conditional orders: Extended save/load changes.
9 years ago
Jonathan G Rennison
0372bfcda7
Merge branch 'save_ext' into more_cond_orders-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison
33233e8575
Fix references to renamed variables.
...
Update comment on Order::UpdateJumpCounter.
9 years ago
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
9 years ago
Jonathan G Rennison
ea5c33029b
Fix various whitespace and style issues.
9 years ago
Jonathan G Rennison
218758fc86
Remove some of the Russian translations, as they are out-of-sync.
9 years ago
patch-import
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
Jonathan G Rennison
591d2ee8b9
Merge branch 'ingame_rivers' into jgrpp
...
Conflicts:
src/settings_gui.cpp
src/settings_type.h
9 years ago
Jonathan G Rennison
805986811a
Merge branch 'save_ext' into jgrpp
9 years ago
Jonathan G Rennison
bdf0216bf0
Avoid closing nested templates with >> for backwards compatibility.
9 years ago
Jonathan G Rennison
659b6b7337
PATX settings: Various changes to support legacy compilers.
9 years ago
Jonathan G Rennison
9c75a3c477
Enable building rivers in-game.
...
Controlled by setting, default off.
9 years ago
Jonathan G Rennison
e257b23cba
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
Jonathan G Rennison
6c32cca5b9
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
Jonathan G Rennison
38aaf8a921
Fix compilation on legacy compilers.
9 years ago
Jonathan G Rennison
58780fb109
Merge branch 'everest_treeline-sx' into jgrpp
9 years ago
Jonathan G Rennison
3caa662c77
Timetable GUI: Scale dates/times by day length factor.
9 years ago
Jonathan G Rennison
010c290511
Departures: Scale dates in departures window by day length factor.
9 years ago
Jonathan G Rennison
803e8970c3
Departures: Fix major memory leak in MakeDepartureList.
9 years ago
Jonathan G Rennison
c6f38acbd6
Departures: Fix indentation/whitespace issues.
9 years ago
Jonathan G Rennison
64a6f5c0d4
Merge branch 'jgrpp' into save_ext_spp
9 years ago
Jonathan G Rennison
efb1ba3337
Add GUI settings and setting/help texts.
...
Move tree-related functions into their own GUI sub-category.
9 years ago