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
5 years ago
a5836874ef
Codechange: Use track functions.
5 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
5 years ago
225790892d
Change: Make ships stop and change direction slowly instead of instantly turning.
5 years ago
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
5 years ago
f35b135e17
Change 81330b8d6e: Cached path only needs to be cleared if it was found to be invalid.
5 years ago
81330b8d6e
Change: Add path cache for ships.
5 years ago
7c539267ed
Merge branch 'master' into jgrpp
5 years ago
6b0a467a50
Change: Obey forbid_90_deg_turns when choosing available track with no destination.
5 years ago
7284b593c7
Change: When ship is lost, pick first available track instead of a random track.
5 years ago
8b64204418
Codechange: Replace trackbit lookup table with existing functions.
5 years ago
7af53d7588
Codechange: Use const instead of magic number for ship order distance. Allow slightly further distance when following orders.
5 years ago
b98887c4a0
Change: Allow only one ship to leave depot at a time.
5 years ago
ebddd596c7
Change: Don't pathfind with no destination or if destination is known to be too far.
5 years ago
6a38a3f5df
Change: Don't leave ship depot with no orders.
5 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
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
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
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
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
6 years ago
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
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
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
6 years ago
ed04845514
Merge branch 'ship_collision_avoidance' into jgrpp
6 years ago
691ce0f1ea
An assert could be triggered while looking beyond the map border.
...
This patch fixes that.
6 years ago
fca03da2bb
Add wormhole ship detection, one tile only!
6 years ago
9326706eb9
Code cleanup and preparation for ships in wormhole detection
6 years ago
80500f8f08
Rework z position
6 years ago
902fd73c47
Merge branch 'ship_collision_avoidance' into jgrpp
6 years ago
e4a10e9313
Revert part of collision detection on aqueducts, on aqueducts collision detection will not be done.
6 years ago
354ecfdf3a
Handle ship collision detection on aquaducts.
6 years ago
e2d3c95ae1
Enable ships to pass on both sides of other ships.
6 years ago
828e9bece2
De-duplicate ship entry to exit direction map table
6 years ago
aa1a914d96
Merge branch 'ship_collision_avoidance' into jgrpp
6 years ago
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
6 years ago
d730cfd51d
Cache sprite sequence bounds for vehicles
6 years ago
e3b33b45c9
Simplify direction lookup to also work for oil rigs.
...
(cherry picked from commit acbff5528b6aa5a01d17b814a44b6d884ee03f69)
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
40b89902a5
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/galician.txt
7 years ago
c973f65acb
(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)
7 years ago
e9e44105eb
(svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo)
7 years ago
fc60857b66
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
7 years ago
3c7dc746d5
(svn r27807) -Codechange: Remove _ship_leave_depot_offs
...
There is already TileOffsByDiagDir for that. (cirdan)
7 years ago
80303515c1
(svn r27807) -Codechange: Remove _ship_leave_depot_offs
...
There is already TileOffsByDiagDir for that. (cirdan)
7 years ago
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)
7 years ago
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)
7 years ago
4f9fd074b8
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
...
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
7 years ago
f0062f94d6
(svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
...
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
7 years ago
Jonathan G Rennison
J0an Josep
Peter Nelson
Peter Nelson
Charles Pigott
Niels Martin Hansen
HackaLittleBit
keldorkatarn