Commit Graph

868 Commits (42c8f50551d7a7bdd33dfa68578c6ba45dce2bb9)

Author SHA1 Message Date
Jonathan G Rennison 253772e9af Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in
3 years ago
Peter Nelson 2a0365b3d9 Cleanup: Remove unnecessary parameter of GetScrolledRowFromWidget()
Line height defaults to the resize height of the relevant widget, which is
set in all cases. Therefore it is not necessary to specify this value every time.

Additionally fixes scrolled padding for the framerate window.
3 years ago
Jonathan G Rennison edfa04286b Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release.yml
#	bin/CMakeLists.txt
#	src/dock_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/indonesian.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/object_gui.cpp
#	src/pathfinder/yapf/yapf_costrail.hpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_cmd.cpp
#	src/roadveh_cmd.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp
3 years ago
Jonathan G Rennison 2e6dbfee05 Merge branch 'master' into jgrpp 3 years ago
Jonathan G Rennison 5e14b54a0c Merge branch 'master' into jgrpp 3 years ago
Didac Perez Parera e760c9fbec
Fix: adjust object and rail station selection window padding to be consistent (#8929)
consistent
3 years ago
stormcone c56e9a546d Add: Hotkey to focus the rail station class name filter editbox. 3 years ago
Koen Bussemaker 59bfed65a1 Fix #8875: Filter string in station window breaks flow in user interface 3 years ago
Didac Perez Parera e708fb38da
Feature: allow filtering on name in rail station window (#8706) 3 years ago
Jonathan G Rennison dfecdf3afb Merge branch 'master' into jgrpp
# Conflicts:
#	src/dock_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/terraform_gui.cpp
#	src/vehicle.cpp
#	src/video/allegro_v.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/dedicated_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
3 years ago
frosch d9b4413bc9
Codechange: rename sound ids to make more sense. (#8701) 3 years ago
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
3 years ago
Jonathan G Rennison f9956d88c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
3 years ago
Jonathan G Rennison ed0ffb6220 Add feature: realistic train braking
Add setting to select train braking model.
3 years ago
Patric Stout b6ac5a3ab9
Fix 85a49a0d3: hotkeys were enabled outside of GM_NORMAL (#8534) 3 years ago
Patric Stout 85a49a0d36 Change: always allow to click on the toolbar icons for road/rail/dock/airport
This change allows a user to see what is available and what will become
available before it is available, instead of only disabling the button
with no further explanation. It also always allows building roads and
canals, even if no vehicles are available for road / water.

For rail/road/tram, a dropdown with available types is shown. If
none are available, it reads "None". If the type is not yet available,
it is greyed out.

For dock/airport, this always open the toolbar, but building airports,
docks, and depots buttons are disabled till vehicles are available
for those.

Road is the only exception, with the primary road always being
available. Here too, stations and depots are disabled till vehicles
become available. It does mean you can now always build roads to
for example help towns grow.
3 years ago
Charles Pigott 9b800a96ed
Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
Kuhnovic a3a7928372
Feature: option to auto remove signals when in the way during rail construction (#8274) 3 years ago
Jonathan G Rennison bbbda0739b Add third DoCommand parameter p3 4 years ago
Łukasz Hryniuk 3effad0bea
Fix: Properly invalidate mouse-over station coverage highlight (#8263) 4 years ago
Jonathan G Rennison 5e7f42154d Merge branch 'pr-8263' into HEAD 4 years ago
Łukasz Hryniuk 7bef7f86f3 Fix: refresh coverage on option switch 4 years ago
Jonathan G Rennison 7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	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/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
5 years ago
frosch b769eb30c4 Fix: Setting the default railtype to 'first/last available' did not work with NewGRF defined railtypes. 5 years ago
frosch 6fa217dfc8 Codechange: Use RAILTYPE_BEGIN instead of RAILTYPE_RAIL when the intention is iteration. 5 years ago
frosch 3d29c9483b Codechange: Use a switch with fall-through instead of a if-sequence with context data between cases. 5 years ago
Jonathan G Rennison 030e8bf762 Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
5 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 1f535915d1 Merge branch 'master' into jgrpp-nrt
# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm
5 years ago
glx22 b3fd787959 Fix #7188: check the validity of command callback for scripts (#7701) 5 years ago
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 36eb4165b8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
5 years ago
peter1138 c02ef3e456 Feature: Add NotRoadTypes (NRT) 5 years ago
peter1138 81f0f97406 Feature: Add existing station coverage area display when placing new station parts. 5 years ago
Jonathan G Rennison b81967f42a Change default non-global polyrail hotkeys to Y, CTRL-Y
This is to avoid a clash with the transparency hotkeys
5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison f5747bf753 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Michael Lutz c7b9987d08 Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
Jonathan G Rennison a4a3a6a630 Merge branch 'master' into jgrpp 5 years ago
PeterN 6d1cc142c2
Change: Shorten engine rail type drop down in autoreplace window. (#7448)
In the autoreplace window, the rail type drop down is for choosing engines
of the given time. Many rail types do not have engines specifically designed for them,
and are merely compatible with other rail types. This list is thus unwieldy and many
options have no engines available.

As this drop down is for choosing _engine_ rail type rather than compatible rail types,
we can list just the rail types explicitly listed by engines.
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 a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 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
peter1138 9c8b7b5efc Feature: Add rail icon to rail construction drop down list. 5 years ago
Andy 46aca9377b Add: windowshade for rail station construction window 5 years ago
Jonathan G Rennison e3d167f9f0 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
6 years ago
Peter Nelson 2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 6 years ago
Jonathan G Rennison 76a7b70cad Implement NewGRF Station var 0x42 (rail type) for unbuilt stations 6 years ago
Jonathan G Rennison ae15c96c1a Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
6 years ago
Peter Nelson bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 6 years ago
Jonathan G Rennison e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
6 years ago
Jonathan G Rennison 814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 6 years ago
Jonathan G Rennison 0bd1022238 Codechange: Change element type used for rail type usage stats array in SetDefaultRailGui
The array is rail type sized in terms of number of elements.
Each element should be a unsigned integer, not a rail type itself.
This fixes runtime warnings reported by UndefinedBehaviorSanitizer.
6 years ago
Jonathan G Rennison 8f7e9d70ca Fix wrong type used for rail usage stats array in SetDefaultRailGui
This fixes runtime warnings reported by UndefinedBehaviorSanitizer.
6 years ago
Jonathan G Rennison aa138baec9 Add UI setting for whether programmable signals shown in UI (default off)
Add setting subcategory for advanced signal features
7 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
frosch 6f8241d8e9 (svn r27710) -Change: Limit waypoint area by maximum station spread already when dragging. (adf88) 8 years ago
frosch 14dba9764b (svn r27710) -Change: Limit waypoint area by maximum station spread already when dragging. (adf88) 8 years ago
Jonathan G Rennison 58381a3ea2 Merge branch 'master' into jgrpp 8 years ago
frosch ad43465c31 (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 8 years ago
frosch da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 8 years ago
Jonathan G Rennison 37a58fd11d Add setting to increase station catchment radius.
Update acceptance and refresh screen when catchment settings change.
8 years ago
Jonathan G Rennison 3af2f0e923 When building tunnels, open new viewports at the far end of the tunnel.
Loosely based on https://www.tt-forums.net/viewtopic.php?f=33&t=72639
8 years ago
Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison 9a7c1911fc Fix narrowing conversion errors with clang. 8 years ago
Jonathan G Rennison 09291a3b74 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
8 years ago
frosch 9aa33862a7 (svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect. 8 years ago
frosch 14c1a7ad0b (svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect. 8 years ago
Jonathan G Rennison 3da991bf9b Merge branch 'master' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
8 years ago
frosch e8b6b02bc2 (svn r27547) -Fix: Use a more appropiate sound effect for convert-rail. (andythenorth) 8 years ago
frosch 34b68c7a82 (svn r27547) -Fix: Use a more appropiate sound effect for convert-rail. (andythenorth) 8 years ago
Jonathan G Rennison 54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
8 years ago
patch-import 01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
8 years ago
keldorkatarn 5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
8 years ago
Jonathan G Rennison ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
9 years ago
frosch 2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 9 years ago
frosch ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison 2bcbeea011 Merge branch 'progsig-sx' into jgrpp
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
9 years ago
patch-import fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
Jonathan G Rennison 5f1b148cf9 Initial minimal working tracerestrict implementation.
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
frosch 6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 9 years ago
frosch c639fb0d8e (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 9 years ago
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
peter1138 4f63bbedc1 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 10 years ago
peter1138 51fe741987 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 10 years ago
frosch 7b3ead329b (svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours. 10 years ago
frosch 1b0929a9f0 (svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours. 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
frosch 5c3b3f84d6 (svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose. 10 years ago
frosch 5370613924 (svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose. 10 years ago
frosch 504bd2a913 (svn r26375) -Fix [FS#5929]: Station sizes > 8 were always allowed. (adf88) 10 years ago
frosch a9acaf7a5e (svn r26375) -Fix [FS#5929]: Station sizes > 8 were always allowed. (adf88) 10 years ago
rubidium c1cbc05ca7 (svn r26088) -Fix (r26086): Windows compilation 11 years ago
rubidium 2fc10b7e04 (svn r26088) -Fix (r26086): Windows compilation 11 years ago
rubidium 201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
rubidium 83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
rubidium 34ae6d4b39 (svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88) 11 years ago
rubidium 116adbc0e1 (svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88) 11 years ago
frosch ee97c8cfdd (svn r25929) -Fix [FS#5733]: Position signal sprites size-aware in the signal GUI, that is: Center sprites horizontally, and align the vertical reference point at some baseline which centers the tallest sprite. 11 years ago
frosch 56e5a80f5a (svn r25929) -Fix [FS#5733]: Position signal sprites size-aware in the signal GUI, that is: Center sprites horizontally, and align the vertical reference point at some baseline which centers the tallest sprite. 11 years ago
frosch 3c9cfb1678 (svn r25928) -Fix [FS#5733]: Reserve enough space for two digits of signal density. (adf88) 11 years ago
frosch 7351158b3c (svn r25928) -Fix [FS#5733]: Reserve enough space for two digits of signal density. (adf88) 11 years ago
frosch 3d34b5c5a2 (svn r25927) -Fix [FS#5733]: Consider size of signal sprites for sizing the signal GUI. (based on patch by adf88) 11 years ago
frosch eaafbb00ed (svn r25927) -Fix [FS#5733]: Consider size of signal sprites for sizing the signal GUI. (based on patch by adf88) 11 years ago
zuu ac08e89a32 (svn r25854) -Change: Display the cost to upgrade a bridge at the end of bridge that was clicked and not the other end, which could be outside of the screen in some cases (cirdan, LordAro) 11 years ago
zuu 15ebb29447 (svn r25854) -Change: Display the cost to upgrade a bridge at the end of bridge that was clicked and not the other end, which could be outside of the screen in some cases (cirdan, LordAro) 11 years ago
frosch 538159cb1d (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 11 years ago
frosch 43ec0bf0c1 (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 11 years ago
frosch bc4423300d (svn r25535) -Fix [FS#5584]: Initialise scrollbars before FinishInitNested, so their capacity is set via OnResize. 11 years ago
frosch 634607573f (svn r25535) -Fix [FS#5584]: Initialise scrollbars before FinishInitNested, so their capacity is set via OnResize. 11 years ago
frosch ac73a5fea6 (svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window. 11 years ago
frosch 5f8f71edf0 (svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window. 11 years ago
frosch f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
frosch 98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
frosch 4a8f47b9a5 (svn r25464) -Fix: Hide default size button in non-newstation rail-station picker since it is not resizeable anyway. 11 years ago
frosch bbbecceae1 (svn r25464) -Fix: Hide default size button in non-newstation rail-station picker since it is not resizeable anyway. 11 years ago
frosch 173aed1687 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 11 years ago
frosch fef30983e6 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 11 years ago
frosch 303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 11 years ago
frosch 5cb174c6b8 (svn r25412) -Codechange: Make use of Window::OnHotkey 11 years ago
frosch 1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 1b8b1f3f6c (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
frosch d9e9710cb3 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
frosch fdd94f7601 (svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file. 11 years ago
frosch bb308c5e30 (svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file. 11 years ago
frosch 01dc8ee620 (svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window. 11 years ago
frosch 9cb89b3639 (svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window. 11 years ago
frosch 13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
planetmaker 910dac6311 (svn r25064) -Fix [FS#5472]: Make sizes of the station preview identical list and direction selection identical in the station build window 11 years ago
planetmaker a742ad7d36 (svn r25064) -Fix [FS#5472]: Make sizes of the station preview identical list and direction selection identical in the station build window 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch 336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 3ce8d2ce70 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch facad68514 (svn r24507) -Fix [FS#5285]: The mousewheel did not work in the build waypoint window. (sbr) 12 years ago
frosch 4512a4f225 (svn r24507) -Fix [FS#5285]: The mousewheel did not work in the build waypoint window. (sbr) 12 years ago
michi_cc bcac892dd7 (svn r24367) -Feature: [NewGRF] Customisable signals for rail types. 12 years ago
michi_cc b0d21d2fad (svn r24367) -Feature: [NewGRF] Customisable signals for rail types. 12 years ago
frosch 97608f0814 (svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount() 12 years ago
frosch c841a78f69 (svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount() 12 years ago
frosch 3d7ac6af1a (svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount(). 12 years ago
frosch 0f0e7e43cf (svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount(). 12 years ago
frosch d42bd940b2 (svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving). 12 years ago
frosch 6f4d2160c2 (svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving). 12 years ago
michi_cc ca32ed6b32 (svn r24144) -Change [FS#4605]: Reset 'convert signal' button when signal GUI is closed. (yorick) 12 years ago
michi_cc f6d0bf6109 (svn r24144) -Change [FS#4605]: Reset 'convert signal' button when signal GUI is closed. (yorick) 12 years ago
michi_cc e3588ac916 (svn r24130) -Feature(ette): [FS#2314]: Deselect 'remove' button when changing signal types in the GUI. (Alberth) 12 years ago
michi_cc f1c59a3159 (svn r24130) -Feature(ette): [FS#2314]: Deselect 'remove' button when changing signal types in the GUI. (Alberth) 12 years ago
michi_cc 88cfe6fc9c (svn r24129) -Feature [FS#3660]: Option to minimise signal distance when dragging over obstacles. (adf88) 12 years ago
michi_cc 708d5b6712 (svn r24129) -Feature [FS#3660]: Option to minimise signal distance when dragging over obstacles. (adf88) 12 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
truebrain c74ccfff1b (svn r23601) -Fix: fix the conflict in window number 13 years ago
truebrain 561b25d031 (svn r23601) -Fix: fix the conflict in window number 13 years ago
truebrain 7aadc751a8 (svn r23560) -Codechange: final pieces of consistency through widgets 13 years ago
truebrain 20a7276510 (svn r23560) -Codechange: final pieces of consistency through widgets 13 years ago
rubidium 7a6217479a (svn r23556) -Codechange: unify rail widget naming and document them 13 years ago
rubidium 95642f956f (svn r23556) -Codechange: unify rail widget naming and document them 13 years ago
truebrain d1dc135461 (svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile 13 years ago
truebrain 98d3f11d45 (svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile 13 years ago
truebrain 49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
truebrain 2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
rubidium a8014c0af5 (svn r23338) -Feature [FS#4841]: diagonal dragging the rail conversion tool when pressing CTRL 13 years ago
rubidium 95f88ea537 (svn r23338) -Feature [FS#4841]: diagonal dragging the rail conversion tool when pressing CTRL 13 years ago
rubidium 7d447d139a (svn r23330) -Fix [FS#4853] (r23316): alignment of signals in the signals menu was incorrect 13 years ago
rubidium 61abe29108 (svn r23330) -Fix [FS#4853] (r23316): alignment of signals in the signals menu was incorrect 13 years ago
frosch ebf19d6219 (svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity. 13 years ago
frosch 30874b5e81 (svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity. 13 years ago
planetmaker 35b7183a88 (svn r22714) -Fix: If there's no point in opening the rail toolbar, don't open it for people who use hotkeys either rather than only for those using GUI elements 13 years ago
planetmaker 75b92328c2 (svn r22714) -Fix: If there's no point in opening the rail toolbar, don't open it for people who use hotkeys either rather than only for those using GUI elements 13 years ago
alberth a70556dac2 (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
alberth 28092366ec (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 13 years ago
frosch 7b251297c9 (svn r22429) -Add: some constants for specific palette colours used in the GUI. 13 years ago
frosch 5e449b8fae (svn r22429) -Add: some constants for specific palette colours used in the GUI. 13 years ago
frosch 7cc3d3e143 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 13 years ago
frosch 22286bd7b6 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 13 years ago
frosch 4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
frosch ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
frosch b322714e55 (svn r22128) -Fix [FS#4530]: Build-station-window showed wrong selection when reopening. (Regiovogel) 14 years ago
frosch ee111ce1a4 (svn r22128) -Fix [FS#4530]: Build-station-window showed wrong selection when reopening. (Regiovogel) 14 years ago
rubidium cb2c7f871f (svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h 14 years ago
rubidium bc3ce1e53b (svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h 14 years ago