7f10d83a4a
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
ba566e9126
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
a37bb32fd6
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
3ac94e97c8
Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.
...
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
8 years ago
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
8 years ago
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.
8 years ago
efcdd6c36f
Remove global automated timetable setting.
8 years ago
fa232ddaed
Merge branch 'improved_breakdowns-sx' into jgrpp
8 years ago
7caebc2a77
Avoid aircraft leaving the state machine in the event of a breakdown.
...
This can result in airport state machine blocks being left
erroneously occupied, blocking the airport.
8 years ago
31a5baf555
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/settings.cpp
9 years ago
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...
9 years ago
9eb07b4a77
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
1e897531cb
(svn r27422) -Fix [FS#6341]: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree. (marcole)
9 years ago
e9dc82c801
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
42370dc28d
Add company setting to auto-enable auto timetables for new vehicles.
...
Default: off.
9 years ago
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
9 years ago
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
9 years ago
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
9 years ago
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
2f9ebebf02
Merge branch 'master' into wait_in_depot
9 years ago
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
80d52eb20e
Improved breakdowns patch: fix various issues
...
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
9 years ago
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
f7f49c15a3
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
10 years ago
fe1e883dc9
(svn r26874) -Fix (r26872): hopefully fix MSVC compile error
10 years ago
3dfb423446
(svn r26872) -Change: give the disaster vehicles the same treatment as aircraft in r26866; make the ascend and descend if needed to cross high mountains (based on patch by ic111)
10 years ago
f9be0f5faa
(svn r26867) -Fix (r26866): hopefully fix MSVC compile error
10 years ago
39ded38c01
(svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111)
10 years ago
8ab4f746f2
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
10 years ago
ac269a3f08
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
63ddad069b
(svn r26134) -Fix [FS#5820]: aircraft crashing near the map's border due to a lack of airports could trigger an assertion in most builds
11 years ago
a498a56573
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
c702853917
(svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753)
11 years ago
206616bf37
(svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading.
11 years ago
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
11 years ago
6ff68923bf
(svn r25223) -Change: [NewGRF] Unify the behaviour of Aircraft::tick_counter with other vehicle types and increment it once per tick. (instead of twice like before, or six times like in r0)
11 years ago
789e4a8998
(svn r25115) -Fix (r8973) [FS#5492-ish]: [NewGRF] Acceleration of NewGRF aircraft was too fast, while acceleration of default aircraft was way too slow. I.e. choose wisely who to let write the software for your orbiter.
11 years ago
84ca041564
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
12 years ago
58ec317c5a
(svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138)
12 years ago
2c67dc3d9f
(svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138)
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
9da7615bb5
(svn r24855) -Fix [FS#5405]: Don't send aircraft to depots that are out of range of the next destination.
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
bac2b4c25d
(svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi)
12 years ago
358a2bd6ed
(svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked.
12 years ago
Jonathan G Rennison
frosch
patch-import
peter1138
rubidium
planetmaker
michi_cc