You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Jonathan G Rennison
c5b3c18bb5
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_func.h
# src/core/overflowsafe_type.hpp
# src/engine.cpp
# src/music/midifile.cpp
# src/network/network_command.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_roadstop.h
# src/newgrf_spritegroup.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/pathfinder/yapf/yapf_common.hpp
# src/road_gui.cpp
# src/saveload/engine_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/strings.cpp
# src/table/settings/game_settings.ini
|
9 months ago |
| .. |
|
CMakeLists.txt
|
…
|
|
|
ai_sl.cpp
|
Merge branch 'master' into jgrpp
|
1 year ago |
|
airport_sl.cpp
|
…
|
|
|
animated_tile_sl.cpp
|
Merge branch 'master' into jgrpp
|
1 year ago |
|
autoreplace_sl.cpp
|
…
|
|
|
bridge_signal_sl.cpp
|
…
|
|
|
cargomonitor_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
cargopacket_sl.cpp
|
…
|
|
|
cheat_sl.cpp
|
Remove Cheats/ExtraCheats distinction
|
10 months ago |
|
company_sl.cpp
|
Saveload: Change SlSaveToVector to be templated, add SlSaveToTempBuffer
|
1 year ago |
|
debug_sl.cpp
|
Change gamelog to use std::vector
|
1 year ago |
|
depot_sl.cpp
|
…
|
|
|
economy_sl.cpp
|
…
|
|
|
engine_sl.cpp
|
…
|
|
|
extended_ver_sl.cpp
|
…
|
|
|
extended_ver_sl.h
|
…
|
|
|
game_sl.cpp
|
Merge branch 'master' into jgrpp
|
1 year ago |
|
gamelog_sl.cpp
|
Change gamelog to use std::vector
|
1 year ago |
|
goal_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
group_sl.cpp
|
…
|
|
|
industry_sl.cpp
|
…
|
|
|
labelmaps_sl.cpp
|
…
|
|
|
league_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
linkgraph_sl.cpp
|
…
|
|
|
map_sl.cpp
|
…
|
|
|
misc_sl.cpp
|
…
|
|
|
newgrf_sl.cpp
|
…
|
|
|
newgrf_sl.h
|
…
|
|
|
newsignals_sl.cpp
|
Ensure new signal style mapping array is zero-inited
|
10 months ago |
|
object_sl.cpp
|
…
|
|
|
oldloader.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
oldloader.h
|
…
|
|
|
oldloader_sl.cpp
|
Merge branch 'master' into jgrpp
|
9 months ago |
|
order_sl.cpp
|
…
|
|
|
plans_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
saveload.cpp
|
…
|
|
|
saveload.h
|
…
|
|
|
saveload_buffer.h
|
Saveload: Add helper to conditionally save template functor
|
1 year ago |
|
saveload_common.h
|
…
|
|
|
saveload_filter.h
|
…
|
|
|
saveload_internal.h
|
…
|
|
|
saveload_types.h
|
…
|
|
|
signal_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
signs_sl.cpp
|
…
|
|
|
station_sl.cpp
|
…
|
|
|
storage_sl.cpp
|
…
|
|
|
story_sl.cpp
|
…
|
|
|
strings_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
subsidy_sl.cpp
|
…
|
|
|
tbtr_template_replacement_sl.cpp
|
…
|
|
|
tbtr_template_veh_sl.cpp
|
…
|
|
|
town_sl.cpp
|
…
|
|
|
tracerestrict_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
train_speed_adaptation.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
tunnel_sl.cpp
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
|
1 year ago |
|
vehicle_sl.cpp
|
…
|
|
|
waypoint_sl.cpp
|
Merge branch 'master' into jgrpp
|
9 months ago |