S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
2019-10-05 21:45:54 +01:00 |
|
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
2019-09-29 21:27:32 +01:00 |
|
Jonathan G Rennison
|
04ef407ddf
|
Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
# .ottdrev-vc
# README.md
# jgrpp-changelog.md
# src/ship_cmd.cpp
|
2019-08-24 10:41:08 +01:00 |
|
Jonathan G Rennison
|
a1d36b02f0
|
Network: Add state checksum which is check in network sync
|
2019-08-06 03:03:40 +01:00 |
|
Jonathan G Rennison
|
d3e0c3787f
|
Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
2019-07-13 20:34:52 +01:00 |
|
peter1138
|
ec2656ab7e
|
Codechange: Restrict docking points of docks.
|
2019-06-30 16:46:32 +02:00 |
|
peter1138
|
f538179878
|
Feature: Multi-tile docks and docking points.
|
2019-06-30 16:46:32 +02:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
361758b516
|
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
|
2019-04-09 19:06:26 +01:00 |
|
Samu
|
fb6e31ca43
|
Cleanup 3f32711: Don't apply forbid 90 deg turn settings for ships.
|
2019-04-05 10:03:54 +01:00 |
|
Jonathan G Rennison
|
a4a3a6a630
|
Merge branch 'master' into jgrpp
|
2019-04-01 03:06:18 +01:00 |
|
peter1138
|
66bed86bbb
|
Fix #7062, Revert 7af53d7588: Don't test ship max order distance when pathfinding.
|
2019-03-31 17:22:54 +01:00 |
|
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2019-03-27 18:12:04 +00:00 |
|
Charles Pigott
|
fe448a2616
|
Remove: OPF
|
2019-03-16 22:30:11 +00:00 |
|
Jonathan G Rennison
|
5e6d283463
|
Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
|
2019-03-13 03:38:26 +00:00 |
|
peter1138
|
a69eb5f516
|
Fix #7334: Ship lost after crossing bridge due to path cache not being consumed while on final bridge end.
|
2019-03-08 16:51:23 +01:00 |
|
Jonathan G Rennison
|
7ff252c58d
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
|
2019-03-04 01:18:25 +00:00 |
|
Peter Nelson
|
3f327116db
|
Change: Don't apply forbid 90 deg turn settings to ships.
|
2019-03-03 20:59:44 +01:00 |
|
Jonathan G Rennison
|
e6ee962b03
|
Fix ship collision avoidance near docks when dock not under station sign
See #77
|
2019-02-22 22:08:44 +00:00 |
|
Jonathan G Rennison
|
36ac643749
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
|
2019-02-19 19:36:30 +00:00 |
|
J0an Josep
|
c4fe46a475
|
Fix #7244, 6ca637b8c1: OPF doesn't take 90 deg turns into account.
|
2019-02-19 01:06:10 +01:00 |
|
J0an Josep
|
6ca637b8c1
|
Fix #7226: Don't call ship pathfinders if there is no available track due to "forbid 90 deg turns".
|
2019-02-18 22:57:19 +01:00 |
|
Jonathan G Rennison
|
2fdcc52321
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
|
2019-02-13 19:09:06 +00:00 |
|
Peter Nelson
|
0b10678050
|
Change: Make ships stop in locks to move up/down instead of following the slope.
|
2019-02-04 20:20:49 +00:00 |
|
Jonathan G Rennison
|
2142452305
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
|
2019-02-04 18:32:44 +00:00 |
|
Peter Nelson
|
33e3f49161
|
Fix #7119: When rotating a ship, apply an additional offset to avoid movement glitch.
|
2019-02-04 00:19:48 +00:00 |
|
Jonathan G Rennison
|
9d3b77c5a2
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
|
2019-02-02 01:27:56 +00:00 |
|
J0an Josep
|
029c48cf4a
|
Cleanup: [NPF] Remove unused parameter.
|
2019-01-31 22:15:56 +00:00 |
|
J0an Josep
|
96c5e5e73a
|
Cleanup: [NPF] Remove unused parameters.
|
2019-01-31 22:15:56 +00:00 |
|
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
|
2019-01-29 02:28:14 +00:00 |
|
J0an Josep
|
a5836874ef
|
Codechange: Use track functions.
|
2019-01-26 22:55:12 +00:00 |
|
Jonathan G Rennison
|
e5b61e0b6c
|
Refactor CallVehicleTicks vehicle loop
|
2019-01-25 20:17:15 +00:00 |
|
Peter Nelson
|
225790892d
|
Change: Make ships stop and change direction slowly instead of instantly turning.
|
2019-01-24 20:47:40 +00:00 |
|
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
|
2019-01-21 19:28:29 +00:00 |
|
Peter Nelson
|
f35b135e17
|
Change 81330b8d6e: Cached path only needs to be cleared if it was found to be invalid.
|
2019-01-20 11:06:33 +01:00 |
|
Peter Nelson
|
81330b8d6e
|
Change: Add path cache for ships.
|
2019-01-19 23:11:17 +00:00 |
|
Jonathan G Rennison
|
7c539267ed
|
Merge branch 'master' into jgrpp
|
2019-01-15 18:39:32 +00:00 |
|
Peter Nelson
|
6b0a467a50
|
Change: Obey forbid_90_deg_turns when choosing available track with no destination.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
7284b593c7
|
Change: When ship is lost, pick first available track instead of a random track.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
8b64204418
|
Codechange: Replace trackbit lookup table with existing functions.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
7af53d7588
|
Codechange: Use const instead of magic number for ship order distance. Allow slightly further distance when following orders.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
b98887c4a0
|
Change: Allow only one ship to leave depot at a time.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
ebddd596c7
|
Change: Don't pathfind with no destination or if destination is known to be too far.
|
2019-01-14 19:57:07 +00:00 |
|
Peter Nelson
|
6a38a3f5df
|
Change: Don't leave ship depot with no orders.
|
2019-01-14 19:57:07 +00:00 |
|
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
|
2018-11-05 12:53:36 +00:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
Jonathan G Rennison
|
9e1e074c2b
|
Update existing assertions to log tile information where suitable
|
2018-07-26 19:13:35 +01:00 |
|
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
|
2018-07-24 18:30:42 +01:00 |
|