dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,280 Commits 1 Branch 0 Tags
2e20da40eda562bbd4ed575fa8a332cbacd6d0c1
Commit Graph

2213 Commits

Author SHA1 Message Date
Jonathan G Rennison
3b83a9e186 Performance improvements to savegame loading 2018-05-29 00:16:53 +01:00
Jonathan G Rennison
cecbf257bc Merge branch 'save_ext' into template_train_replacement 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
 2018-05-25 19:12:10 +01:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +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
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
PeterN
42b43c9983 Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782) 2018-05-19 22:31:46 +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
a60eff174d Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-05-13 15:01:29 +01:00
Jonathan G Rennison
5877cd0f9b TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes 
Slight code, GUI layout, and savegame format tidying
 2018-05-13 15:00:26 +01:00
Jonathan G Rennison
6342099c4d Allow 256 NewGRFs in multiplayer 
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
 2018-05-12 09:11:41 +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
Pavel Stupnikov
fef8b831a9 Change: Switch town growth rate and counter to actual game ticks (#6763) 2018-05-02 21:01:30 +02:00
J0an Josep
cfb8092397 Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation. 2018-04-30 21:52:40 +02:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
4bcd05a620 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	findversion.sh
 2018-04-27 01:33:39 +01:00
Jonathan G Rennison
f42cc19aad Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
 2018-04-27 00:33:44 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
2e4ac325e2 Add extra data fields to Order extended data 2018-04-22 12:58:50 +01:00
keldorkatarn
4955996b35 Remove costly recalculation of a date format we already have. 
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)

See #36
 2018-04-17 16:35:22 +01:00
Michael Lutz
7dd6027194 Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic. 2018-04-15 20:49:29 +02:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01: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
70b6500d73 Merge branch 'save_ext' into jgrpp 2018-03-22 23:13:16 +00:00
Jonathan G Rennison
c2ab4cb2ae Fix commit fb946f6a, which broke new game/map creation 2018-03-22 23:11:19 +00:00
Jonathan G Rennison
22724e13bc Merge branch 'save_ext' into jgrpp 2018-03-20 01:15:21 +00:00
Jonathan G Rennison
fb946f6a2b Don't reset savegame feature versions at end of DoLoad, so that -q works 2018-03-20 01:15:01 +00:00
frosch
8c458c153d (svn r27990) -Update: Docs 2018-03-14 18:05:06 +00:00
Jonathan G Rennison
80c0655c06 Relax validation for conditional order travel time in old savegame load 2018-03-11 22:42:37 +00:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
 2018-03-11 22:16:19 +00:00
Jonathan G Rennison
16c67ea484 Merge branch 'master' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/saveload/saveload.cpp
#	src/stdafx.h
#	src/vehicle.cpp
 2018-03-11 22:10:21 +00:00
frosch
59dd7be686 (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
frosch
91bcc210cf (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
Jonathan G Rennison
8c0c9274ea Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-01-26 18:47:08 +00:00
Jonathan G Rennison
9000d74f3c Pay all cargo payment incomes when cargo finally delivered 2018-01-26 18:28:57 +00:00
Jonathan G Rennison
093bd804cd Merge branch 'save_ext' into infrastructure_sharing 2018-01-26 18:18:46 +00:00
Jonathan G Rennison
d730cfd51d Cache sprite sequence bounds for vehicles 2018-01-19 19:13:01 +00:00
Jonathan G Rennison
5b226adc75 TBTR: Whitespace fix 2018-01-19 19:12:11 +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
5db5581684 Merge branch 'save_ext' into jgrpp 2018-01-12 01:14:12 +00:00
Jonathan G Rennison
15fea054fb Add function pointer mode to SlXvFeatureTest 2018-01-12 01:13:49 +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
740e4543c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
 2017-12-10 12:41:58 +00:00
frosch
135ad9c6c9 (svn r27929) -Cleanup: Remove unused Industry::random_triggers 2017-10-25 15:38:19 +00:00