Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
58,051 Commits
12 Branches
173 Tags
481 MiB
jgrpp
master
tmp-jgrpp
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 'jgrpp'
${ noResults }
Commit Graph

20 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 606d7cd814 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/direction_type.h
#	src/gfx_type.h
#	src/group_gui.cpp
#	src/misc_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/signs_gui.cpp
#	src/slope_func.h
#	src/smallmap_gui.cpp
#	src/terraform_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/town_type.h
#	src/vehicle_type.h
#	src/widget_type.h
 4 months ago
Jonathan G Rennison 1914c11459 Debug: Use zoning dropdown for debug zoning modes 
Control visibility using misc_debug 2, instead of controlling
debug modes themselves using misc_debug
 4 months ago
Jonathan G Rennison a0475b16a0 Zoning window: Refactor string/mode mapping handling 4 months ago
Jonathan G Rennison 42c8f50551 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
 5 months ago
Jonathan G Rennison 2e06374f6f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/gfx_func.h
#	src/group_gui.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/news_gui.cpp
#	src/settings_gui.cpp
#	src/ship_gui.cpp
#	src/smallmap_gui.cpp
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
 5 months ago
Jonathan G Rennison 88670a230f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
 6 months ago
Jonathan G Rennison 0d4d4a9cac Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
 6 months ago
Jonathan G Rennison c929f7075e Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
 6 months ago
Jonathan G Rennison 6ccf3774b6 Fix missing tooltip texts 9 months ago
Jonathan G Rennison 6d4474b84e Merge tag '13.0-beta2' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 1 year ago
Jonathan G Rennison 38a153017f One-way road zoning mode 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
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison 92a5e59165 Zoning: Add modes to show 2x2 and 3x3 town road grids 6 years ago
Jonathan G Rennison 38fb8c1b84 Zoning: Cache expensive zoning overlay values 6 years ago
Jonathan G Rennison b9091a0f6c Merge branch 'zoning' into jgrpp 
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
 9 years ago
Jonathan G Rennison 7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 9 years ago
Jonathan G Rennison 34ce418b63 Zoning: Add mode to show restricted signals. 9 years ago
Jonathan G Rennison 03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues, 
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
 9 years ago
patch-import 6de087786c Import and rebase zoning patch 
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
 9 years ago