Patric Stout
1a1049bc0d
Change: rename setting "max_heightlevel" to "map_height_limit"
...
This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.
Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.
Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value.
3 years ago
Jonathan G Rennison
9bf6d1407f
Add screenshot type: whole map at current zoom level
3 years ago
Jonathan G Rennison
d6e2b32132
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/screenshot.h
3 years ago
Patric Stout
ac5e77ea3b
Feature: allow custom width/height of screenshot via console
...
Reworked how the screenshot command works while keeping it backwards
compatible. It can now more freely understand arguments, and has
the ability to make SC_DEFAULTZOOM screenshots.
3 years ago
Jonathan G Rennison
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
3 years ago
Michael Lutz
d6b6775888
Change: Lock the video buffer when drawing inside the game loop to properly account for threaded drawing.
3 years ago
Jonathan G Rennison
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
Jonathan G Rennison
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
Charles Pigott
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
Michael Lutz
dd138fc460
Codechange: Stringify config file paths.
4 years ago
Charles Pigott
860c270c73
Codechange: Replace assert_compile macro with static_assert
4 years ago
Jonathan G Rennison
35565a115b
Viewport: Fix casing of ClearViewportCache(s)
4 years ago
Jonathan G Rennison
5b78090a61
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
4 years ago
Jonathan G Rennison
a65be9b747
Hide screenshot window when taking normal screesnhot
4 years ago
TechGeekNZ
a10013dd00
Codechange: Spell 'Viewport' consistently
...
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
4 years ago
Jonathan G Rennison
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
Abdurrahmaan Iqbal
8a655c7fb6
Fix #8232 : 'Huge screenshot' warning being shown incorrectly
4 years ago
TechGeekNZ
3c8d0aa354
Cleanup: Give `TakeScreenshot` a more sensible name
4 years ago
TechGeekNZ
ed6f31f601
Cleanup: Remove redundant implementation of TakeScreenshot
4 years ago
Jonathan G Rennison
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
Michael Lutz
a49fdb7ebb
Codechange: Store base set related texts in std::strings.
4 years ago
Jonathan G Rennison
bdf3af72ec
Fix `screenshot minimap <name>` console command ignoring name
...
See #143
4 years ago
Jonathan G Rennison
a4608f6f72
Cache vehicle positions across draw blocks in viewport map mode
4 years ago
Jonathan G Rennison
8f442500ea
Change how dirty screen, window and viewport areas are tracked for later redrawing
...
Track dirty viewport areas seperately form general screen redraws.
Maintain a dirty block grid per viewport, with a smaller block size.
Use even smaller block size in viewport map mode.
Use a rectangle array for general screen redraws instead of a block grid.
Add a dirty bit to windows and widgets, to simplify the common case
of repainting a whole window or widget, without catching
neighbouring windows or viewports.
4 years ago
Jonathan G Rennison
81a1094cc8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/date.cpp
# src/economy.cpp
# src/misc.cpp
# src/newgrf_house.cpp
4 years ago
JMcKiern
2158e26b9e
Fix #7950 : Incorrect setup of normal screenshot viewport
5 years ago
Jonathan G Rennison
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
Charles Pigott
5b52f25902
Fix e558aa8: Compiler warning about unused value (and move some variable declarations to where they're used)
5 years ago
TELK
e04ca904a9
Feature: Minimap screenshot
5 years ago
glx
3a14cea068
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
5 years ago
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Jonathan G Rennison
951a50ddd9
Include crash/desync log contents in PNG screenshots
5 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
Jonathan G Rennison
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
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
Charles Pigott
63898f61b0
Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style
6 years ago
Jonathan G Rennison
5a8049f65b
Merge branch 'minimap-screenshot-rect' into jgrpp
...
Conflicts:
src/screenshot.cpp
9 years ago
Jonathan G Rennison
dde1c16105
Minimap screenshot: add console params and help to mostly match screenshot.
9 years ago
patch-import
019e862536
Import minimap patch.
...
Fix various compilation issues and update to current trunk.
http://www.tt-forums.net/viewtopic.php?p=848661#p848661
9 years ago
Jonathan G Rennison
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
frosch
7979f9a475
(svn r26983) -Fix: Account for max_heightlevel when saving heightmaps.
10 years ago
frosch
9efb6be700
(svn r26983) -Fix: Account for max_heightlevel when saving heightmaps.
10 years ago
frosch
ebd2d3ccef
(svn r26525) -Remove: Screenshot format setting from GUI.
10 years ago
frosch
9430dfe7fa
(svn r26525) -Remove: Screenshot format setting from GUI.
10 years ago
rubidium
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
rubidium
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
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
10 years ago
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
10 years ago
rubidium
2618d960e3
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
rubidium
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
rubidium
ef7befdbd8
(svn r25264) -Feature: linkgraph overlay over main viewport (fonsinchen)
11 years ago
rubidium
238a842700
(svn r25264) -Feature: linkgraph overlay over main viewport (fonsinchen)
11 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
frosch
fccf0ac84d
(svn r24805) -Codechange: Refactor determination of screenshot viewport for world screenshots.
12 years ago
frosch
e19ba0f72a
(svn r24805) -Codechange: Refactor determination of screenshot viewport for world screenshots.
12 years ago
frosch
edd9c0553a
(svn r24804) -Add: Separate subdirectory for screenshots.
12 years ago
frosch
50abcf3edc
(svn r24804) -Add: Separate subdirectory for screenshots.
12 years ago
alberth
2ab7c82b31
(svn r24395) -Doc: Fixed argument references in @param descriptions.
12 years ago
alberth
67f599f9db
(svn r24395) -Doc: Fixed argument references in @param descriptions.
12 years ago
truebrain
e2fea99ba9
(svn r23784) -Revert (r23740): compiling without libpng failed to include a correct header
13 years ago
truebrain
4ecd7843fb
(svn r23784) -Revert (r23740): compiling without libpng failed to include a correct header
13 years ago
frosch
45df862fb0
(svn r23775) -Change: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used.
13 years ago
frosch
a6f6c0f8ab
(svn r23775) -Change: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used.
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
8b223f0274
(svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots
13 years ago
rubidium
7dc6e5b5fc
(svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots
13 years ago
rubidium
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
rubidium
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
rubidium
2ccbd2a6f5
(svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure
13 years ago
rubidium
a531ec1899
(svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure
13 years ago
truebrain
cc12942d70
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
13 years ago
truebrain
bf803e40cc
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
13 years ago
peter1138
349da42ce3
(svn r23333) -Fix [FS#4854]: Make zoomed in screenshot use the selected maximum zoom.
13 years ago
peter1138
b100c49227
(svn r23333) -Fix [FS#4854]: Make zoomed in screenshot use the selected maximum zoom.
13 years ago
peter1138
03c86ab874
(svn r23325) -Fix (r23316): World screenshot was incorrectly positioned.
13 years ago
peter1138
1121fb8698
(svn r23325) -Fix (r23316): World screenshot was incorrectly positioned.
13 years ago
peter1138
81598273e9
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
13 years ago
peter1138
b84174fd4d
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
13 years ago
rubidium
c9a7f572ec
(svn r23195) -Codechange: if we really need to cast away constness, use const_cast
13 years ago
rubidium
215452b911
(svn r23195) -Codechange: if we really need to cast away constness, use const_cast
13 years ago
rubidium
a72544d5e1
(svn r23103) -Codechange: replace TileHeight(x) * TILE_HEIGHT by TilePixelHeight(x)
13 years ago
rubidium
79244bd57f
(svn r23103) -Codechange: replace TileHeight(x) * TILE_HEIGHT by TilePixelHeight(x)
13 years ago
alberth
1838225192
(svn r22511) -Add: Function to make heightmap file paths.
13 years ago
alberth
4b295664ad
(svn r22511) -Add: Function to make heightmap file paths.
13 years ago
alberth
be048e05f2
(svn r22509) -Add: Save heightmap.
13 years ago
alberth
d042417821
(svn r22509) -Add: Save heightmap.
13 years ago
alberth
64745b4d0d
(svn r22508) -Codechange: Lift default screenshot filename out of MakeScreenshotName.
13 years ago
alberth
8eb1fba763
(svn r22508) -Codechange: Lift default screenshot filename out of MakeScreenshotName.
13 years ago
alberth
63923068a2
(svn r22488) -Doc: Add Doxygen comments to screenshot code.
13 years ago
alberth
7849495f6a
(svn r22488) -Doc: Add Doxygen comments to screenshot code.
13 years ago
rubidium
772fd8f6b5
(svn r22450) -Fix [FS#4610]: Don't "log" the NewGRFs in the screenshot when in the menu
13 years ago
rubidium
edc0a4516b
(svn r22450) -Fix [FS#4610]: Don't "log" the NewGRFs in the screenshot when in the menu
13 years ago
rubidium
0e1ac234d8
(svn r22388) -Fix: when a game uses a lot of NewGRFs the buffer for storing that information in the PNG is too small
13 years ago
rubidium
a61ae330bd
(svn r22388) -Fix: when a game uses a lot of NewGRFs the buffer for storing that information in the PNG is too small
13 years ago
rubidium
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago