9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
9e9d485713
Fix 23960d0f2c: Scrollbar was broken for non-group liveries.
...
Simplify how list position is determined by using existing functions.
Also rename livery_height -> rows and SetLiveryHeight() -> SetRows(), as height implies pixels.
5 years ago
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
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
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
6e5b90f4f7
Change: For consistency, add company name to colour scheme window.
5 years ago
256b94a03d
Fix: Ignore company colour selection when showing different company's colour scheme.
5 years ago
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
fa95af2da8
Codechange: Fix typo in variable name: pices -> pieces ( #7033 )
6 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
52dadc9252
Merge branch 'master' into jgrpp
7 years ago
a682962719
(svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88)
7 years ago
b8456196ef
(svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88)
7 years ago
e6bbbfc58e
Make company finance window max money value non-static.
7 years ago
5ba7bf9da7
Fix company finance window being too small when first opened.
7 years ago
54494a0a7c
Merge branch 'send_money_company' into jgrpp
7 years ago
f820543391
Import give money to company patch
...
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311
Fix language files and minor formatting issues
7 years ago
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
7 years ago
da177d063f
Custom bridge heads: Initial implementation
7 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
ade25fff71
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
9 years ago
2d636266f5
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
217635d357
(svn r26935) -Codechange: Fit company colour selection drop down list to UI scale.
10 years ago
58458c6652
(svn r26935) -Codechange: Fit company colour selection drop down list to UI scale.
10 years ago
c2d4068a5e
(svn r26856) -Codechange: Ensure company face widgets can fit company face.
10 years ago
ea33b69798
(svn r26856) -Codechange: Ensure company face widgets can fit company face.
10 years ago
7a6d2e0110
(svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM
10 years ago
2a16c33461
(svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM
10 years ago
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
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
f44d54a9e4
(svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch)
10 years ago
3dd1a6ad2d
(svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch)
10 years ago
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
83eeba28b7
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
f6d27acb51
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
98fdd20f84
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
c4719635e9
(svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on
11 years ago
4356510408
(svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on
11 years ago
45d3369502
(svn r25516) -Codechange: reduce code duplication in infrastructure statistics window
11 years ago
ba1e42d057
(svn r25516) -Codechange: reduce code duplication in infrastructure statistics window
11 years ago
0a880b87c3
(svn r25515) -Feature [FS#5595]: right align the infrastructure statistics
11 years ago
c27ce651c9
(svn r25515) -Feature [FS#5595]: right align the infrastructure statistics
11 years ago
Jonathan G Rennison
Peter Nelson
PeterN
nikolas
Charles Pigott
frosch
patch-import
rubidium
planetmaker