Jonathan G Rennison
|
88670a230f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
|
6 months ago |
|
Jonathan G Rennison
|
2a31095118
|
Merge branch 'master' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/console_cmds.cpp
# src/date_gui.cpp
# src/engine.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/hotkeys.cpp
# src/network/core/tcp_connect.cpp
# src/network/core/tcp_listen.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_engine.cpp
# src/newgrf_gui.cpp
# src/newgrf_station.cpp
# src/openttd.cpp
# src/order_gui.cpp
# src/os/macosx/osx_main.cpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_industrytype.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settingsgen/settingsgen.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_game_calendar.h
# src/timer/timer_manager.h
# src/timer/timer_window.cpp
# src/timetable_cmd.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/vehicle_cmd.h
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_func.h
# src/window_gui.h
|
6 months ago |
Michael Lutz
|
86e28e79fb
|
Fix #11402: Make string filter locale-aware.
|
7 months ago |
Rubidium
|
c9276c2959
|
Codechange: replace x.size() == 0 with x.empty()
|
7 months ago |
|
Jonathan G Rennison
|
d75c489466
|
Add various missing includes
|
11 months ago |
|
Rubidium
|
3323402aaa
|
Codechange: rename smallvec_type to container_func and use only when needed
|
1 year ago |
|
Rubidium
|
20ff0bccd7
|
Codechange: use std::string to store script GUI's break string
|
1 year ago |
Tyler Trahan
|
ba3de0383a
|
Codechange: Pass more std::string to StringFilter::AddLine() (#10743)
|
1 year ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Henry Wilson
|
cc62f4163f
|
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
|
5 years ago |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
5 years ago |
|
Henry Wilson
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
5 years ago |
frosch
|
2d550a7579
|
(svn r24632) -Feature: Add text filtering to advanced settings.
|
12 years ago |
|
frosch
|
03046f614f
|
(svn r24337) -Feature: Allow filtering for multiple words (separated by whitespace resp. quoted) in the sign list, content- and NewGRF-guis.
|
12 years ago |