Commit Graph

936 Commits

Author SHA1 Message Date
Sergii Pylypenko
66e3334f0e Merge upstream branch 1.8 2018-05-31 22:59:50 +03:00
pelya
5dddb424ba Async Android text input 2018-05-31 22:09:18 +03:00
pelya
f44a175b61 Revert "Revert "Revert "Async Android text input"""
This reverts commit 181b5f363b.
2018-05-31 21:57:30 +03:00
pelya
040aa274b4 Revert "Attempt to fix Android async text input"
This reverts commit e48232345a.
2018-05-31 21:57:30 +03:00
pelya
362d839e08 Attempt to fix Android async text input 2018-05-31 21:57:30 +03:00
pelya
40bbbe8873 Revert "Revert "Async Android text input""
This reverts commit 7b27195e9e.
2018-05-31 21:57:30 +03:00
pelya
f2ba50beae Revert "Async Android text input"
This reverts commit 3ed747e0ab.
2018-05-31 21:55:29 +03:00
pelya
f5df4c61ea Async Android text input 2018-05-31 21:55:29 +03:00
pelya
94fb054554 Put tooltip above the cursor 2018-05-31 21:55:28 +03:00
pelya
abce581863 Tooltip will hide itself in no-titlebar mode 2018-05-31 21:55:28 +03:00
frosch
ebe6564e8b (svn r27979) -Add: adf88 to readme 2018-03-11 12:18:30 +00:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Sergii Pylypenko
b4cc822085 Merge svn r27779
Conflicts:
	src/autoreplace_gui.cpp
	src/economy.cpp
	src/fios_gui.cpp
	src/lang/spanish_MX.txt
	src/network/network_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/toolbar_gui.cpp
	src/window.cpp
2017-03-17 23:14:41 +02:00
pelya
c0f71fb65c Fixed a crash in my own tooltip code 2017-03-17 22:40:05 +02:00
Sergii Pylypenko
db042040c2 Fixed bridges not building when confirmation is disabled, rearranged tooltip position to not obscure buttons 2017-03-17 22:40:05 +02:00
Sergii Pylypenko
96501e9f08 Warning: crashes! Confirmation dialog will also show estimated cost 2017-03-17 22:40:04 +02:00
frosch
4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
10293c5fb1 (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
0e3e4eeb53 (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 2016-08-15 18:33:08 +00:00
frosch
3cb7d9703b (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 2016-08-15 18:33:08 +00:00
matthijs
91ddd32c20 (svn r27560) -Fix: typos in comments and string 2016-05-11 20:48:46 +00:00
matthijs
53982003ee (svn r27560) -Fix: typos in comments and string 2016-05-11 20:48:46 +00:00
Sergii Pylypenko
50e6a86f7b Non-blocking text input. so you won't get kicked by server because of no reply to ping 2016-03-27 22:51:27 +03:00
pelya
3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
18a1131e9f (svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus. 2015-02-01 12:23:39 +00:00
frosch
c9114af706 (svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus. 2015-02-01 12:23:39 +00:00
rubidium
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) 2014-10-23 17:13:44 +00:00
rubidium
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) 2014-10-23 17:13:44 +00:00
peter1138
ca4f7b0eca (svn r27023) -Codechange: Scale tooltip size by UI scale. 2014-10-18 16:11:40 +00:00
peter1138
3730ed67cb (svn r27023) -Codechange: Scale tooltip size by UI scale. 2014-10-18 16:11:40 +00:00
peter1138
d408cabca7 (svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned. 2014-09-26 16:15:50 +00:00
peter1138
ffe820c792 (svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned. 2014-09-26 16:15:50 +00:00
rubidium
337af973b0 (svn r26873) -Change: split type_height into a type and height array (ic111) 2014-09-21 11:14:58 +00:00
rubidium
04e2324b8f (svn r26873) -Change: split type_height into a type and height array (ic111) 2014-09-21 11:14:58 +00:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
planetmaker
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) 2014-07-30 20:19:29 +00:00
planetmaker
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) 2014-07-30 20:19:29 +00:00
Sergii Pylypenko
91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
rubidium
5b82822c12 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
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 2014-04-23 20:13:33 +00:00
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 2014-04-23 20:13:33 +00:00
Sergii Pylypenko
d8832c2ad6 Fixed Android text input 2014-03-19 21:59:02 +02:00
Juanjo
0ae63b4c28 Sizing and centering editbox icon. 2014-03-15 21:37:18 +02:00