dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,175 Commits 1 Branch 0 Tags
9470ad050bddd03b2ac0c3072d6df8e7aeb4c195
Commit Graph

50 Commits

Author SHA1 Message Date
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
smatz
be446d6f54 (svn r17937) -Codechange: rename current_screenshot_type to _screenshot_type 2009-11-01 18:08:58 +00:00
smatz
1dce59ed50 (svn r17937) -Codechange: rename current_screenshot_type to _screenshot_type 2009-11-01 18:08:58 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
d03994098b (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 2008-05-06 15:11:33 +00:00
rubidium
1ce0b03bf0 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 2008-05-06 15:11:33 +00:00
belugas
dfe5533db6 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near 2007-04-04 01:35:16 +00:00
belugas
6a86e75870 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near 2007-04-04 01:35:16 +00:00
rubidium
24c4d5b06d (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 2007-03-07 12:11:48 +00:00
rubidium
979ccd45ba (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 2007-03-07 12:11:48 +00:00
rubidium
36bb92ae24 (svn r9050) -Codechange: Foo(void) -> Foo() 2007-03-07 11:47:46 +00:00
rubidium
4169bfba06 (svn r9050) -Codechange: Foo(void) -> Foo() 2007-03-07 11:47:46 +00:00
rubidium
66bbf336c6 (svn r7759) -Merge: makefile rewrite. This merge features: 
- A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
 2007-01-02 19:19:48 +00:00
rubidium
013df98f79 (svn r7759) -Merge: makefile rewrite. This merge features: 
- A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
 2007-01-02 19:19:48 +00:00