Commit Graph

676 Commits (828d2146ebf81e54bdff53c5537d979ec18134c3)

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
Jonathan G Rennison 2e5b8d8110 Fix vertical alignment of group info panel
See also: https://github.com/OpenTTD/OpenTTD/pull/9041
3 years ago
Jonathan G Rennison f83b71828e Partially revert 8e539ce2: Fix train/RV spacing at normal zoom
See: https://github.com/OpenTTD/OpenTTD/pull/9041
3 years ago
Jonathan G Rennison 1e4161ff56 Merge branch 'master' into jgrpp
# Conflicts:
#	src/group_gui.cpp
3 years ago
peter1138 c56fce70b4 Codechange: Replace CMD_SET_GROUP_REPLACE_PROTECTION with generic CMD_SET_GROUP_FLAG. 3 years ago
peter1138 27a956ba62 Codechange: Replace Group::replace_protection with Group::flags 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
PeterN 8e539ce293
Change: Improve layout and spacing of vehicle group widgets. (#9041)
Existing layout included a blank widget above the group list to align with the vehicle list, however since then an additional sort-by row was added.
Group list size tweaks to match normal row size (at least with normal gui and text size.)
Removed reduction of 2 rows in the group list <- main culprit of odd sizing.
Removed fill attribute on buttons which gave strange sizes, and put it on the group info widget instead.
Tweaked various soft-padding values to line up (centreing text with a 1px offset does not make centred text.)
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
Bernard Teo f0a24e98f5
Fix #8922: Show vehicle window for single vehicle in shared order grouping (#8926) 3 years ago
Jonathan G Rennison e95216b59d Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
3 years ago
SamuXarick a4035af337
Codechange: Apply coding style (#8640)
* Fix: Missing or needed spaces

* Codechange: Remove space

* Codechange: Remove space

* Codechange: More missing spaces

* Codechange: Missing spaces

* Codechange: Remove space

* Codechange: Remove space
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 39df1c49a1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
3 years ago
Charles Pigott 9b800a96ed
Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
Patric Stout c988b4d62b
Fix #8332: aborting group drag&drop could cause crashes with vehicle drag&drop (#8511)
The selected group was not reset when drag&drop was aborted. When
after that vehicle drag&drop was successful, group drag&drop code
was still executed, causing weird behaviour or even crashes.
3 years ago
Bernard Teo 4af1acfe92 Feature: Drag-and-drop vehicles in group GUI for shared order groups 4 years ago
Bernard Teo a5047b7566 Cleanup: Use range-based for-loop in group_gui.cpp 4 years ago
Bernard Teo e59c400ca6 Feature: Option to group vehicle lists by shared orders
This applies to all kinds of vehicle lists, as well as the "vehicle groups" window.
4 years ago
Bernard Teo 584df548f1 Codechange: Make vehicle lists internally support grouping of vehicles
This is in preparation for the new UI feature that allows grouping by shared orders.
4 years ago
Jonathan G Rennison 66630ef8df Fix crash in group GUI vehicle/group dragging
See: https://github.com/OpenTTD/OpenTTD/issues/8332
4 years ago
Jonathan G Rennison bbbda0739b Add third DoCommand parameter p3 4 years ago
Jonathan G Rennison 0c0c6c7531 Fix bd2649c1: Use after free in group GUI when removing vehicle 4 years ago
Jonathan G Rennison bb576312cc Fix bd2649c1: Division by zero when there are no vehicles 4 years ago
Jonathan G Rennison 28405b00a4 Fix bd2649c1: Assertion failure when opening group window for non-first company 4 years ago
Jonathan G Rennison bd2649c19e Avoid unnecessary redrawing of vehicle list windows
Redraw info section every tick if values have changed
4 years ago
Jonathan G Rennison 09d5be1aad TBTR: Remove unitnumber_digits field/param from main window 4 years ago
Jonathan G Rennison a36e77c269 Fix group add/remove/rename not updating template replacement GUI in MP 4 years ago
Jonathan G Rennison 817bc44a3e Initial implementation of tracerestrict counter mechanism 4 years ago
Jonathan G Rennison c167648d75 Fix: Violation of strict weak ordering in group name sorters
This could be caused by a group being renamed, and the old
name being cached from a previous sort.

See: #7838
4 years ago
Jonathan G Rennison 4338541be8 Fix potential use of old names in group and engine name sorters
This could result in violation of strict weak ordering
4 years ago
Jonathan G Rennison babe98cdb1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
4 years ago
stormcone 492d2704f1 Fix #7974: Crash when CTRL+click to show a vehicle group that is collapsed 4 years ago
Jonathan G Rennison c50ee4efec Merge branch 'master' into jgrpp
# Conflicts:
#	src/linkgraph/mcf.cpp
4 years ago
Samu 8b0e4bb101 Codechange: Use const instead of magic number for vehicle profit threshold 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
4 years ago
stormcone cc1d72c3a3 Feature: Control + click on the vehicle details button in the vehicle view window opens the vehicle group window, then selects and scrolls to the vehicle's group. 5 years ago
stormcone a363933d08 Feature: Control + click on a vehicle in the vehicle group window selects and scrolls to the vehicle's group. 5 years ago
stormcone 551bde77a4 Add: A function which selects and scrolls to a particular group in the vehicle group window. 5 years ago
glx 4ae829cb27 Codechange: Replace FOR_ALL_GROUPS with range-based for loops 5 years ago
Jonathan G Rennison fe9b024f1a Merge branch 'master' into jgrpp
# Conflicts:
#	src/signs_cmd.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
#	src/waypoint_cmd.cpp
5 years ago
stormcone 40ebf3c765 Fix: Do not refer to a function in the documentation that was removed years ago (#7844)
The 'DoDrawString' was removed with this commit: f11300d
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 91c5dee66c Re-add removed group collapse/expand all buttons 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 2db88953e7 Codechange: use std::sort() in GUIList 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 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
Charles Pigott 49f7332b75 Feature #6053: Collapsible vehicle groups (3298) 5 years ago
Charles Pigott 8890436af1 Add #6189: Groups now count the total number of vehicles in subgroups (3298) 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 a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 5 years ago
Henry Wilson 9cba6f7193 Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit() 5 years ago
Henry Wilson bfd79e59dc Codechange: Replace SmallVector::Clear() with std::vector::clear() 5 years ago
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 5 years ago
Jonathan G Rennison 36ac643749 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/afrikaans.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.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/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/unfinished/persian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/rail_cmd.cpp
#	src/station_cmd.cpp
5 years ago
PeterN 3a4b6b476b
Change: Use selected group as parent when creating a new group. (#7224) 5 years ago
Jonathan G Rennison ddf31702a2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
5 years ago
PeterN 23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108)
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
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
Peter Nelson 310fa1af88 Codechange: Rename function to match what it does and reduce code indenting. 5 years ago
Peter Nelson fe37b40385 Fix: Group hierarchy not visible in RTL languages. 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
5 years ago
Peter Nelson 15320a37b9 Change: OnGameTick() is only called when not paused. 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 e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison ef0a458ab6 Add go to depot and sell vehicle orders
Controlled by a setting (default off)
6 years ago
Jonathan G Rennison a60eff174d Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison 5877cd0f9b TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
Slight code, GUI layout, and savegame format tidying
6 years ago
Jonathan G Rennison 6ec78ff4b0 Add UI setting to disable mass action buttons for top-level vehicle lists 6 years ago
Jonathan G Rennison 53dd010f3b Add way to mass cancel vehicle go to depot/service 6 years ago
Jonathan G Rennison 097cf9b0b1 Add UI setting to control whether cargo filter drop down is shown 7 years ago
Jonathan G Rennison f3c95dd9a7 Add cargo filter support to vehicle list and tracerestrict slot windows
Refactor out common code
7 years ago
Jonathan G Rennison 8d1d69d598 Fix display text for filter veh list by cargo type drop down
Simplify init
7 years ago
Jonathan G Rennison d4de9de61d Fix filtering by cargo type = none in vehicle list 7 years ago
patch-import b1613a24f0 Import: Filter vehicles in company vehicles lists by cargo patch
https://www.tt-forums.net/viewtopic.php?p=1193133#p1193133
7 years ago
Jonathan G Rennison b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
7 years ago
Jonathan G Rennison 83091f55da Merge branch 'vehicle_group_info' into jgrpp 7 years ago
Jonathan G Rennison e4aacee627 Merge branch 'master' into vehicle_group_info
# Conflicts:
#	src/group_gui.cpp
#	src/saveload/vehicle_sl.cpp
7 years ago
Jonathan G Rennison 870216d27c Show manage slots in veh/group window drop down even when no vehicles. 7 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 7 years ago
Jonathan G Rennison 7194e19380 Merge branch 'save_ext' into tracerestrict-sx 7 years ago
peter1138 0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 7 years ago
peter1138 19d56a33e8 (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 7 years ago
Jonathan G Rennison 97d718ecee Merge branch 'lifetime_profit-sx' into jgrpp
# Conflicts:
#	src/vehicle_gui.cpp
7 years ago
Jonathan G Rennison 6d99162df9 Fix disable mask for sorter drop-down being mis-aligned.
Sort by length was incorrectly available, and crashed for non ground
vehicles.
7 years ago
Jonathan G Rennison da058213e6 Merge branch 'group_collapse' into jgrpp 8 years ago
Jonathan G Rennison a0fe6c3c3f Fix collapse all disable state and functionality when partially collapsed.
Fix being able to collapse empty groups with double-click.
8 years ago
Jonathan G Rennison 162e495cc9 Merge branch 'save_ext' into tracerestrict-sx
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison 761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
8 years ago
Jonathan G Rennison 23a1c07378 Merge branch 'master' into template_train_replacement
Fix Template creation window vehicle drag cursor.
8 years ago
frosch caa9bffb56 (svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor. 8 years ago
frosch ddc9205212 (svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor. 8 years ago
Jonathan G Rennison 0d26da998b Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
8 years ago
Jonathan G Rennison 213b0e7e3a Tracerestrict: Add a group membership conditional. 8 years ago
Jonathan G Rennison 580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
8 years ago
Jonathan G Rennison faa72e9615 Only show template replacement menu item where sensible.
Fix drop-down not being sized for template replacement item to fit.
8 years ago
Jonathan G Rennison a31e7ac87d Initial whitespace, formatting, file headers and NULL usage fixes. 8 years ago
Jonathan G Rennison 769462f537 Squashed commit of the following:
commit b17f39a2016dc11a6a9815f398d690d82a6a59aa
Merge: 67b3190 3bb7c47
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Feb 12 19:44:34 2016 +0100

    Merge branch 'merge/trunk27506' into dev

commit 3bb7c4768580198b7316bfeebc4b870d355439e8
Merge: 14929fe 9db36bd
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Feb 12 19:43:53 2016 +0100

    Merge remote-tracking branch 'openttd/master' into merge/trunk27506

commit 14929fe3536e2aa5b4d6a43d0d55043da7a2f252
Merge: af15609 4b8c698
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Feb 10 22:14:25 2016 +0100

    Merge branch 'master' into merge/trunk27506

commit 67b319060b4b88b72c94b0e0c2c9fdcf1c2fd95d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Feb 28 20:17:13 2015 +0100

    removed 2 unused function calls

commit af15609c938eb388dd507b16fb7b6d547c54c2da
Merge: 5465c88 b251ba3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Feb 28 15:12:33 2015 +0100

    Merge branch 'trunk' into merge_trunk

commit 5465c88c8016c5e7910570ab5795222e8348c703
Author: me <streen01@gmx.de>
Date:   Sat Feb 28 10:59:41 2015 +0100

    regenerated MSVS project files

    forgot to do this, they still retained the old filenames

commit 0391455e29c5ed794fcd0f58c63ff98dc52685ac
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 16:53:05 2015 +0100

    removed the patch files from this repo again

    that was a rather dum idea, it made the difference patch between
    branches trunk and tbtr huge.
    the patch files are now being tracked again in the supplimentary repo
    'tbtr_proj', that will keep this fork clean and creating diff-patches
    will be much easier

commit 8395d40386c8d620c90fb4be66cf6679408ac975
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 16:27:40 2015 +0100

    fix for reported bug by DC-1: crash in station gui

    the template gui item was added to the drop-down list that was also
    shown in a station gui, but there was no action present when this item
    was selected in a station gui. per default the game would commit suicide
    by called NOT_REACHED() at the default case of the according
    switch-statement.

commit 833873245d33bd77105a82a584d9bec2362419bc
Merge: 39596be 8688c95
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 15:08:53 2015 +0100

    Merge branch 'fix_disableTemplateOrderCheck' into tbtr

commit 8688c95a01ed5933a35a08597bbf45ff148f5a67
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 15:06:25 2015 +0100

    added fix by DC-1

    don't check the orders list of a virtual vehicle

commit 39596beff9a815a0f9b2ea3abe5d82c3ec5933e7
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 22 10:47:58 2015 +0100

    added history of patches for the mod

commit b3ae74ac4e9143202a1fda1333a91c3716ebb21e
Merge: 9a601a1 ee756e1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 22 10:03:04 2015 +0100

    Merge branch 'tbtr' into merge_tbtr

commit ee756e1c2229534f1cc05edb97269b0c83ddde66
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 22:25:50 2015 +0100

    removed nonsensical comments + disabled code

commit e7d37f0500c56c84a36ce8b93eafb31f800e1086
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 21:30:38 2015 +0100

    added some missing renames in includes

commit 63c2b13766b077e4f2923f321e95d53356dee2db
Merge: e92e6ba 9752606
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 21:22:11 2015 +0100

    Merge branch 'feat_renameFiles' into merge_renameFiles

    Conflicts:
    	src/tbtr_template_gui_create_virtualtrain.cpp

commit 975260643d212f8cac72485f2011011210622849
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Feb 9 22:11:18 2015 +0100

    replaced source file prefix: aaa -> tbtr

commit e92e6ba7089564886d17dd5c1fd8d85ea0ca4ac7
Merge: 62d2f80 ac16eab
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 15:02:19 2015 +0100

    Merge branch 'rm_TODOs' into dev

    Conflicts:
    	src/aaa_template_gui_main.cpp

commit 62d2f809edf170cfbeb0599822c4c3d4f9a1fefe
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:59:36 2015 +0100

    i++ -> ++i

commit ac16eabc082f62b9fe2ef6c11a314f8e9a28c26b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:34:36 2015 +0100

    rm'ed TODOs

commit 22f642f32265882b8f99b409b517823991c08101
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:17:49 2015 +0100

    rm TODO

    yes, depends on the selected template because the button "Start
    replacing" means, to start the replacement for the currently selected
    group and template (create a templatereplacement object for this
    combination)

commit 60d8192838e340a3cf6899979361c997df73b716
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:17:26 2015 +0100

    rm'ed TODO: included task in TODO-list

commit 39e42674ac9f5ad5dd056b613e80ef4e754c1153
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 11:19:36 2015 +0100

    changed window class in use: WC_NONE -> WC_TEMPLATE_GUI_MAIN

commit cadfac96e21aeb862b75e0454197ddce89fb728c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Jan 26 23:18:29 2015 +0100

    removed a weird call to deleteAllTmplReplacements

    was a TODO task, it was set to delete all template replacements
    belonging to group with id -1, which does not exist, ever

commit dc1058464c29f61b6197dec556ec468d1ff38451
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 25 23:27:03 2015 +0100

    removed some TODOs

commit 7afeb17db512600424039099a0f4bd78882fcd8e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 25 11:35:47 2015 +0100

    removed all MYGUI comments

    tried to replace them with useful comments where necessary
    added a few new TODOs here and there

commit 6b9453224a77811062254e6bce7dac4074b829a8
Merge: 292a5aa 687bc4c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 20:47:06 2015 +0100

    Merge branch 'fix_compiler_warnings' into dev

commit 687bc4c34fbb9ddeaf15b4857b235a9709dd85be
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 20:43:26 2015 +0100

    fixed all remaining warnings

commit ada08d7097772e325b7852fd058d8bad7036ae4d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 18:25:45 2015 +0100

    removed testing code that produced a warning

commit f3b1568384f36998aeb1fa51c1fab4cfb96c7f93
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 00:07:34 2015 +0100

    removed unused variable REPLACEMENT_IN_PROGRESS

commit 5aa9098880070cfaa3d2815f445497b2886933f9
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 00:02:43 2015 +0100

    removed variable 'mode' from ClickedOnVehicle()

    member function of class TemplateCreateWindow
    in the depot gui the mode variable is used to decide whether a vehicle
    is started or dragged or ...

    here, we only drag so the mode is never used

commit 292a5aa9dba9cf1d0003e84055fb95357f922454
Merge: 8f6df8c 2bb12bc
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Jan 14 23:41:29 2015 +0100

    Merge branch 'feat_mergePatch0.4c' into dev

commit 2bb12bcf283cccc8869bf537b79b22f479cb7203
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Jan 14 23:32:04 2015 +0100

    added vi's .swp files to .gitignore

commit aecf6f549b32f92342f8e0b65158bebef6270537
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Jan 13 20:15:25 2015 +0100

    corrected UpdateViewport code

    was VehicleUpdateViewport(Vehicle*, bool) before
    is  Vehicle::UpdateViewport(bool, bool) now

commit ae199283fd5ac0199cef1c4c980561122d030199
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Jan 12 22:34:22 2015 +0100

    updated code for EngineNumberSorter

commit 9735035c6dd4ded9bb76958722dc25e26ced5f05
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 11 18:36:17 2015 +0100

    removed unused parameter 'part_of_chain'

    from cargo movement code

commit b8b86e1f2592288ddcfb46a0a5d81c3257da60d3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 4 21:44:17 2015 +0100

    Reimplemented moving of cargo

    - uses the new shift function
    - manages to spread the old cargo of replaced vehicles from a chain across the memebers of the newly constructed chain

    some TODOs are left within the code and some testing needs to be done,
    how this behaves when there is more than one vehicle being replaced

commit 0d76e1bfe10ef207ac5e4018976e9fba0b0bb25e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Jan 3 01:05:54 2015 +0100

    fixed saveload code for TemplateVehicle

commit ba0ea6975f48fe38c2b5376ebc83c23d6bb6151c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:32:23 2015 +0100

    final changes for the merge

    - removed the WDF_UNLICK_BUTTON
    - updated ctor calls to Window()
    - disabled the engine number sorter

commit 9cc213335046b3febfe6649fde40b00e1bb43d5b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:29:03 2015 +0100

    disabled cargo movement during templrpl

    need to reimplement this step since the cargo is now moved
    packet-by-packet and not as a complete list from a vehicle onto another
    vehicle anymore

commit 39743806d0156f8547670c525af0e59083dbcd49
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:16:54 2015 +0100

    replaced cargo function 'Count'

    - not available anymore: VehicleCargoList::Count()
    - using StoredCount() for now, should check if this is the correct count

commit 9b240bbf9b2ee5659bbcb518e9e2767103861254
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:27:56 2015 +0100

    final corrections for template_gui_create_virtualtrain

commit cf0d48d8fa052ff521e1fac0ec75d75107c9b76e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:20:30 2015 +0100

    disbabled usage of not-anymore-existing newgrf_engine.h::ListPositionOfEngine

commit 81da16b7f0c3ea2417b24707329d1d971a67e82e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:09:53 2015 +0100

    fixed typo in value WID_BV_SORT_ASSENDING_DESCENDING

commit c8f81a5c3df5ccf4858bda64a53979af510ccd87
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:09:25 2015 +0100

    create_virtual_train: uint GetEngineListHeight not static

commit bd29d99f80bd824e28104f3bc839fc2a5abdd297
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 00:57:25 2015 +0100

    template_gui_create: static WindowDesc not const

commit edee9c1c544845459102328209b98d424cfd3248
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 00:44:50 2015 +0100

    updated call to Window::FinishInitNested

commit 25fc3cb7ed6db15f42bd3fdff9506621fbba3d72
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Jan 1 23:56:48 2015 +0100

    updated ctor calls for classes derived from Window

    - first param in the constructor used to be const WindowDesc*, now it is
      WindowDesc*

commit 54d710170f1ce9cf5539cd525744ca61f4089e7b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Jan 1 02:50:29 2015 +0100

    updated constr calls to WindowDesc::WindowDesc

    need a const char* at 2nd pos now

commit 7c954141f00666dec4c9559019a1a4af3b452372
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:30:02 2014 +0100

    applied patch vehicle.cpp

commit aa12720049a3dfb1c2e02d453813bd567b67ff60
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:22:54 2014 +0100

    applied patch vehicle_gui.cpp (failed hunks 2,4,5/6)

commit 2b8e70f15478072264f1e063418f8de0744a98e1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:13:29 2014 +0100

    applied patch train_cmd.cpp (failed hunk 1/8)

commit 47499523bf1ed0cce5fdf6cc2a7102e571dcb07d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:07:00 2014 +0100

    applied patch newgrf_engine.cpp

commit 7a40c62a7b5ab8059981270252a7def69eacb7d7
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:02:52 2014 +0100

    applied patch vehicle_cmd.cpp (failed hunks 2,3/3)

commit 277839abd8cb7eb277e4ed6cb72e0f3da5b7e479
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:56:35 2014 +0100

    applied patch saveload.h (failed hunk 1/1)

commit 7b64c87ad3dede6442a88dafa5aa8a6a3e0db812
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:53:56 2014 +0100

    applied patch group_gui.cpp (failed hunks 2,3/4)

commit 8075261c526004e21534fa0ab80429132d5f634b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:46:24 2014 +0100

    applied patch vehiclelist.cpp (failed hunk 1/2)

commit b1c197c0f38e45fb50dad7f7e33f1438b150a34f
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:42:04 2014 +0100

    applied patch train.h (failed hunk 1/3)

commit 81bfa209e92fa74387420cc85851767d2737c1b0
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch viewport.cpp.patch (file src/viewport.cpp)

commit 5c083054544eabac9260a75033198c665b169215
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch train_gui.cpp.patch (file src/train_gui.cpp)

commit 3c3534621c6b37530035faadfa092d70fed724c9
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch source.list.patch (file source.list)

commit 6bbb071431882d4bab43023f7194f96c824e78e5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch saveload_internal.h.patch (file src/saveload/saveload_internal.h)

commit 158640eb786cc7867c9e689eb8a92a209e528a83
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch saveload.cpp.patch (file src/saveload/saveload.cpp)

commit e171ad716c126e98bc045f5ce574ac6161f3ab4f
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs90.vcproj.patch (file projects/openttd_vs90.vcproj)

commit b77486d89c12a80f73f088759da760abd0af7f49
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs80.vcproj.patch (file projects/openttd_vs80.vcproj)

commit 57f9c52fc580da51e20bd40f116fe66c9a0f3669
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs100.vcxproj.patch (file projects/openttd_vs100.vcxproj)

commit bda1f739a415600a7f522b1c7f9ca53fa7713ed3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs100.vcxproj.filters.patch (file projects/openttd_vs100.vcxproj.filters)

commit ed96771b03e726e5cb56cac9a8328c3a1e63856b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch newgrf_spritegroup.cpp.patch (file src/newgrf_spritegroup.cpp)

commit 3df57e0d855fef5f54be4fd8d25e231a7eb3c3f1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch group_cmd.cpp.patch (file src/group_cmd.cpp)

commit da31ca4b67d6993f127c6cecac717eb286ead4e6
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch english.txt.patch (file src/lang/english.txt)

commit ddc0af7139fccbae4060c70440f17c763e3bba96
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch depot_gui.cpp.patch (file src/depot_gui.cpp)

commit 88aca9db192c6a2b92185f56505caf8b91d23ab4
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch autoreplace_cmd.cpp.patch (file src/autoreplace_cmd.cpp)

commit 45ca80f7c9847ac3afe181a0badeb12bbbd5ed0d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch articulated_vehicles.cpp.patch (file src/articulated_vehicles.cpp)

commit 44bd0bf2e77f366b61f96b0f4ca564f2e2e5814a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch afterload.cpp.patch (file src/saveload/afterload.cpp)

commit 679f9b327f9d3f3bec327ae0266f289981972c85
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_veh_sl.cpp.patch (file src/saveload/aaa_template_veh_sl.cpp)

commit ebcec221ec7c1988e85ba458283ff362e034e6d5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle.h.patch (file src/aaa_template_vehicle.h)

commit ad690e74b95d2aa07157b73834eef672c63ef901
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle_func.h.patch (file src/aaa_template_vehicle_func.h)

commit 5982153c369432fc694daaa91a06dfefeeb29485
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle_func.cpp.patch (file src/aaa_template_vehicle_func.cpp)

commit 773f889e165b013de96736fa380d5ab5c311b3dd
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle.cpp.patch (file src/aaa_template_vehicle.cpp)

commit 03af781d69a09863d3b76ee4911e5eecd90a7cf5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_replacement_sl.cpp.patch (file src/saveload/aaa_template_replacement_sl.cpp)

commit ab6cb0562fd390d551670dbc27e0c3c94c8554db
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_gui_replaceall.cpp.patch (file src/aaa_template_gui_replaceall.cpp)

commit d88452a6195c55e39bceb3ea7689fc546c4eee6a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_gui_main.cpp.patch (file src/aaa_template_gui_main.cpp)

commit ab6ac687f355d400ad9ebc154e75477671a8e0fa
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:42:21 2014 +0100

    applied patch aaa_template_gui_create_virtualtrain.cpp.patch (file src/aaa_template_gui_create_virtualtrain.cpp)

commit 288d14b9b145cb045b6a287d23cf3be4f2712ede
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:38:12 2014 +0100

    applied patch aaa_template_gui_create.cpp.patch (file src/aaa_template_gui_create.cpp)

commit 5342db70e07fb7c1f3c41654abd2c6a4c51472c4
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:18:32 2014 +0100

    applied aaa_* header files

commit 6f14e94a0ad715a33a2653cf6c12e1c2981ace8d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:29:55 2014 +0100

    applied vehicle_base.h.patch

commit b76a5ce921fab5d81b60755ce66db71e38664e9b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:29:28 2014 +0100

    applied window_type.h.patch

commit d33d738c7e3477de3f12affcc74c88194a61c442
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:28:30 2014 +0100

    applied newgrf_engine.h.patch

commit 931fd1143706bc76aa145e1430645cb4496f9f4a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:27:21 2014 +0100

    applied vehicle_gui.h.patch

commit f6c4ab089dad5a4a01401e18cffa8f20e02f733e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:00:52 2014 +0100

    applied vehicle_gui_base.h.patch

commit 5f7378136758fcc4987791d264856169950cbfe2
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:34:23 2014 +0100

    applied build_vehicle_widget.h.patch

commit 5c6fc73847a2f34573260721bb68c7b552d546bc
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:01:10 2014 +0100

    applied autoreplace_func.h

commit 7636f27011841d01e5f954c855dfa0cf1859e0e0
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:01:00 2014 +0100

    applied newgrf.h

Remove some spurious whitespace changes, update projects files.
8 years ago
Jonathan G Rennison cbf1ece361 Merge branch 'group_collapse' into jgrpp 9 years ago
Jonathan G Rennison 3e8f370b4c Only enable collapse & (un)collapse all buttons where useful.
Disable collapse button for leaf groups.
Disable (un)collapse all button when all non-leaf groups already
(un)collapsed.
9 years ago
Jonathan G Rennison e04fdeb4ec Add icon for collapsed groups. 9 years ago
Jonathan G Rennison b0b366898f Group collapsing is now per-window, remove C++11 dependance.
Change from a std::map to a SmallVector.
9 years ago
keldorkatarn 7673cadc0e Added buttons to collapse or expand ALL groups.
(cherry picked from commit bb6b96e8663b5cb3da87d8473e70e373a36b3997)
9 years ago
keldorkatarn 34304a130c Groups can now be collapsed and re-expanded.
(cherry picked from commit 9e8d5600557e2d115338a9b173f940065248ed27)
9 years ago
Jonathan G Rennison f9d4213a3a Merge branch 'vehicle_group_info' into jgrpp 9 years ago
Jonathan G Rennison b45e721faa Fix group info when GUI/font is scaled. 9 years ago
Jonathan G Rennison bb2944381f Merge branch 'vehicle_group_info' into jgrpp 9 years ago
Jonathan G Rennison 248bd3b2f7 Vehicle group info: make margins around text symmetric. 9 years ago
Jonathan G Rennison 78b2e5babb Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp 9 years ago
patch-import 45b5145396 Add group info patch
Fix whitespace, add NOSAVE comment in vehicle struct

http://www.tt-forums.net/viewtopic.php?f=33&t=72855
9 years ago
frosch 04aa61ffac (svn r27300) -Fix [FS#6306]: Silence GCC warning (Cif) 9 years ago
frosch 235b7946fc (svn r27300) -Fix [FS#6306]: Silence GCC warning (Cif) 9 years ago
peter1138 6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 10 years ago
peter1138 0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 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
peter1138 816ab7fc8a (svn r26455) -Change: Prompt for confirmation when deleting a vehicle group. 10 years ago
peter1138 fc0646c229 (svn r26455) -Change: Prompt for confirmation when deleting a vehicle group. 10 years ago
peter1138 ed8f6f1a0f (svn r26450) -Feature: Hierarchical vehicle subgroups. 10 years ago
peter1138 567d0ff3a7 (svn r26450) -Feature: Hierarchical vehicle subgroups. 10 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 7dac11fbb2 (svn r25533) -Codechange: Use SetCapacityFromWidget more often. 11 years ago
frosch e184b9799c (svn r25533) -Codechange: Use SetCapacityFromWidget more often. 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 ddf817e8f3 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 11 years ago
frosch ce110eed32 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 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
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 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