Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
2021-02-01 17:07:34 +00:00 |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
2019-11-12 18:43:10 +00: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
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Jonathan G Rennison
|
c5954fd1bd
|
Fix syntax errors in saveload_buffer.h on strict pointer alignment platforms
Fixes #57
|
2018-06-11 00:54:29 +01:00 |
|
Jonathan G Rennison
|
616cbf580a
|
Use unaligned typedefs in unaligned save/load accessors
|
2018-06-06 01:55:51 +01:00 |
|
Jonathan G Rennison
|
aae7806d5d
|
Move save/load ReadBuffer and MemoryDumper to separate header
Add static accessors
|
2018-05-29 00:21:39 +01:00 |
|