Commit Graph

292 Commits (568eafe6618e8bf6f129a760d9a8eacf3e73c6e2)

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
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
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
5 years ago
Charles Pigott 10ba431d21 Codechange: Remove SpriteTypeByte type 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
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
5 years ago
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.
5 years ago
Jonathan G Rennison 5995e825bc Remove bitfield from struct SpriteCache
This causes issues with packing on MSVC
6 years ago
Jonathan G Rennison f645222d8f Add scope info logging to sprite read/load 6 years ago
Jonathan G Rennison 3f03d03d92 Fix uint8 file_slot in LoadNextSprite 6 years ago
Jonathan G Rennison c9c3e6f574 Fix use of uint8 for file slot handles 6 years ago
Jonathan G Rennison 6f9f467dbe Fix struct SpriteInfo comparator not being marked const 6 years ago
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.
6 years ago
Jonathan G Rennison 6242c50725 Use a std::vector for SpriteCache struct array 6 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 9d5f34fea6 Replace various uses of std::set/map with btree containers. 8 years ago
Jonathan G Rennison 90cd312428 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios.h
8 years ago
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. 8 years ago
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. 8 years ago
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.
9 years ago
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
9 years ago
peter1138 4de8b75605 (svn r27016) -Fix (r27004): Setting font-sprite data failed for some user(s). 10 years ago
peter1138 2b46a4ae1d (svn r27016) -Fix (r27004): Setting font-sprite data failed for some user(s). 10 years ago
peter1138 aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 10 years ago
peter1138 1088ad48fc (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 10 years ago
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 10 years ago
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 10 years ago
rubidium 4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 98b320614a (svn r26201) -Fix: unscaling by a negative value is the same as scaling by a positive number 11 years ago
rubidium fb4db0b022 (svn r26201) -Fix: unscaling by a negative value is the same as scaling by a positive number 11 years ago
frosch 7b2c2b3b62 (svn r25821) -Fix-ish: Sprite 0 was considered available, even if no baseset was loaded. 11 years ago
frosch 1e0dd39075 (svn r25821) -Fix-ish: Sprite 0 was considered available, even if no baseset was loaded. 11 years ago
michi_cc b13d452bbe (svn r25492) -Doc: Missing comment. 11 years ago
michi_cc 6f359bc1f0 (svn r25492) -Doc: Missing comment. 11 years ago
frosch d640903eb7 (svn r25081) -Fix [FS#5500]: Catch exception anonymously, if the exception content is not of interest. 11 years ago
frosch f800c826a8 (svn r25081) -Fix [FS#5500]: Catch exception anonymously, if the exception content is not of interest. 11 years ago
frosch c9967ad03e (svn r25061) -Fix: When allocation of the sprite cache fails, try to allocate less memory and display an error message later on. 11 years ago
frosch d3c0e1d340 (svn r25061) -Fix: When allocation of the sprite cache fails, try to allocate less memory and display an error message later on. 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
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. 12 years ago
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. 12 years ago
frosch cd3651368d (svn r24828) -Change: For dedicated servers without blitter ignore the spritecache size setting and always use the minimum. 12 years ago
frosch e428952110 (svn r24828) -Change: For dedicated servers without blitter ignore the spritecache size setting and always use the minimum. 12 years ago
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. 12 years ago
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. 12 years ago
frosch f833f6c148 (svn r23986) -Fix (r23889): Invalid reads when scaling an odd-sized sprite smaller. 13 years ago
frosch 3d381403a8 (svn r23986) -Fix (r23889): Invalid reads when scaling an odd-sized sprite smaller. 13 years ago
michi_cc 2d4346bd8e (svn r23976) -Fix (r23889): Sprites of different zoom levels were not always padded correctly to a common size. 13 years ago
michi_cc 0aecd1fa7b (svn r23976) -Fix (r23889): Sprites of different zoom levels were not always padded correctly to a common size. 13 years ago
michi_cc ac1919408d (svn r23898) -Remove: PNG sprite loader. 13 years ago
michi_cc 44abdccfd0 (svn r23898) -Remove: PNG sprite loader. 13 years ago
michi_cc 1358995dfa (svn r23897) -Feature: [NewGRF] 32bpp sprites in GRFs. 13 years ago
michi_cc 2c3bca6ad9 (svn r23897) -Feature: [NewGRF] 32bpp sprites in GRFs. 13 years ago
michi_cc 2f0c046a6f (svn r23896) -Fix (r23884): Don't free unallocated memory. 13 years ago
michi_cc bd3c507910 (svn r23896) -Fix (r23884): Don't free unallocated memory. 13 years ago
michi_cc a55a77cbae (svn r23889) -Codechange: Centralise sprite resizing in one place. (peter1138) 13 years ago
michi_cc e85d5b5d31 (svn r23889) -Codechange: Centralise sprite resizing in one place. (peter1138) 13 years ago
michi_cc 14094d00bf (svn r23887) -Feature: [NewGRF] Support for container version 2. 13 years ago
michi_cc 6db39410a1 (svn r23887) -Feature: [NewGRF] Support for container version 2. 13 years ago
michi_cc 59d0702a6a (svn r23885) -Codechange: Use the GRF sprite loader for then mapgen sprites as well. 13 years ago
michi_cc 02d07e68d8 (svn r23885) -Codechange: Use the GRF sprite loader for then mapgen sprites as well. 13 years ago
michi_cc a02854d32f (svn r23884) -Codechange: Store recolour sprites in memory directly during GRF loading. 13 years ago
michi_cc 76cfbb257c (svn r23884) -Codechange: Store recolour sprites in memory directly during GRF loading. 13 years ago
peter1138 9e0e4bf639 (svn r23315) -Codechange: Only encode sprites for zoom levels that will be used. 13 years ago
peter1138 15d0a22aac (svn r23315) -Codechange: Only encode sprites for zoom levels that will be used. 13 years ago
frosch 74e71380ef (svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
13 years ago
frosch bbcd2bab5d (svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
13 years ago
frosch 29f8f11ed4 (svn r21788) -Codechange: Enable GetRawSprite() to also load sprites not using the spritecache but a custom allocator function. 14 years ago
frosch 93ae848b0a (svn r21788) -Codechange: Enable GetRawSprite() to also load sprites not using the spritecache but a custom allocator function. 14 years ago
frosch bf9f0f16c2 (svn r21787) -Codechange: Pass the allocator function to use to ReadSprite(). 14 years ago
frosch 6cb017456a (svn r21787) -Codechange: Pass the allocator function to use to ReadSprite(). 14 years ago
frosch 856c4b2009 (svn r21785) -Codechange: Make ReadSprite() not operate on the sprite chache directly. 14 years ago
frosch d811238dd0 (svn r21785) -Codechange: Make ReadSprite() not operate on the sprite chache directly. 14 years ago
frosch 5a3a965e85 (svn r21783) -Cleanup (r14997): Remove redundant assignment. 14 years ago
frosch ee67d10c80 (svn r21783) -Cleanup (r14997): Remove redundant assignment. 14 years ago
frosch c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch 5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
terkhen c92b2e9d3c (svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH). 14 years ago
terkhen 88ca183191 (svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH). 14 years ago
rubidium 738e71af4a (svn r19723) -Add: a simple sprite alignment helper. It does not store the new offsets anywhere so as soon as the sprite is reloaded the offsets are gone (use a bigger sprite cache if this happens). Also anything that reloads NewGRFs (new games, loading games or (re)applying NewGRFs) clears the sprite cache and as such resets the offsets. 14 years ago
rubidium c72e2dde60 (svn r19723) -Add: a simple sprite alignment helper. It does not store the new offsets anywhere so as soon as the sprite is reloaded the offsets are gone (use a bigger sprite cache if this happens). Also anything that reloads NewGRFs (new games, loading games or (re)applying NewGRFs) clears the sprite cache and as such resets the offsets. 14 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 224f4e0197 (svn r18028) -Codechange: unglobalise some functions 15 years ago
rubidium 860b9b1cea (svn r18028) -Codechange: unglobalise some functions 15 years ago
rubidium 982b8ee5fc (svn r17693) -Cleanup: remove some unneeded includes 15 years ago
rubidium d6cded5380 (svn r17693) -Cleanup: remove some unneeded includes 15 years ago
smatz f85b8c4e09 (svn r17596) -Codechange: constify some tables 15 years ago
smatz 114d48e492 (svn r17596) -Codechange: constify some tables 15 years ago
rubidium 2e5596025c (svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary 15 years ago
rubidium ca91a97826 (svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary 15 years ago
rubidium 310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago
rubidium e8ddf001c8 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago