Commit Graph

66 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
4 months ago
Jonathan G Rennison f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
5 months ago
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
3 years ago
Andreas Schmitt 5e3a244198 Add topography and industries screenshot types 3 years ago
rubidium42 95386dc2b8 Codechange: move misc settings to std::string 3 years ago
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)
3 years ago
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. 3 years ago
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
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 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
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
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 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
4 years ago
TELK e04ca904a9 Feature: Minimap screenshot 4 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 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
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 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
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
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 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
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
michi_cc 71ff3c4bb4 (svn r20508) -Add [FS#3973]: A new screenshot type that makes a zoomed-in screenshot of the visible viewport. (Eddi) 14 years ago
michi_cc 38d9d87434 (svn r20508) -Add [FS#3973]: A new screenshot type that makes a zoomed-in screenshot of the visible viewport. (Eddi) 14 years ago
rubidium 7062bb0bd7 (svn r20040) -Codechange: some coding style + using proper types 14 years ago
rubidium c130252cc0 (svn r20040) -Codechange: some coding style + using proper types 14 years ago
rubidium 21a3f97a0b (svn r18630) -Fix [FS#3419]: when making a screenshot the name of the previous screenshot went missing in the 'successful screenshot' message 15 years ago
rubidium 0efc6bb877 (svn r18630) -Fix [FS#3419]: when making a screenshot the name of the previous screenshot went missing in the 'successful screenshot' message 15 years ago
rubidium a6146f5f51 (svn r18546) -Codechange: make making the screenshot not asynchronious; just do it at the moment it's requested. 15 years ago
rubidium 0da7a4dc91 (svn r18546) -Codechange: make making the screenshot not asynchronious; just do it at the moment it's requested. 15 years ago
smatz 5924863a49 (svn r18156) -Add: crash screenshot, created from blitter buffer 15 years ago
smatz 0c4cada640 (svn r18156) -Add: crash screenshot, created from blitter buffer 15 years ago
smatz 4eaa558ca1 (svn r18155) -Codechange: in MakeScreenshotName(), don't return pointer to local static variable - use global one instead 15 years ago
smatz 8894008ed7 (svn r18155) -Codechange: in MakeScreenshotName(), don't return pointer to local static variable - use global one instead 15 years ago