dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,820 Commits 1 Branch 0 Tags
2bfa53fcddc209418e8fbbd79f92f3e3d81d11b4
Commit Graph

1369 Commits

Author SHA1 Message Date
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
f5badfefd1 Check order destination refcount maps in CheckCaches 2019-07-30 19:09:22 +01:00
Jonathan G Rennison
7ed86e7488 Merge branch 'jgrpp' into jgrpp-nrt 2019-07-29 22:50:51 +01:00
Jonathan G Rennison
89a6cc3e03 Add game event flag for virtual train creation 2019-07-29 19:39:01 +01:00
Jonathan G Rennison
942dd35380 Add game events for industry create/destroy 2019-07-29 18:48:59 +01:00
Jonathan G Rennison
1365600bed Merge branch 'jgrpp' into jgrpp-nrt 2019-07-13 20:35:17 +01:00
Jonathan G Rennison
ba8ed880c1 Merge branch 'master' into jgrpp-nrt 
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2019-07-11 19:45:56 +01:00
Jonathan G Rennison
4cf60613df Delete windows before switching to GM_MENU mode in LoadIntroGame 
See: https://github.com/OpenTTD/OpenTTD/issues/7635
 2019-07-11 18:21:52 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Jonathan G Rennison
d02928c56a Check industry neutral stations_near in CheckCaches 2019-06-17 02:37:24 +01:00
Jonathan G Rennison
92c48d6897 Fix padded tile area being used for industries in FindStationsAroundTiles 2019-06-17 02:31:15 +01:00
Jonathan G Rennison
c4d9404d79 Check industry FindStationsAroundTiles in CheckCaches 2019-06-17 01:34:34 +01:00
Jonathan G Rennison
1d5ba98932 Show time and in game date of game load in desync/crash logs 2019-06-14 21:56:37 +01:00
Jonathan G Rennison
5e9dd1ff35 Update cache mismatch logging in CheckCaches 2019-06-09 11:17:22 +01:00
Jonathan G Rennison
c7a9950269 Add game event for train crash 2019-06-08 17:13:14 +01:00
Jonathan G Rennison
49dee941fb Validate cargo packet deferred payments in CheckCaches 2019-06-08 17:13:14 +01:00
Jonathan G Rennison
83a8de1e49 Add further vehicle flag consistency checks to CheckCaches 2019-05-27 21:07:40 +01:00
Jonathan G Rennison
9b87610cd6 Check vehicle tile hash in CheckCaches 2019-05-27 15:58:30 +01:00
Jonathan G Rennison
c2470a21af Fix town production and acceptance cache saveload/update handling 2019-05-26 13:35:33 +01:00
Jonathan G Rennison
546b5248e0 Check Town::cargo_produced and _town_cargoes_accepted in CheckCaches() 2019-05-26 11:35:18 +01:00
Jonathan G Rennison
ec2291fdb4 Store some desync messages in a ring buffer, append to log on desync 2019-05-26 11:35:18 +01:00
Jonathan G Rennison
bfff4571a2 Check nearby station/industry lists and catchments in CheckCaches 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
5a9790a196 Store crash/desync logs in crash/desync savegame 
Add console command to dump loaded debug log
 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
e2251999ce Add game event flag for disaster vehicles 2019-05-20 00:55:57 +01:00
Jonathan G Rennison
e1d98e1b37 Check trace restrict slot vehicle index and occupants in CheckCaches 2019-05-19 18:40:18 +01:00
Jonathan G Rennison
5b7d1f7f80 Add game event for TBTR replacement attempt 2019-05-19 18:38:02 +01:00
Jonathan G Rennison
f37a93cecd Add any output from CheckCaches to desync log 2019-05-18 18:31:08 +01:00
Jonathan G Rennison
ec1e848a7f Add log of game events since last load and overall 
Add console command
Add to crashlog
 2019-05-18 10:17:59 +01:00
Jonathan G Rennison
cb5a86754e Check vehicle prev/next pointer consistency in CheckCaches 2019-05-16 20:05:22 +01:00
Jonathan G Rennison
8196789eeb Maintain map of vehicle order destinations refcounts, by type 2019-05-12 04:24:10 +01:00
Jonathan G Rennison
10d0f79e83 Validate vehicle tick caches in CheckCaches 2019-05-02 19:20:47 +01:00
Jonathan G Rennison
0e5dfa42c3 Check order indexing and consistency in cache check 2019-05-02 03:05:07 +01:00
Jonathan G Rennison
5d4f1b488d Fix false positive vehicle cache mismatch detection in CheckCaches 2019-05-02 00:03:12 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Charles Pigott
5b34c8019f Codechange: Remove Company/OwnerByte types 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
f8e34838c6 Avoid -Wdynamic-class-memaccess warning on clang in CheckCaches() 2019-04-28 13:21:05 +01:00
Niels Martin Hansen
37daf43037 Change: Zoom title game by UI zoom level 2019-04-24 23:04:55 +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
Jonathan G Rennison
f5747bf753 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
 2019-04-11 18:12:22 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Michael Lutz
e804173595 Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector. 2019-04-09 22:45:15 +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
Jonathan G Rennison
d5ee9d34da Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	projects/determineversion.vbs
#	source.list
#	src/crashlog.cpp
#	src/misc.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rev.h
#	src/thread/thread.h
#	src/thread/thread_morphos.cpp
#	src/thread/thread_none.cpp
#	src/thread/thread_os2.cpp
#	src/thread/thread_pthread.cpp
#	src/thread/thread_win32.cpp
 2019-04-09 19:21:39 +01:00
Jonathan G Rennison
7f80884047 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
 2019-04-09 18:54:02 +01:00
Jonathan G Rennison
01261daec0 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
 2019-04-09 18:47:28 +01:00
Michael Lutz
05bc2ed7cb Codechange: Replace custom thread code with C++11 thread objects. 
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
 2019-04-06 11:27:39 +02:00
Michael Lutz
05f4e73608 Codechange: Replace custom mutex code with C++11 mutex'es. 
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
 2019-04-06 11:27:39 +02: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
Henry Wilson
c01a2e2a81 Codechange: Removed SmallVector completely 2019-03-26 20:15:57 +00:00
Henry Wilson
a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 2019-03-26 20:15:57 +00:00