Commit Graph

236 Commits

Author SHA1 Message Date
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
5995e825bc Remove bitfield from struct SpriteCache
This causes issues with packing on MSVC
2019-01-23 17:32:54 +00:00
Jonathan G Rennison
f645222d8f Add scope info logging to sprite read/load 2019-01-14 18:51:28 +00:00
Jonathan G Rennison
3f03d03d92 Fix uint8 file_slot in LoadNextSprite 2019-01-14 18:45:57 +00:00
Jonathan G Rennison
c9c3e6f574 Fix use of uint8 for file slot handles 2018-11-26 01:01:50 +00:00
Jonathan G Rennison
6f9f467dbe Fix struct SpriteInfo comparator not being marked const 2018-09-12 08:46:29 +01:00
Jonathan G Rennison
e789a6ff86 Replace sprite cache implementation
Use malloc instead of custom allocator, to improve performance.
Change eviction mechanism to reduce performance problems.
Remove periodic compaction mechanism.
Simplify LRU mechanism.
2018-08-19 20:52:01 +01:00
Jonathan G Rennison
6242c50725 Use a std::vector for SpriteCache struct array 2018-08-19 02:48:46 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
9d5f34fea6 Replace various uses of std::set/map with btree containers. 2017-02-08 00:18:09 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios.h
2017-01-17 19:11:09 +00:00
frosch
7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
Jonathan G Rennison
52d3f075ea Fix over shift left undefined behaviour.
The maximum zoom level is now >= 8, so shifting a uint8 by a zoom
level results in undefined behaviour.
2015-11-22 23:31:51 +00:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
peter1138
4de8b75605 (svn r27016) -Fix (r27004): Setting font-sprite data failed for some user(s). 2014-10-14 16:09:21 +00:00
peter1138
2b46a4ae1d (svn r27016) -Fix (r27004): Setting font-sprite data failed for some user(s). 2014-10-14 16:09:21 +00:00
peter1138
aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 2014-10-12 20:43:25 +00:00
peter1138
1088ad48fc (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 2014-10-12 20:43:25 +00:00
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 2014-04-23 20:13:33 +00:00
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 2014-04-23 20:13:33 +00:00
rubidium
4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
98b320614a (svn r26201) -Fix: unscaling by a negative value is the same as scaling by a positive number 2014-01-02 11:04:37 +00:00
rubidium
fb4db0b022 (svn r26201) -Fix: unscaling by a negative value is the same as scaling by a positive number 2014-01-02 11:04:37 +00:00
frosch
7b2c2b3b62 (svn r25821) -Fix-ish: Sprite 0 was considered available, even if no baseset was loaded. 2013-10-06 19:40:40 +00:00
frosch
1e0dd39075 (svn r25821) -Fix-ish: Sprite 0 was considered available, even if no baseset was loaded. 2013-10-06 19:40:40 +00:00
michi_cc
b13d452bbe (svn r25492) -Doc: Missing comment. 2013-06-27 21:18:56 +00:00
michi_cc
6f359bc1f0 (svn r25492) -Doc: Missing comment. 2013-06-27 21:18:56 +00:00
frosch
d640903eb7 (svn r25081) -Fix [FS#5500]: Catch exception anonymously, if the exception content is not of interest. 2013-03-11 17:45:23 +00:00
frosch
f800c826a8 (svn r25081) -Fix [FS#5500]: Catch exception anonymously, if the exception content is not of interest. 2013-03-11 17:45:23 +00:00
frosch
c9967ad03e (svn r25061) -Fix: When allocation of the sprite cache fails, try to allocate less memory and display an error message later on. 2013-03-03 13:00:06 +00:00
frosch
d3c0e1d340 (svn r25061) -Fix: When allocation of the sprite cache fails, try to allocate less memory and display an error message later on. 2013-03-03 13:00:06 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
bdb5931c78 (svn r24858) -Fix [FS#5404]: Make invalid sprite references to mapgen sprites behave the same as invalid references between recolour and real sprites. 2012-12-26 15:14:37 +00:00
frosch
24e62f39e0 (svn r24858) -Fix [FS#5404]: Make invalid sprite references to mapgen sprites behave the same as invalid references between recolour and real sprites. 2012-12-26 15:14:37 +00:00
frosch
cd3651368d (svn r24828) -Change: For dedicated servers without blitter ignore the spritecache size setting and always use the minimum. 2012-12-19 19:31:18 +00:00
frosch
e428952110 (svn r24828) -Change: For dedicated servers without blitter ignore the spritecache size setting and always use the minimum. 2012-12-19 19:31:18 +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
frosch
f833f6c148 (svn r23986) -Fix (r23889): Invalid reads when scaling an odd-sized sprite smaller. 2012-02-25 17:18:17 +00:00
frosch
3d381403a8 (svn r23986) -Fix (r23889): Invalid reads when scaling an odd-sized sprite smaller. 2012-02-25 17:18:17 +00:00
michi_cc
2d4346bd8e (svn r23976) -Fix (r23889): Sprites of different zoom levels were not always padded correctly to a common size. 2012-02-23 12:13:30 +00:00
michi_cc
0aecd1fa7b (svn r23976) -Fix (r23889): Sprites of different zoom levels were not always padded correctly to a common size. 2012-02-23 12:13:30 +00:00
michi_cc
ac1919408d (svn r23898) -Remove: PNG sprite loader. 2012-02-04 22:19:02 +00:00
michi_cc
44abdccfd0 (svn r23898) -Remove: PNG sprite loader. 2012-02-04 22:19:02 +00:00