Commit Graph

95 Commits (0704fb81a3edeea0adf6e86fc9611346ef7d5ac9)

Author SHA1 Message Date
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 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 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 c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Henry Wilson 297fd3dda3 Codechange: Replaced SmallVector::Include() with include() 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Henry Wilson 5795f66d2e Codechange: Replaced SmallVector::Contains() with std::find() pattern 5 years ago
Henry Wilson 81315939b9 Codechange: Replaced SmallVector::Find() non-const with std::find() 5 years ago
Henry Wilson a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 5 years ago
Henry Wilson bfd79e59dc Codechange: Replace SmallVector::Clear() with std::vector::clear() 5 years ago
Jonathan G Rennison 6bcc705c7c Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/saveload.cpp
6 years ago
Samuel Cochran 1a73c39838 Add: BACKSPACE can be mapped as a hotkey 6 years ago
Jonathan G Rennison 83091f55da Merge branch 'vehicle_group_info' into jgrpp 7 years ago
peter1138 48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 7 years ago
peter1138 73ea8cdb21 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 7 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 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
rubidium 3421bfc9ca (svn r25973) -Fix [FS#5679]: comma key collided with F12 key for hotkeys; also remove '+' as that is generally not a key (the '+' on the numpad is a separate one) 11 years ago
rubidium 63e0ff048e (svn r25973) -Fix [FS#5679]: comma key collided with F12 key for hotkeys; also remove '+' as that is generally not a key (the '+' on the numpad is a separate one) 11 years ago
michi_cc e9b5dee3ab (svn r25669) -Codechange: Pass UCS-4 instead of UCS-2 characters to the hotkey handlers. 11 years ago
michi_cc 1567e32d89 (svn r25669) -Codechange: Pass UCS-4 instead of UCS-2 characters to the hotkey handlers. 11 years ago
frosch 173aed1687 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 11 years ago
frosch fef30983e6 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 11 years ago
frosch 1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 1b8b1f3f6c (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
frosch d9e9710cb3 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
zuu 1363b5700e (svn r24554) -Add: Hotkeys for widgets in AI Debug window 12 years ago
zuu eff4bbeb53 (svn r24554) -Add: Hotkeys for widgets in AI Debug window 12 years ago
rubidium 4ef3d33895 (svn r23193) -Codechange: don't cast away const unneededly 13 years ago
rubidium bd64bf6372 (svn r23193) -Codechange: don't cast away const unneededly 13 years ago
rubidium 9838ceb880 (svn r22824) -Codechange: pass sub directory to ini loading 13 years ago
rubidium 05300a00b1 (svn r22824) -Codechange: pass sub directory to ini loading 13 years ago
alberth a14f4eb271 (svn r22144) -Codechange: Unify 'while (true)' to 'for (;;)' 14 years ago
alberth 1dbc0a20be (svn r22144) -Codechange: Unify 'while (true)' to 'for (;;)' 14 years ago
yexo 3691ba18c4 (svn r22142) -Fix (r22094): some valid keycodes were ignored along with the invalid ones 14 years ago
yexo f7f3db7174 (svn r22142) -Fix (r22094): some valid keycodes were ignored along with the invalid ones 14 years ago
yexo e491123e40 (svn r22094) -Fix [FS#4510]: remove invalid keycodes when reading hotkeys.cfg 14 years ago
yexo 24753fbd35 (svn r22094) -Fix [FS#4510]: remove invalid keycodes when reading hotkeys.cfg 14 years ago
rubidium 54c0dec6aa (svn r21909) -Fix: some missing spaces 14 years ago
rubidium 8017c2a3d7 (svn r21909) -Fix: some missing spaces 14 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago