Jonathan G Rennison
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
frosch
3e2ec8a545
(svn r27901) -Codechange: GetWindowZPriority only needs a WindowClass; this way it can also be used for WindowDesc before a Window instance is created. (3298)
7 years ago
frosch
5aecfd11f0
(svn r27900) -Change [FS#6568]: Remove the gap between windows when positioning them after opening.
...
-Fix: Make automatic window-positioning RTL-aware.
-Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values.
7 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
Jonathan G Rennison
83091f55da
Merge branch 'vehicle_group_info' into jgrpp
7 years ago
peter1138
95cab27381
(svn r27826) -Fix (r27825): Wrong code style
7 years ago
peter1138
0e68f9db70
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
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
Jonathan G Rennison
064a36b319
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
Jonathan G Rennison
102405e082
Fix recursive faults in Window crash logger due to message box event loop.
7 years ago
Jonathan G Rennison
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
8 years ago
Jonathan G Rennison
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
8 years ago
frosch
dbe969087d
(svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88)
8 years ago
Jonathan G Rennison
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison
761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
8 years ago
frosch
0e3e4eeb53
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
8 years ago
Jonathan G Rennison
09291a3b74
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
frosch
51e274a523
(svn r27579) -Change [FS#6402]: Performance improvement for dedicated servers by skipping drawing calls earlier in the process. (JGR)
8 years ago
Jonathan G Rennison
54b8eb9b4c
Merge branch 'polyline_track_tool' into jgrpp
...
# Conflicts:
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
8 years ago
patch-import
01cf154f51
Import polyline rail tool patch v10b
...
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
8 years ago
Jonathan G Rennison
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
Jonathan G Rennison
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
frosch
c74ffeecd1
(svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows.
9 years ago
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 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
7cb07acd86
(svn r27185) -Fix: prevent the compiler from optimizing an assignment away which caused GCC 5 to actually crash
9 years ago
frosch
5ebc0c9934
(svn r27147) -Fix: Scale (non-custom) default window sizes according to GUI zoom.
9 years ago
frosch
abe22e594d
(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.
9 years ago
peter1138
2655de52d7
(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.
10 years ago
planetmaker
035fedd30b
(svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms
10 years ago
alberth
ac23e46713
(svn r26610) -Feature: Select an editable preset name for saving.
10 years ago
rubidium
beb540ec55
(svn r26538) -Codechange: remove double accounting of the drivers
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
alberth
20b9015d74
(svn r26392) -Fix[FS#5933] No need to call OnFocus twice (MJP)
10 years ago
rubidium
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
rubidium
115877a111
(svn r26122) -Fix-ish: remove essentially dead code; if nested_array were NULL there, it would segfault in RaiseWidget
11 years ago
frosch
f16b78eb81
(svn r25884) -Fix: Resizing the window did not properly resize the viewport window, resulting in the link graph glitching.
11 years ago
michi_cc
164aba8732
(svn r25692) -Add: Replacement of a part of the edit box text with a new string.
11 years ago
michi_cc
e34fe220e2
(svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string.
11 years ago
michi_cc
4dbe823a5f
(svn r25690) -Change: [OSX] Position the candidate window at the caret position.
11 years ago
michi_cc
88a71979dd
(svn r25689) -Add: [OSX] Display the IME composition string ourself.
11 years ago
michi_cc
d442d97cf1
(svn r25684) -Change: [Win32] Draw the composition string ourselves if possible.
11 years ago
michi_cc
fa7a779cf7
(svn r25681) -Change: [Win32] Position the IME composition window at the caret position.
11 years ago
michi_cc
1880c36405
(svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system.
11 years ago
michi_cc
07cd393f7e
(svn r25678) -Codechange: Notify the video driver when an edit box lost (global) focus so it can abort any current input composition.
11 years ago
michi_cc
be50bc410f
(svn r25671) -Codechange: Pass character and key code separately to the keyboard handler.
11 years ago
michi_cc
d5590fa8f2
(svn r25670) -Codechange: Pass UCS-4 characters to the edit box key handler.
11 years ago