f0290d5de7
Codechange: Add InverseRemapCoords2 function for remapping viewport coordinates to underlying tile coordinates (Patch by adf88, #6583 )
6 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
6 years ago
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
6 years ago
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
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
0d0d55f81d
Scrolling/perf improvements to link graph overlays on viewport and smallmap
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
e1a164b531
Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
74e1fe130c
(svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible
7 years ago
322a053de7
(svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible
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
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
7b56097f50
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# src/linkgraph/demands.cpp
# src/linkgraph/mcf.cpp
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/smallmap_gui.cpp
8 years ago
e56707bd4e
(svn r27622) -Change: In industry map view, give visible industry types the highest tile priority, and hidden industry types a lower one. This way filtered and highlighted industries are not hidden by overlapping tiles in zoomed-out smallmap. (adf88)
8 years ago
cc18df4cb7
(svn r27622) -Change: In industry map view, give visible industry types the highest tile priority, and hidden industry types a lower one. This way filtered and highlighted industries are not hidden by overlapping tiles in zoomed-out smallmap. (adf88)
8 years ago
a5b7800aca
(svn r27621) -Fix (r27620): Committed too early.
8 years ago
46aeed3817
(svn r27621) -Fix (r27620): Committed too early.
8 years ago
ed27cec094
(svn r27620) -Codechange: Inline GetEffectiveTileType (adf88)
8 years ago
bd6799a9f8
(svn r27620) -Codechange: Inline GetEffectiveTileType (adf88)
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
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
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
948b4e1d5e
Implement taking smallmap screenshots.
...
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
9 years ago
5e47c27550
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
9 years ago
4a6036208a
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
9 years ago
cfac8dbbc6
(svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed.
9 years ago
d35670aa2a
(svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed.
9 years ago
fc72d3dc8f
(svn r27159) -Codechange: Simplify mapping from smallmap to viewport coordinates by duplicating less code.
9 years ago
7dee16a9b9
(svn r27159) -Codechange: Simplify mapping from smallmap to viewport coordinates by duplicating less code.
9 years ago
06d1d50884
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
9 years ago
79380a566e
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
9 years ago
1149f7be46
(svn r27036) -Fix [FS#6148] (r26928): crash when changing smallmap colour when the smallmap window has not been opened yet
10 years ago
1d27ae9bda
(svn r27036) -Fix [FS#6148] (r26928): crash when changing smallmap colour when the smallmap window has not been opened yet
10 years ago
367150ba34
(svn r26929) -Change: accounts for maximum height when filling the height legend of the smallmap
10 years ago
9627eb6e17
(svn r26929) -Change: accounts for maximum height when filling the height legend of the smallmap
10 years ago
4b8d6ee319
(svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111)
10 years ago
0176ef274f
(svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111)
10 years ago
ae406cf52e
(svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder
10 years ago
f192045796
(svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder
10 years ago
11e9afdf5e
(svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111)
10 years ago
03b731f929
(svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111)
10 years ago
657c108d32
(svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button.
10 years ago
e353ef5908
(svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button.
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
ced1bfa60f
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
11 years ago
b158c7d0fa
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
11 years ago
b4a889fcb4
(svn r26265) -Fix: Don't rebuild the link graph overlay cache twice in a row
11 years ago
be62387e44
(svn r26265) -Fix: Don't rebuild the link graph overlay cache twice in a row
11 years ago
6becaddec2
(svn r26228) -Fix: missing variable initialization
11 years ago
014813141d
(svn r26228) -Fix: missing variable initialization
11 years ago
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
2618d960e3
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
519cb3e103
(svn r26121) -Codechange: add some asserts after dynamic casts to show they shouldn't return NULL ever
11 years ago
50fdf5e30c
(svn r26121) -Codechange: add some asserts after dynamic casts to show they shouldn't return NULL ever
11 years ago
e4b208c069
(svn r26061) -Fix: negative result of ftell wasn't handled correctly in some cases
11 years ago
78a316d349
(svn r26061) -Fix: negative result of ftell wasn't handled correctly in some cases
11 years ago
0d5ab589fe
(svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000)
11 years ago
103b6fffbb
(svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000)
11 years ago
2b2706009e
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
11 years ago
f292a87dc4
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
11 years ago
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
11 years ago
4e4e635916
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
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
2a6d21dc80
(svn r25262) -Feature: linkgraph overlay for smallmap
11 years ago
163dfdd34a
(svn r25262) -Feature: linkgraph overlay for smallmap
11 years ago
5d6c2aac38
(svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen)
12 years ago
52aeef1a79
(svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen)
12 years ago
7fe2af5fd3
(svn r25019) -Fix: GCC doesn't seem to care if one does Class::Class::Function (thinks it is a function), whereas MSVC thinks it is the constructor
12 years ago
dfdced2239
(svn r25019) -Fix: GCC doesn't seem to care if one does Class::Class::Function (thinks it is a function), whereas MSVC thinks it is the constructor
12 years ago
b5a8bfa4b9
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
12 years ago
6b68956969
(svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen)
12 years ago
bb9753924d
(svn r24958) -Fix [FS#5458]: refering to non-existent method
12 years ago
a6ae4ea8a2
(svn r24958) -Fix [FS#5458]: refering to non-existent method
12 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
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
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
e83a41e9b5
(svn r24534) -Feature: Highlight industries on the smallmap when the mouse is over an entry in the legend.
12 years ago
89988c6163
(svn r24534) -Feature: Highlight industries on the smallmap when the mouse is over an entry in the legend.
12 years ago
942b40970f
(svn r24533) -Codechange: Move position determination on minimap legend to separate function.
12 years ago
a4f22a2de1
(svn r24533) -Codechange: Move position determination on minimap legend to separate function.
12 years ago
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
12 years ago
Johannes E. Krause
Jonathan G Rennison
Peter Nelson
Charles Pigott
Alexander Weiss
PeterN
adf88
frosch
michi_cc
patch-import
rubidium
fonsinchen
planetmaker