Jonathan G Rennison
|
4adfe0c9ae
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
|
5 years ago |
glx
|
5c10c426fe
|
Fix 196d5868: Always apply filter on town directory rebuild
|
5 years ago |
Jonathan G Rennison
|
b868ce8605
|
Town directory window: Only resort on population change if necessary
|
5 years ago |
Jonathan G Rennison
|
68fa46d351
|
Remove unused variable TownDirectoryWindow::last_town
|
5 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 |
Jonathan G Rennison
|
7afa667e66
|
Use town cached name for town list window filtering
|
5 years ago |
glx
|
ee7a8eebca
|
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
|
5 years ago |
glx
|
3a14cea068
|
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
|
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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
Charles Pigott
|
fe9731d32c
|
Fix: clang and MSVC warnings (glx)
|
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
|
6562937899
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
|
5 years ago |
Jonathan G Rennison
|
ec892879f4
|
Add passworded mechanism to change server game settings from client
|
5 years ago |
Gabda
|
b870596f15
|
Add #6887: Option to show zone inside local authority boundary of towns
Can be found at town information > local authority window
Layout for button is same as Graph Keys
Turn on/off for every town individually
|
5 years ago |
TELK
|
196d586849
|
Feature: Town name filtering (#7621)
|
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 |
Jonathan G Rennison
|
8eeae134db
|
Add NewGRF debug button to town view GUI
|
5 years ago |
Jonathan G Rennison
|
f6b9395c6a
|
Improve performance of name sorting in town and station list windows
|
5 years ago |
Jonathan G Rennison
|
24458e9990
|
Add various missing override specifiers
|
5 years ago |
peter1138
|
b454ca7110
|
Fix 81d335b: Coverage button missing from town window in scenario editor.
|
5 years ago |
peter1138
|
81d335b081
|
Feature: Add station coverage area display for towns.
|
5 years ago |
Jonathan G Rennison
|
bd2fdde759
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
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 |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Jonathan G Rennison
|
58433c7667
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
|
5 years ago |
glx22
|
66dd7c3879
|
Fix: MSVC warnings (#7423)
|
5 years ago |
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
5 years ago |
Henry Wilson
|
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
|
e3b85f617b
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/station_cmd.cpp
|
5 years ago |
Johannes E. Krause
|
e6798ffdca
|
Cleanup: Remove questionable syntax in town rating display
|
5 years ago |
Jonathan G Rennison
|
3330e4cef8
|
Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
|
6 years ago |
Jonathan G Rennison
|
4d1bd8e4b4
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
|
6 years ago |
Alberth289346
|
11ba094582
|
Feature #4186: Append '(City)' behind cities in the town directory (sbr)
|
6 years ago |
Jonathan G Rennison
|
8e9d68048a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/string.cpp
|
6 years ago |
PeterN
|
eaa32f5ad5
|
Change: Use name of cargo instead of Passengers/Mail in town statistics. (#6801)
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
|
6 years ago |
Jonathan G Rennison
|
ad1c402ad8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
|
6 years ago |
Pavel Stupnikov
|
fef8b831a9
|
Change: Switch town growth rate and counter to actual game ticks (#6763)
|
6 years ago |
J0an Josep
|
cfb8092397
|
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
|
6 years ago |
Jonathan G Rennison
|
f34833f111
|
Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
# src/vehiclelist.cpp
|
7 years ago |
frosch
|
b4b98e5165
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
7 years ago |
frosch
|
a47fb85cd8
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
7 years ago |