dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,872 Commits 1 Branch 0 Tags
f32733ef223796575384f3dd638c7d4627f3e609
Commit Graph

64 Commits

Author SHA1 Message Date
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Andreas Schmitt
5e3a244198 Add topography and industries screenshot types 2021-06-11 20:14:56 +02:00
rubidium42
95386dc2b8 Codechange: move misc settings to std::string 2021-05-13 23:13:17 +02:00
Michael Lutz
2e6cadb005 Fix #9147: Delay making screenshots until the next draw tick as we may not access the video buffer from the game thread. 
(cherry picked from commit 1f159f79de)
 2021-05-06 20:52:00 +01:00
Michael Lutz
1f159f79de Fix #9147: Delay making screenshots until the next draw tick as we may not access the video buffer from the game thread. 2021-05-02 17:57:24 +02:00
Jonathan G Rennison
f39b6f4ba3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h
 2021-04-10 18:29:36 +01:00
Jonathan G Rennison
9bf6d1407f Add screenshot type: whole map at current zoom level 2021-03-06 02:33:02 +00:00
Jonathan G Rennison
d6e2b32132 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/screenshot.h
 2021-03-06 01:36:41 +00:00
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.
 2021-03-04 22:23:05 +01:00
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
 2020-08-27 18:31:09 +01:00
TechGeekNZ
a10013dd00 Codechange: Spell 'Viewport' consistently 
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
 2020-07-27 17:31:29 +01:00
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
 2020-06-30 21:43:04 +01:00
TechGeekNZ
3c8d0aa354 Cleanup: Give TakeScreenshot a more sensible name 2020-06-27 14:19:35 +01:00
TechGeekNZ
ed6f31f601 Cleanup: Remove redundant implementation of TakeScreenshot 2020-06-27 14:19:35 +01:00
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
 2020-01-06 18:45:51 +00:00
TELK
e04ca904a9 Feature: Minimap screenshot 2020-01-04 18:21:38 +01:00
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
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
951a50ddd9 Include crash/desync log contents in PNG screenshots 2019-05-22 07:27:51 +01:00
Jonathan G Rennison
5a8049f65b Merge branch 'minimap-screenshot-rect' into jgrpp 
Conflicts:
	src/screenshot.cpp
 2015-09-11 03:45:53 +01:00
Jonathan G Rennison
dde1c16105 Minimap screenshot: add console params and help to mostly match screenshot. 2015-09-11 03:44:25 +01:00
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
 2015-08-04 01:26:32 +01:00
frosch
ebd2d3ccef (svn r26525) -Remove: Screenshot format setting from GUI. 2014-04-27 15:13:46 +00:00
frosch
9430dfe7fa (svn r26525) -Remove: Screenshot format setting from GUI. 2014-04-27 15:13:46 +00:00
frosch
fccf0ac84d (svn r24805) -Codechange: Refactor determination of screenshot viewport for world screenshots. 2012-12-09 16:53:01 +00:00
frosch
e19ba0f72a (svn r24805) -Codechange: Refactor determination of screenshot viewport for world screenshots. 2012-12-09 16:53:01 +00:00
frosch
edd9c0553a (svn r24804) -Add: Separate subdirectory for screenshots. 2012-12-09 16:52:43 +00:00
frosch
50abcf3edc (svn r24804) -Add: Separate subdirectory for screenshots. 2012-12-09 16:52:43 +00:00
frosch
45df862fb0 (svn r23775) -Change: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used. 2012-01-08 16:58:10 +00:00
frosch
a6f6c0f8ab (svn r23775) -Change: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used. 2012-01-08 16:58:10 +00:00
rubidium
8b223f0274 (svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots 2011-12-31 14:56:39 +00:00
rubidium
7dc6e5b5fc (svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots 2011-12-31 14:56:39 +00:00
alberth
1838225192 (svn r22511) -Add: Function to make heightmap file paths. 2011-05-28 13:55:05 +00:00
alberth
4b295664ad (svn r22511) -Add: Function to make heightmap file paths. 2011-05-28 13:55:05 +00:00
alberth
be048e05f2 (svn r22509) -Add: Save heightmap. 2011-05-28 13:54:18 +00:00
alberth
d042417821 (svn r22509) -Add: Save heightmap. 2011-05-28 13:54:18 +00:00
michi_cc
71ff3c4bb4 (svn r20508) -Add [FS#3973]: A new screenshot type that makes a zoomed-in screenshot of the visible viewport. (Eddi) 2010-08-15 23:32:36 +00:00
michi_cc
38d9d87434 (svn r20508) -Add [FS#3973]: A new screenshot type that makes a zoomed-in screenshot of the visible viewport. (Eddi) 2010-08-15 23:32:36 +00:00
rubidium
7062bb0bd7 (svn r20040) -Codechange: some coding style + using proper types 2010-06-30 22:17:53 +00:00
rubidium
c130252cc0 (svn r20040) -Codechange: some coding style + using proper types 2010-06-30 22:17:53 +00:00
rubidium
21a3f97a0b (svn r18630) -Fix [FS#3419]: when making a screenshot the name of the previous screenshot went missing in the 'successful screenshot' message 2009-12-25 19:16:58 +00:00
rubidium
0efc6bb877 (svn r18630) -Fix [FS#3419]: when making a screenshot the name of the previous screenshot went missing in the 'successful screenshot' message 2009-12-25 19:16:58 +00:00
rubidium
a6146f5f51 (svn r18546) -Codechange: make making the screenshot not asynchronious; just do it at the moment it's requested. 2009-12-19 19:21:37 +00:00
rubidium
0da7a4dc91 (svn r18546) -Codechange: make making the screenshot not asynchronious; just do it at the moment it's requested. 2009-12-19 19:21:37 +00:00
smatz
5924863a49 (svn r18156) -Add: crash screenshot, created from blitter buffer 2009-11-17 23:12:42 +00:00
smatz
0c4cada640 (svn r18156) -Add: crash screenshot, created from blitter buffer 2009-11-17 23:12:42 +00:00
smatz
4eaa558ca1 (svn r18155) -Codechange: in MakeScreenshotName(), don't return pointer to local static variable - use global one instead 2009-11-17 23:08:55 +00:00
smatz
8894008ed7 (svn r18155) -Codechange: in MakeScreenshotName(), don't return pointer to local static variable - use global one instead 2009-11-17 23:08:55 +00:00
smatz
090c762921 (svn r17938) -Feature: non-automatic screenshot name can be entered in console 2009-11-01 18:15:35 +00:00
smatz
a80f582a8a (svn r17938) -Feature: non-automatic screenshot name can be entered in console 2009-11-01 18:15:35 +00:00