761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
8 years ago
0e3e4eeb53
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
8 years ago
3cb7d9703b
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
8 years ago
4c0423d6d8
Merge branch 'master' into jgrpp
8 years ago
91ddd32c20
(svn r27560) -Fix: typos in comments and string
8 years ago
53982003ee
(svn r27560) -Fix: typos in comments and string
8 years ago
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
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
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
9fc308b70e
Update land info window to indicate if signal tile is restricted.
9 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
9 years ago
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
9 years ago
18a1131e9f
(svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus.
9 years ago
c9114af706
(svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus.
9 years ago
988b387f14
(svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo)
10 years ago
8739a7b7d0
(svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo)
10 years ago
ca4f7b0eca
(svn r27023) -Codechange: Scale tooltip size by UI scale.
10 years ago
3730ed67cb
(svn r27023) -Codechange: Scale tooltip size by UI scale.
10 years ago
d408cabca7
(svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned.
10 years ago
ffe820c792
(svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned.
10 years ago
337af973b0
(svn r26873) -Change: split type_height into a type and height array (ic111)
10 years ago
04e2324b8f
(svn r26873) -Change: split type_height into a type and height array (ic111)
10 years ago
cd084721b4
(svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2)
10 years ago
bcb9c64ac8
(svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2)
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
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
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
2ce5034005
(svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window.
10 years ago
f0e7f9982a
(svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window.
10 years ago
e34fe220e2
(svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string.
11 years ago
30867c487f
(svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string.
11 years ago
4dbe823a5f
(svn r25690) -Change: [OSX] Position the candidate window at the caret position.
11 years ago
e2ec0ddb03
(svn r25690) -Change: [OSX] Position the candidate window at the caret position.
11 years ago
931bbd7191
(svn r25683) -Add: Support for a marked/selected range to the textbuf.
11 years ago
64d2fc4d1e
(svn r25683) -Add: Support for a marked/selected range to the textbuf.
11 years ago
fa7a779cf7
(svn r25681) -Change: [Win32] Position the IME composition window at the caret position.
11 years ago
da09fd3077
(svn r25681) -Change: [Win32] Position the IME composition window at the caret position.
11 years ago
872acc5287
(svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers.
11 years ago
b911f4a452
(svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers.
11 years ago
3c6220c350
(svn r25375) -Update: add fonsinchen to credits
11 years ago
f9b08b1aec
(svn r25375) -Update: add fonsinchen to credits
11 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
337460249d
(svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes.
11 years ago
c2c50b0c50
(svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes.
11 years ago
9c23446b2b
(svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf.
11 years ago
579ee7a592
(svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf.
11 years ago
c62cbe04a4
(svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen)
11 years ago
446d50f658
(svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen)
11 years ago
b1ae655ddc
(svn r24960) -Fix [FS#5423]: inconsistencies in the "thanks to" lists
11 years ago
e65a710986
(svn r24960) -Fix [FS#5423]: inconsistencies in the "thanks to" lists
11 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
18b97fa062
(svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow)
12 years ago
5b2da98ca3
(svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow)
12 years ago
a68b7c0068
(svn r24774) -Fix: Invert the focus handling of the OSK. Keep the focus at the OSK and close it on losing focus. This makes the editbox in the OSK behave correctly.
12 years ago
5dfd5e58ee
(svn r24774) -Fix: Invert the focus handling of the OSK. Keep the focus at the OSK and close it on losing focus. This makes the editbox in the OSK behave correctly.
12 years ago
42d27b5e17
(svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor.
12 years ago
155a9d784c
(svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor.
12 years ago
dbeb31860b
(svn r24748) -Add: Clear button to all editboxes.
12 years ago
5e8238c75c
(svn r24748) -Add: Clear button to all editboxes.
12 years ago
44d79aa9e5
(svn r24746) -Cleanup: Remove weird lowering of editboxes.
12 years ago
aed11012d4
(svn r24746) -Cleanup: Remove weird lowering of editboxes.
12 years ago
11f5889521
(svn r24745) -Codechange: Draw complete editbox via QueryString.
12 years ago
1b3e8a8af6
(svn r24745) -Codechange: Draw complete editbox via QueryString.
12 years ago
d7ed7264e2
(svn r24744) -Codechange: Handle clicking on editboxed also via QueryString.
12 years ago
c8c040d057
(svn r24744) -Codechange: Handle clicking on editboxed also via QueryString.
12 years ago
18dcd2e6a4
(svn r24742) -Codechange: Remove QueryStringBaseWindow and store QueryStrings per widget instead.
12 years ago
f5d8ba5d7f
(svn r24742) -Codechange: Remove QueryStringBaseWindow and store QueryStrings per widget instead.
12 years ago
ec27bcb6a6
(svn r24740) -Codechange: Remove duplicate members from QueryStringBaseWindow and directly use QueryString.
12 years ago
6e6d94a2d1
(svn r24740) -Codechange: Remove duplicate members from QueryStringBaseWindow and directly use QueryString.
12 years ago
0ab8e7939b
(svn r24738) -Codechange: Remove Textbuf::Initialize in favour of a constructor.
12 years ago
f6d4200f86
(svn r24738) -Codechange: Remove Textbuf::Initialize in favour of a constructor.
12 years ago
2ccba5e6c5
(svn r24735) -Codechange: Move HandleEditBoxKey to Window class.
12 years ago
fc2b12acca
(svn r24735) -Codechange: Move HandleEditBoxKey to Window class.
12 years ago
f1d40ca6f2
(svn r24734) -Codechange: Move QueryStringBaseWindow::OnOSKInput to Window::OnEditboxChanged.
12 years ago
2c22fe98dd
(svn r24734) -Codechange: Move QueryStringBaseWindow::OnOSKInput to Window::OnEditboxChanged.
12 years ago
08e92e6f23
(svn r24733) -Codechange: Move handling of editbox keys to window class.
12 years ago
c4d7c8dd42
(svn r24733) -Codechange: Move handling of editbox keys to window class.
12 years ago
8f611527e9
(svn r24732) -Codechange: Unify handling of OK and CANCEL actions for editboxes.
12 years ago
7699a7dc06
(svn r24732) -Codechange: Unify handling of OK and CANCEL actions for editboxes.
12 years ago
c6ac0299a8
(svn r24731) -Codechange: Remove OnOpenOSKWindow and instead specify OK and CANCEL buttons via QueryString members.
12 years ago
fd55399167
(svn r24731) -Codechange: Remove OnOpenOSKWindow and instead specify OK and CANCEL buttons via QueryString members.
12 years ago
a1fd98291b
(svn r24730) -Codechange: Allow OSK to simulate widget buttons with index 0.
12 years ago
67f92f16ed
(svn r24730) -Codechange: Allow OSK to simulate widget buttons with index 0.
12 years ago
c12caa20aa
(svn r24729) -Codechange: Unify the handling of HEBR_EDITING.
12 years ago
6d1fe626f5
(svn r24729) -Codechange: Unify the handling of HEBR_EDITING.
12 years ago
e0f59fb049
(svn r24726) -Codechange: Move editbox mouseloop handling to Window class.
12 years ago
137adb3496
(svn r24726) -Codechange: Move editbox mouseloop handling to Window class.
12 years ago
e95b757c11
(svn r24724) -Codechange: Move drawing of editboxes to the widget drawing code.
12 years ago
17025fa6ea
(svn r24724) -Codechange: Move drawing of editboxes to the widget drawing code.
12 years ago
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
9966ebf3c9
(svn r24521) -Feature [FS#5203]: Ctrl + Backspace/Delete to remove characters up to next word beginning in text edit boxes
12 years ago
bcf1cb1f9c
(svn r24521) -Feature [FS#5203]: Ctrl + Backspace/Delete to remove characters up to next word beginning in text edit boxes
12 years ago
072fdc43a0
(svn r24520) -Feature [FS#5203]: Ctrl + Arrow keys to move entire words in text edit boxes (sbr)
12 years ago
0656a8d40b
(svn r24520) -Feature [FS#5203]: Ctrl + Arrow keys to move entire words in text edit boxes (sbr)
12 years ago
99c181e20d
(svn r24494) -Update: Some documentation.
12 years ago
59753be4ca
(svn r24494) -Update: Some documentation.
12 years ago
9b196d0fb4
(svn r24324) -Codechange: Turn functions dealing with Textbufs into member functions.
12 years ago
d58eee1e79
(svn r24324) -Codechange: Turn functions dealing with Textbufs into member functions.
12 years ago
755b52dcc0
(svn r24323) -Codechange: Split Textbuf and associated functions to separate files.
12 years ago
31eb896143
(svn r24323) -Codechange: Split Textbuf and associated functions to separate files.
12 years ago
9b11b7e491
(svn r24293) -Fix: Increase the left and right margins of the text in the yes/no query window.
12 years ago
87d5f47050
(svn r24293) -Fix: Increase the left and right margins of the text in the yes/no query window.
12 years ago
c1b5b9548e
(svn r24048) -Cleanup: Sync credits in readme and ingame information
12 years ago
ad9d1ca639
(svn r24048) -Cleanup: Sync credits in readme and ingame information
12 years ago
838ea6947f
(svn r23903) -Fix [FS#4993]: some instances had issues due to a value being out of range
12 years ago
0a5ed6892d
(svn r23903) -Fix [FS#4993]: some instances had issues due to a value being out of range
12 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
c74ccfff1b
(svn r23601) -Fix: fix the conflict in window number
13 years ago
561b25d031
(svn r23601) -Fix: fix the conflict in window number
13 years ago
8e4b6c3055
(svn r23590) -Codechange: make the string validation settings better expandable
13 years ago
fefe22b4aa
(svn r23590) -Codechange: make the string validation settings better expandable
13 years ago
c73649512b
(svn r23536) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
05af1d176b
(svn r23536) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
da63ce43fa
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
13 years ago
df0afdf0dc
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
13 years ago
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
b9a1468fde
(svn r23471) -Codechange: move the error related code out of misc_gui.cpp into error_gui.cpp
13 years ago
6cbeb9e745
(svn r23471) -Codechange: move the error related code out of misc_gui.cpp into error_gui.cpp
13 years ago
c641efc387
(svn r23375) -Change: that name I haven't used for several years. Let it die out now finally, please?
13 years ago
1902803b6e
(svn r23375) -Change: that name I haven't used for several years. Let it die out now finally, please?
13 years ago
7f7cab9ec5
(svn r23130) -Change [FS#4825]: open the query string window centered as it (almost) always requires your attention
13 years ago
d5539f76d3
(svn r23130) -Change [FS#4825]: open the query string window centered as it (almost) always requires your attention
13 years ago
1a54b7733c
(svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT
13 years ago
798f5a8608
(svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT
13 years ago
de980ef0f9
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
7757a2ed40
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
7196157d2d
(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)
13 years ago
ad232bd497
(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)
13 years ago
efd49756aa
(svn r22766) -Add: river graphics for the original base set (andythenorth)
13 years ago
e8a9bb3c0d
(svn r22766) -Add: river graphics for the original base set (andythenorth)
13 years ago
ef5b18ab3b
(svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters.
13 years ago
2a55273291
(svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters.
13 years ago
7b251297c9
(svn r22429) -Add: some constants for specific palette colours used in the GUI.
13 years ago
5e449b8fae
(svn r22429) -Add: some constants for specific palette colours used in the GUI.
13 years ago
Jonathan G Rennison
frosch
matthijs
michi_cc
patch-import
rubidium
peter1138
planetmaker
fonsinchen
zuu
alberth
truebrain
yexo