dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,139 Commits 1 Branch 0 Tags
ced17a74e848b10f1c3c4b3f3d08e80e4b5dde6c
Commit Graph

412 Commits

Author SHA1 Message Date
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02: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
PeterN
6c6971fb43 Add: Road vehicle path cache. (#7261) 2019-03-08 23:52:45 +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
Peter Nelson
e21ade375e Codechange: Change from numeric to descriptive SLV enum labels for last entries. 2019-02-02 21:39:06 +00:00
Peter Nelson
9de12521ec Codechange: Convert saveload numbers to enum values. 
(This was mostly achieved with a few in-place regexes)
 2019-02-02 21:39:06 +00:00
Peter Nelson
ea4ea62816 Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared. 2019-02-02 21:39:06 +00:00
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-01-31 02:04:02 +00:00
Peter Nelson
67633606b0 Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE. 
The original translation functionality hasn't been used since 2007.
 2019-01-30 17:11:40 +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
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
81330b8d6e Change: Add path cache for ships. 2019-01-19 23:11:17 +00:00
Jonathan G Rennison
0e3986c39c Extend timetable wait/travel times from 16 to 32 bits wide 2018-10-22 19:12:38 +01:00
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
 2018-05-25 18:29:17 +01:00
PeterN
a07394a63a Change: Remove direction parameter from Vehicle::UpdateDeltaXY. (#6792) 
The value is either unused or always the same as this->direction.
 2018-05-22 18:43:34 +01:00
Jonathan G Rennison
38779254e5 Check cargo action count consistencies on load 
Add scope info logging to AfterLoadVehicles
 2018-05-13 18:56:31 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
J0an Josep
cfb8092397 Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation. 2018-04-30 21:52:40 +02:00
Jonathan G Rennison
52edafab5e Add savegame support for 32 bit Train::flags field 2018-03-26 19:50:34 +01:00
Jonathan G Rennison
09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
 2018-03-26 18:42:23 +01:00
Jonathan G Rennison
def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 2018-03-26 18:40:05 +01:00
Jonathan G Rennison
d730cfd51d Cache sprite sequence bounds for vehicles 2018-01-19 19:13:01 +00:00
Jonathan G Rennison
3a2a316588 Merge branch 'day_length' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/vehicle_sl.cpp
 2018-01-12 01:23:28 +00:00
Jonathan G Rennison
7b567c9d26 Extend vehicle running ticks to 16 bits to avoid overflow at day length > 3 2018-01-12 00:03:15 +00:00
Jonathan G Rennison
dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp 
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-01-04 19:47:46 +00:00
Jonathan G Rennison
0a80aec634 Implement critical breakdown speed reduction for road vehicles 2018-01-04 19:18:24 +00:00
Jonathan G Rennison
218085c535 Timetable: Implement autofill/automate for taken conditional orders. 
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
 2017-12-18 01:26:27 +00:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/vehicle.cpp
 2017-08-15 19:17:12 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
9077d6f4d2 Add support for loading SpringPP v2.3, v2.4 savegames 2017-06-14 00:26:52 +01:00
Jonathan G Rennison
44fa555c6d Merge branch 'save_ext' into improved_breakdowns 2017-06-06 18:41:01 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
19d56a33e8 (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
Jonathan G Rennison
7ecdebddb3 Change and simplify algorithm for vehicle repair cost. 
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
 2017-01-02 20:21:58 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
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
 2016-11-01 23:00:48 +00:00
frosch
ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
117e73751c (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
Jonathan G Rennison
55e98d1182 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-10-11 19:02:03 +01:00
Jonathan G Rennison
4c74bda0af Fix extended order info not being saved for vehicle current order. 
This fixes desync and related issues when loading savegames where
extended order info is used.
 2016-10-11 19:01:16 +01:00
Jonathan G Rennison
a422cb6753 Use a deque instead of list for CargoPacketList and StationCargoPacketMap. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01:00
Jonathan G Rennison
31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
 2016-02-02 23:09:29 +00:00