b3431512ee
Add modifier key window for toggling shift/ctrl key states using mouse
5 years ago
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
d5841109f0
Fix dcb2571: Missing override keywords
5 years ago
a64bd6e22c
Fix: Also breaking for warning text in set company password
5 years ago
08284e005d
Fix: Automatic line breaking of the warning
5 years ago
dcb2571888
Add: Warn players that company passwords are not truly secure
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
4da83d2f66
Fix #7386 : Measurement tooltip for tunnels, aqueducts & docks did not display or flickered.
...
Measurement tooltip was auto-closed as the hover/right-click test for tooltips was not
satisfied in this case. This is fixed by keeping the tooltip visible and instead explicitly
closing the tooltip when the PlaceObject is cancelled/completed.
5 years ago
828a4399f9
Fix tunnel build viewport length tooltip when hover mode is right click
5 years ago
2bd33c1869
Fix viewport hovering when hover mode is set to right-click
5 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
5 years ago
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
5 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
c1df63a2eb
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/viewport.cpp
6 years ago
68e6b5531a
Update: Developer credits
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
350395a6c2
Fix: Missing m8 data in console when using Query tool
...
When map array 8 was added, the Query tool wasn't updated to also
print the value there to the console, in debug builds.
6 years ago
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
42b00c3b39
Fix #6938 : Don't change company value to perform cost estimations ( #6939 )
...
These meddling kids dared to play with magic, but the ancients texts
weren't ready for that.
Refactors logic to estimate costs that dated to even before OpenTTD 0.1;
6 years ago
71450881fc
Codechange: Avoid call to memcpy using null pointer in TooltipsWindow constructor
...
Strictly speaking, calling memcpy with src as a nullptr is undefined behaviour
and the optimiser is entitled to delete any null ptr checks which occur afterwards.
This removes the warning emitted by UndefinedBehaviorSantizer.
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
18d00ff47e
Avoid using memcpy from null pointer in TooltipsWindow constructor
6 years ago
b91e85003e
Fix: Theoretical string overflow when building the cargo acceptance list for the land info window.
6 years ago
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
ebe6564e8b
(svn r27979) -Add: adf88 to readme
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
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
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
10293c5fb1
(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
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
Jonathan G Rennison
peter1138
Niels Martin Hansen
Henry Wilson
Charles Pigott
Miguel Horta
Michael Lutz
frosch
HackaLittleBit
matthijs
michi_cc
patch-import
rubidium
planetmaker
fonsinchen