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
|
5 years ago |
|
Jonathan G Rennison
|
5a9790a196
|
Store crash/desync logs in crash/desync savegame
Add console command to dump loaded debug log
|
5 years ago |
peter1138
|
3293f08e0b
|
Add: New RoadType API functions.
|
5 years ago |
|
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
5 years ago |
|
Jonathan G Rennison
|
bd2fdde759
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
5 years ago |
glx
|
ebd4f32d15
|
Cleanup: remove core/sort_func.hpp as it's not used anymore
|
5 years ago |
|
Jonathan G Rennison
|
5c1168603d
|
Exclude MinGW headers from source/project files on non-MinGW platforms
|
5 years ago |
|
Jonathan G Rennison
|
33a0253137
|
Update project files
|
5 years ago |
|
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
|
5 years ago |
|
Jonathan G Rennison
|
01261daec0
|
Merge branch 'master' into cpp-11
# Conflicts:
# config.lib
|
5 years ago |
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.
|
5 years ago |
|
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
|
5 years ago |
Charles Pigott
|
fe448a2616
|
Remove: OPF
|
5 years ago |
|
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
|
5 years ago |
Niels Martin Hansen
|
e8d397e4ee
|
Codechange: Make a merged k-d tree index of all viewport signs
|
5 years ago |
|
Niels Martin Hansen
|
d84b67e54d
|
Codechange: Make a k-d tree index of stations
|
5 years ago |
|
Niels Martin Hansen
|
7b56be0f3a
|
Codechange: Make a k-d tree index of towns
|
5 years ago |
|
Niels Martin Hansen
|
d7522e5e8f
|
Codechange: Add a k-d tree generic data structure
|
5 years ago |
|
Peter Nelson
|
3542ed53d4
|
Add: BitmapTileArea and Iterator to handle sparse tile areas.
|
5 years ago |
|
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
|
5 years ago |
|
Charles Pigott
|
c3bc7d657e
|
Codechange: Remove ability for SDL to be dynamically loaded on Windows
|
5 years ago |
|
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
|
5 years ago |
|
Niels Martin Hansen
|
65782af2f4
|
Add: Visual Studio 2019 project files
|
5 years ago |