Jonathan G Rennison
|
ead18b2af2
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
|
11 months ago |
Rubidium
|
80d8c01814
|
Codechange: replace std::vector + duplicate preventing include with std::set
|
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
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
5 years ago |
michi_cc
|
1567e32d89
|
(svn r25669) -Codechange: Pass UCS-4 instead of UCS-2 characters to the hotkey handlers.
|
11 years ago |
frosch
|
fef30983e6
|
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
|
11 years ago |
|
frosch
|
1b8b1f3f6c
|
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
|
11 years ago |
|
frosch
|
d9e9710cb3
|
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
|
11 years ago |
alberth
|
4af8c2d5e1
|
(svn r23704) -Doc: Doxygen comment fixes and additions.
|
13 years ago |
yexo
|
063909962a
|
(svn r20074) -Fix (r20065): highscore window should use the same hotkey for quit as the toolbar
|
14 years ago |
|
yexo
|
26be68ae98
|
(svn r20070) -Feature: when none of the open windows handles a keypress, try all toolbars for global hotkeys
Users that have run a version between r20056 and r20068 should delete their hotkeys.cfg to reset the terraform toolbar hotkeys to default
|
14 years ago |
|
yexo
|
4012f85eec
|
(svn r20067) -Add: special modifier (GLOBAL) to mark hotkeys as global hotkeys
|
14 years ago |
|
yexo
|
70a35a94b5
|
(svn r20059) -Feature: customizable hotkeys for the main window (the global hotkeys)
|
14 years ago |
|
yexo
|
258ca28819
|
(svn r20055) -Feature: save/load hotkeys to/from hotkeys.cfg
|
14 years ago |
|
yexo
|
d1044c036a
|
(svn r20054) -Add: framework to check for hotkeys
|
14 years ago |