Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
55,562 Commits
12 Branches
173 Tags
490 MiB
jgrpp
tmp-jgrpp
master
mapgen-water-desert-removal-circular
wip-string-2
wip-string
diagonal_road_investigations
sse-blitter-set-alpha
desync-debugging
save_ext
tracerestrict
tracerestrict-sx
jgrpp-0.1
jgrpp-0.1.1
jgrpp-0.1.2
jgrpp-0.10.0
jgrpp-0.10.1
jgrpp-0.10.2
jgrpp-0.11.0
jgrpp-0.12.0
jgrpp-0.12.1
jgrpp-0.13.0
jgrpp-0.13.1
jgrpp-0.13.2
jgrpp-0.13.3
jgrpp-0.14.0
jgrpp-0.15.0
jgrpp-0.15.1
jgrpp-0.16.0
jgrpp-0.16.1
jgrpp-0.17.0
jgrpp-0.17.1
jgrpp-0.17.2
jgrpp-0.18.0
jgrpp-0.19.0
jgrpp-0.2.0
jgrpp-0.2.1
jgrpp-0.20.0
jgrpp-0.20.1
jgrpp-0.21.0
jgrpp-0.22.0
jgrpp-0.22.1
jgrpp-0.22.2
jgrpp-0.23.0
jgrpp-0.24.0
jgrpp-0.24.1
jgrpp-0.25.0
jgrpp-0.25.1
jgrpp-0.25.2
jgrpp-0.26.0
jgrpp-0.26.1
jgrpp-0.26.2
jgrpp-0.27.0
jgrpp-0.27.1
jgrpp-0.28.0
jgrpp-0.29.0
jgrpp-0.29.1
jgrpp-0.29.2
jgrpp-0.29.3
jgrpp-0.3.0
jgrpp-0.3.1
jgrpp-0.3.2
jgrpp-0.30.0
jgrpp-0.30.1
jgrpp-0.30.2
jgrpp-0.30.3
jgrpp-0.31.0
jgrpp-0.31.1
jgrpp-0.31.2
jgrpp-0.31.3
jgrpp-0.31.4
jgrpp-0.31.5
jgrpp-0.32-rc1
jgrpp-0.32-rc2
jgrpp-0.32-rc3
jgrpp-0.32-rc4
jgrpp-0.32-rc5
jgrpp-0.32.0
jgrpp-0.32.1
jgrpp-0.32.2
jgrpp-0.32.3
jgrpp-0.32.4
jgrpp-0.33.0
jgrpp-0.33.1
jgrpp-0.33.2
jgrpp-0.34-rc1
jgrpp-0.34.0
jgrpp-0.34.1
jgrpp-0.34.2
jgrpp-0.34.3
jgrpp-0.34.4
jgrpp-0.35.0
jgrpp-0.35.1
jgrpp-0.36.0
jgrpp-0.37.0
jgrpp-0.38.0
jgrpp-0.38.1
jgrpp-0.39.0
jgrpp-0.39.1
jgrpp-0.39.2
jgrpp-0.4.0
jgrpp-0.4.1
jgrpp-0.40.0
jgrpp-0.40.1
jgrpp-0.40.2
jgrpp-0.40.3
jgrpp-0.40.4
jgrpp-0.40.5
jgrpp-0.41.0
jgrpp-0.41.1
jgrpp-0.41.2
jgrpp-0.41.3
jgrpp-0.42.0
jgrpp-0.42.1
jgrpp-0.42.2
jgrpp-0.42.3
jgrpp-0.43.0
jgrpp-0.43.1
jgrpp-0.43.2
jgrpp-0.44-rc1
jgrpp-0.44.0
jgrpp-0.44.1
jgrpp-0.44.2
jgrpp-0.45.0
jgrpp-0.45.1
jgrpp-0.46-rc1
jgrpp-0.46-rc2
jgrpp-0.46.0
jgrpp-0.46.1
jgrpp-0.47.0
jgrpp-0.47.1
jgrpp-0.47.2
jgrpp-0.47.3
jgrpp-0.48.0
jgrpp-0.48.1
jgrpp-0.48.2
jgrpp-0.48.3
jgrpp-0.48.4
jgrpp-0.48.5
jgrpp-0.49.0
jgrpp-0.49.1
jgrpp-0.49.2
jgrpp-0.5.0
jgrpp-0.5.1
jgrpp-0.5.2
jgrpp-0.5.3
jgrpp-0.50.0
jgrpp-0.50.1
jgrpp-0.50.2
jgrpp-0.50.3
jgrpp-0.51.0
jgrpp-0.51.1
jgrpp-0.52.0
jgrpp-0.52.1
jgrpp-0.53.0
jgrpp-0.53.1
jgrpp-0.53.2
jgrpp-0.53.3
jgrpp-0.54.0
jgrpp-0.54.1
jgrpp-0.54.2
jgrpp-0.54.3
jgrpp-0.54.4
jgrpp-0.54.5
jgrpp-0.55.0
jgrpp-0.55.1
jgrpp-0.55.2
jgrpp-0.55.3
jgrpp-0.56.0
jgrpp-0.56.1
jgrpp-0.56.2
jgrpp-0.57.0
jgrpp-0.57.1
jgrpp-0.58.0
jgrpp-0.58.1
jgrpp-0.58.2
jgrpp-0.58.3
jgrpp-0.59.0
jgrpp-0.59.1
jgrpp-0.6.0
jgrpp-0.7.0
jgrpp-0.7.1
jgrpp-0.8.0
jgrpp-0.8.1
jgrpp-0.9.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5a28405ced'
${ noResults }
Commit Graph

183 Commits (5a28405cedf3a2808425f77a0d974943501f1313)

Author SHA1 Message Date
Jonathan G Rennison 5a28405ced Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_gui.cpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/saveload/saveload.cpp
 10 months ago
Jonathan G Rennison c6c69fa3da Add setting for long-term autosaves 
A second set of autosaves for whenever the main set wraps around to 0
 11 months ago
Jonathan G Rennison d75c489466 Add various missing includes 12 months ago
Jonathan G Rennison 0bf41dc1ff Change gamelog to use std::vector 
Move LoadCheckData to its own header
 12 months ago
Jonathan G Rennison d09b504bc5 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h
 12 months ago
Rubidium 324c43eeb2 Codechange: let FiosGetDiskFreeSpace only return disk space and split FiosGetCurrentPath off 1 year ago
Jonathan G Rennison 02fe4af934 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
 1 year ago
Peter Nelson 91e140c722 Codechange: Use unique_ptr for fios company properties. 
This is the data used to show company names in the saveload window.
 1 year ago
Peter Nelson c38df2d589 Codechange: Use std::map instead of custom SmallMap. 1 year ago
Jonathan G Rennison 4ed0c23644 Add text to warning dialog when overwriting a non-extended version save 1 year ago
Peter Nelson 00bf42353a Codechange: Place gamelog into its own class, along with internal data. 
Data is now stored in vectors to avoid manual memory management and
passing lengths around.
 1 year ago
Rubidium 1f3b7e2efd Codechange: use std::string instead of stredup for saveload error messages 1 year ago
Rubidium 3a822fcd01 Codechange: Make FiosItem's name and title std::string 1 year ago
Rubidium f0a1ddd81c Codechange: let FiosBrowseTo return a bool 1 year ago
Tyler Trahan 930f0a16d8 Codechange: Define Date/Year/Month/Day within TimerGameCalendar class 1 year ago
Jonathan G Rennison ae9b416684 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
 1 year ago
Rubidium 4e65ec1dc4 Codechange: do not declare functions in blocks 1 year ago
Jonathan G Rennison 69b6b388d6 On dedicated servers, save copy of last autosave on crash 
This is to avoid all autosaves being overwritten when the server
is auto-restarted with a new map
 3 years ago
Jonathan G Rennison faf32200cf Merge tag '12.0-beta1' into jgrpp-beta 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
 3 years ago
Loïc Guilloux 460991ecf4
Feature: Persistant rotation of numbered auto/netsave after restart (#9397) 
It was always starting from 0 on openttd restart.
Now the most recent auto/netsave number will be used as a base to generate the next filename.
 3 years ago
Rubidium e227bbaff0 Cleanup: remove the old FIO slot functions 
(cherry picked from commit fa6abe1646)
 3 years ago
Rubidium 525f6adcd0 Codechange: let NewGRF sounds make use of RandomAccessFile instead of the FIO slot functions 
(cherry picked from commit c097bc9d7d)
 3 years ago
Rubidium fa6abe1646 Cleanup: remove the old FIO slot functions 3 years ago
Rubidium c097bc9d7d Codechange: let NewGRF sounds make use of RandomAccessFile instead of the FIO slot functions 3 years ago
PeterN 9d72eb02f5 Cleanup: Remove old FiosList helper methods. (#9139) 
(cherry-picked from commit f018471b36)
 3 years ago
Jonathan G Rennison a9515456cb Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_content.h
#	src/network/core/udp.cpp
#	src/table/currency_settings.ini
#	src/table/settings.h.preamble
 3 years ago
PeterN f018471b36
Cleanup: Remove old FiosList helper methods. (#9139) 3 years ago
rubidium42 84985c1223 Codechange: [Network] Do not leak os_abstraction.h via fios.h 3 years ago
Jonathan G Rennison 6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 3 years ago
Jonathan G Rennison 43980639de Merge branch 'master' into jgrpp 
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp
 3 years ago
Michael Lutz b408fe77f7 Codechange: Use std::string in file scanners. 4 years ago
Michael Lutz 65f65ad2ad Codechange: Convert some more FIO functions to take std::string. 4 years ago
Michael Lutz 79240eab1e Codechange: Make use of the improved C++17 emplace_back function. 4 years ago
Jonathan G Rennison e2de103d82 Skip GRF compatibility check when using -K/-q switches 4 years ago
Jonathan G Rennison eef6ad7b2a Crash log: Save config file in new crash save chunk 4 years ago
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
 5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 6792495705 Add -K switch to write savegame debug data and exit 5 years ago
Jonathan G Rennison 0d93ecb6bf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp
 5 years ago
glx 5b77102b63 Codechange: use std::sort() to sort file lists 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison 58433c7667 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
 5 years ago
glx22 66dd7c3879
Fix: MSVC warnings (#7423) 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
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Henry Wilson 097328c3d7 Codechange: Replaced SmallVector::Get() const with std alternatives 5 years ago
Henry Wilson aa7ca7fe64 Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n 5 years ago