J0an Josep
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
6 years ago
Jonathan G Rennison
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
J0an Josep
a5836874ef
Codechange: Use track functions.
6 years ago
Jonathan G Rennison
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
Peter Nelson
225790892d
Change: Make ships stop and change direction slowly instead of instantly turning.
6 years ago
Jonathan G Rennison
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
Peter Nelson
f35b135e17
Change 81330b8d6e: Cached path only needs to be cleared if it was found to be invalid.
6 years ago
Peter Nelson
81330b8d6e
Change: Add path cache for ships.
6 years ago
Jonathan G Rennison
7c539267ed
Merge branch 'master' into jgrpp
6 years ago
Peter Nelson
6b0a467a50
Change: Obey forbid_90_deg_turns when choosing available track with no destination.
6 years ago
Peter Nelson
7284b593c7
Change: When ship is lost, pick first available track instead of a random track.
6 years ago
Peter Nelson
8b64204418
Codechange: Replace trackbit lookup table with existing functions.
6 years ago
Peter Nelson
7af53d7588
Codechange: Use const instead of magic number for ship order distance. Allow slightly further distance when following orders.
6 years ago
Peter Nelson
b98887c4a0
Change: Allow only one ship to leave depot at a time.
6 years ago
Peter Nelson
ebddd596c7
Change: Don't pathfind with no destination or if destination is known to be too far.
6 years ago
Peter Nelson
6a38a3f5df
Change: Don't leave ship depot with no orders.
6 years ago
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
Niels Martin Hansen
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
Jonathan G Rennison
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
PeterN
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
6 years ago
Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
PeterN
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
Jonathan G Rennison
955126efac
Improve pathfinder support for multiple docks
...
The pathfinder can now find docks other than the Manhattan closest one.
Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
7 years ago
Jonathan G Rennison
ed04845514
Merge branch 'ship_collision_avoidance' into jgrpp
7 years ago
HackaLittleBit
691ce0f1ea
An assert could be triggered while looking beyond the map border.
...
This patch fixes that.
7 years ago
HackaLittleBit
fca03da2bb
Add wormhole ship detection, one tile only!
7 years ago
HackaLittleBit
9326706eb9
Code cleanup and preparation for ships in wormhole detection
7 years ago
HackaLittleBit
80500f8f08
Rework z position
7 years ago
Jonathan G Rennison
902fd73c47
Merge branch 'ship_collision_avoidance' into jgrpp
7 years ago
HackaLittleBit
e4a10e9313
Revert part of collision detection on aqueducts, on aqueducts collision detection will not be done.
7 years ago
HackaLittleBit
354ecfdf3a
Handle ship collision detection on aquaducts.
7 years ago
HackaLittleBit
e2d3c95ae1
Enable ships to pass on both sides of other ships.
7 years ago
HackaLittleBit
828e9bece2
De-duplicate ship entry to exit direction map table
7 years ago
Jonathan G Rennison
aa1a914d96
Merge branch 'ship_collision_avoidance' into jgrpp
7 years ago
HackaLittleBit
c5888dad9f
Changes to ship collision avoidance algorithm
...
* Change some names and create a seperate procedure for finding ships.
* Check if destiny tile is buoy. If so, distance checking continues.
* Remove water tile check. It was done before and coast can't have 3 way tracks.
* Add a check for map edges.
* Add speed adjustment related to distance between ships
* Do not detect ships on tiles with parallel tracks
7 years ago
Jonathan G Rennison
d730cfd51d
Cache sprite sequence bounds for vehicles
7 years ago
keldorkatarn
e3b33b45c9
Simplify direction lookup to also work for oil rigs.
...
(cherry picked from commit acbff5528b6aa5a01d17b814a44b6d884ee03f69)
7 years ago
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
Jonathan G Rennison
40b89902a5
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/galician.txt
8 years ago
peter1138
c973f65acb
(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)
8 years ago
peter1138
e9e44105eb
(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)
8 years ago
Jonathan G Rennison
fc60857b66
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
8 years ago
peter1138
3c7dc746d5
(svn r27807) -Codechange: Remove _ship_leave_depot_offs
...
There is already TileOffsByDiagDir for that. (cirdan)
8 years ago
peter1138
80303515c1
(svn r27807) -Codechange: Remove _ship_leave_depot_offs
...
There is already TileOffsByDiagDir for that. (cirdan)
8 years ago
peter1138
2a555480bd
(svn r27806) -Codechange: Remove function ShipGetNewDirection
...
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.
Also remove now unused _new_vehicle_direction_table. (cirdan)
8 years ago
peter1138
54ec06258a
(svn r27806) -Codechange: Remove function ShipGetNewDirection
...
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.
Also remove now unused _new_vehicle_direction_table. (cirdan)
8 years ago
peter1138
4f9fd074b8
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
...
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
8 years ago
peter1138
f0062f94d6
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
...
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
8 years ago
Jonathan G Rennison
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
frosch
c175067ed9
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
frosch
a37bb32fd6
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
frosch
d2393b4f6c
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
frosch
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
Jonathan G Rennison
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
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
9 years ago
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.
9 years ago
Jonathan G Rennison
efcdd6c36f
Remove global automated timetable setting.
9 years ago
Jonathan G Rennison
31a5baf555
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/settings.cpp
9 years ago
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...
9 years ago
Jonathan G Rennison
9742300a1e
Fix some more whitespace/formatting issues.
9 years ago
Jonathan G Rennison
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
9 years ago
Jonathan G Rennison
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
9 years ago
patch-import
917391102b
Import ship collision-avoidance patch.
...
https://github.com/KeldorKatarn/OpenTTD_PatchPack
9 years ago
Jonathan G Rennison
e9dc82c801
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison
42370dc28d
Add company setting to auto-enable auto timetables for new vehicles.
...
Default: off.
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
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
patch-import
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
Jonathan G Rennison
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
Jonathan G Rennison
2f9ebebf02
Merge branch 'master' into wait_in_depot
9 years ago
Jonathan G Rennison
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
9 years ago
patch-import
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
patch-import
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
frosch
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
frosch
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
rubidium
ac269a3f08
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
10 years ago
rubidium
6c2abf0930
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
10 years ago
fonsinchen
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
11 years ago
fonsinchen
c915d9fa55
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
11 years ago
rubidium
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
11 years ago
rubidium
0463dbdc9e
(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
11 years ago
rubidium
a498a56573
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
rubidium
d2ba772f6a
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
frosch
206616bf37
(svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading.
11 years ago
frosch
5bda07c10c
(svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading.
11 years ago
rubidium
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
rubidium
3947453277
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
rubidium
58ec317c5a
(svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138)
12 years ago
rubidium
ced17303c2
(svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138)
12 years ago
rubidium
2c67dc3d9f
(svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138)
12 years ago
rubidium
c77cd1f409
(svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138)
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
michi_cc
bac2b4c25d
(svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi)
12 years ago
michi_cc
245e32a10e
(svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi)
12 years ago
yexo
055cf8bae6
(svn r24539) -Codechange [FS#5260]: make code simpler by using IsValidTile instead of manually checking the bounds (juanjo)
12 years ago
yexo
6853df46c7
(svn r24539) -Codechange [FS#5260]: make code simpler by using IsValidTile instead of manually checking the bounds (juanjo)
12 years ago