385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
6e19cbf219
(svn r27979) -Add: adf88 to readme
6 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
8c4a3cfb64
Add patchpack info and website to about window.
7 years ago
668702dc7e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/misc_gui.cpp
7 years ago
d94e37d9d1
Fix viewport tooltips not being cleared when scrolling using the keyboard.
...
Fix documentation typo.
7 years ago
13a716980a
Chunnel: String text adjustments.
7 years ago
7808370f86
Chunnel patch 28399: debug [modified]
...
Don't remove other debug outputs
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
7 years ago
54494a0a7c
Merge branch 'send_money_company' into jgrpp
7 years ago
49e922daa6
Remove stub HandleOnEditText and now unused global variables.
7 years ago
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
8 years ago
478ff2538e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/korean.txt
8 years ago
4753097c3d
(svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window.
8 years ago
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
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
4c0423d6d8
Merge branch 'master' into jgrpp
8 years ago
91ddd32c20
(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
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().
10 years ago
18a1131e9f
(svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus.
10 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
ca4f7b0eca
(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
337af973b0
(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
034735a54c
(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
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
2ce5034005
(svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window.
11 years ago
e34fe220e2
(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
931bbd7191
(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
872acc5287
(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
16feb5c4e9
(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
337460249d
(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
c62cbe04a4
(svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen)
12 years ago
Jonathan G Rennison
frosch
HackaLittleBit
matthijs
michi_cc
patch-import
rubidium
peter1138
planetmaker
fonsinchen