dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,541 Commits 1 Branch 0 Tags
cbdd9f84d8d8a181c25a9f88c908468285f1417d
Commit Graph

69 Commits

Author SHA1 Message Date
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
dbc5f1baed Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
 2019-07-11 20:03:23 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Michael Lutz
a8b6e9f23c Codechange: Refactor the Freetype font cache into a generic part that does not depend on Freetype and into one that does. 
This makes it easier to add other TrueType font rendering engines.
 2019-05-14 11:21:36 +01:00
Charles Pigott
644f4c3547 Codechange: Set size of SettingGuiFlag & SettingDescType enums, and use them properly 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
peter1138
c0836bccef Codechange: NULL -> nullptr in settings files. 2019-04-11 13:00:55 +01:00
Jonathan G Rennison
7b36bba766 Fix max value for zoning overlay settings 2019-04-03 23:19:12 +01:00
Jonathan G Rennison
63203c2395 Add GUI/client setting to save zoning overlay state 2019-03-12 18:44:40 +00:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00:00
Greg Carlin
00d28a500d Feature: Add option to adjust font size separately from GUI size. (#7003) 
Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.
 2019-02-23 08:27:46 +00:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-02-04 18:24:38 +00:00
Peter Nelson
9de12521ec Codechange: Convert saveload numbers to enum values. 
(This was mostly achieved with a few in-place regexes)
 2019-02-02 21:39:06 +00:00
Jonathan G Rennison
0d2be99827 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
 2017-08-20 10:38:23 +01:00
Jonathan G Rennison
a3d1585826 Add settings callback field to re-order setting options in GUI 2017-08-20 10:37:45 +01:00
Jonathan G Rennison
034279c0e8 Merge branch 'save_ext' into jgrpp 2015-08-16 14:36:26 +01:00
Jonathan G Rennison
a8cc81d054 Initialiser list fixes for legacy compilers. 2015-08-16 14:36:07 +01:00
Jonathan G Rennison
8271acadb7 Merge branch 'show_veh_tunnel' into jgrpp 2015-08-02 18:25:08 +01:00
Jonathan G Rennison
c57ffc64bc Settings update: add PATX chunk to store additional settings 
in an unordered format which is tolerant of extra, missing or reordered
settings.
 2015-08-01 12:58:53 +01:00
Jonathan G Rennison
17e8693e62 Initial stubs for extending the save/load version checking/upgrade code, 
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
 2015-08-01 12:26:22 +01:00
Jonathan G Rennison
5e7638a6d0 Port of old vehicles visible in tunnels patch 
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
 2015-07-30 00:32:55 +01:00
peter1138
2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
peter1138
253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
frosch
b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes. 
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
 2014-04-27 12:15:14 +00:00
frosch
631e8b45fd (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes. 
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
 2014-04-27 12:15:14 +00:00
rubidium
44d584f84a (svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped 2013-06-23 15:23:22 +00:00
rubidium
94a5fe6b92 (svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped 2013-06-23 15:23:22 +00:00
michi_cc
557b0993ba (svn r25157) -Feature: Determine the default font height for vector fonts according to the minimum readable height that the font provides. 2013-04-06 22:06:44 +00:00
michi_cc
55ba9320f3 (svn r25157) -Feature: Determine the default font height for vector fonts according to the minimum readable height that the font provides. 2013-04-06 22:06:44 +00:00
frosch
888df85a3a (svn r24845) -Add: News ticker sound setting to adv. settings window. 2012-12-23 21:08:42 +00:00
frosch
345c3203d7 (svn r24845) -Add: News ticker sound setting to adv. settings window. 2012-12-23 21:08:42 +00:00
frosch
b4c70a51da (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
frosch
69a62452be (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
frosch
c5d8a51c76 (svn r24252) -Fix [FS#5162]: Change the unit of the sprite-cache size setting from megabytes to megapixels, so it depends on the blitter being used. Also increase it from 64 to 128, and change the name in the cfg file, so everyone gets the new default. 2012-05-15 20:37:42 +00:00
frosch
d351f3dae5 (svn r24252) -Fix [FS#5162]: Change the unit of the sprite-cache size setting from megabytes to megapixels, so it depends on the blitter being used. Also increase it from 64 to 128, and change the name in the cfg file, so everyone gets the new default. 2012-05-15 20:37:42 +00:00
alberth
cc6b16a4c1 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
alberth
1d58838a97 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
michi_cc
0cbc88a1db (svn r23895) -Revert (r23888): Broken and not even needed anymore in the container format 2 implementation that was committed. 2012-02-04 22:14:16 +00:00
michi_cc
dd5d24c35a (svn r23895) -Revert (r23888): Broken and not even needed anymore in the container format 2 implementation that was committed. 2012-02-04 22:14:16 +00:00
michi_cc
bf7ddd57ea (svn r23888) -Change: Move the min/max zoom settings to the "misc" section so they are valid before sprites are loaded. 2012-02-04 13:29:09 +00:00
michi_cc
2909e39e99 (svn r23888) -Change: Move the min/max zoom settings to the "misc" section so they are valid before sprites are loaded. 2012-02-04 13:29:09 +00:00
peter1138
85ba11d91b (svn r23317) -Change: Rename sprite_cache_size setting so that the new default is used. 2011-11-24 16:02:46 +00:00
peter1138
aa64a397f9 (svn r23317) -Change: Rename sprite_cache_size setting so that the new default is used. 2011-11-24 16:02:46 +00:00
peter1138
b84174fd4d (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 2011-11-24 12:38:48 +00:00
peter1138
81598273e9 (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 2011-11-24 12:38:48 +00:00
rubidium
d164eeb147 (svn r23287) -Fix (r23274): mono_size is a better name than large_mono for the size variable in the configuration file 2011-11-20 19:06:27 +00:00
rubidium
1fde9c7f8a (svn r23287) -Fix (r23274): mono_size is a better name than large_mono for the size variable in the configuration file 2011-11-20 19:06:27 +00:00
rubidium
49047246fa (svn r23274) -Add: internal support for a monospaced sprite font 2011-11-20 11:56:51 +00:00