Commit Graph

130 Commits (68dbbf594574686f7502158ad435f2e9990b6608)

Author SHA1 Message Date
Jonathan G Rennison 0d93ecb6bf Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp
5 years ago
Michael Lutz 38729297f9 Codechange: No need for AutoFreePtr if there's std::unique_ptr. 5 years ago
Jonathan G Rennison d489ee5d9c Discard invalid/negative sprite sizes in LoadSpriteV1
This is to avoid sign-conversion to a huge unsigned value
which is passed to malloc.
6 years ago
Jonathan G Rennison c9c3e6f574 Fix use of uint8 for file slot handles 6 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 223f743271 (svn r26132) -Fix-ish: prevent issues due to overflowing multiplications by limiting the size of full zoom sprites to about 32kix32ki 11 years ago
rubidium 70b2093ddb (svn r26132) -Fix-ish: prevent issues due to overflowing multiplications by limiting the size of full zoom sprites to about 32kix32ki 11 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 0552b23d31 (svn r23894) -Fix (r23893): Use the right variable, not the one that's always going to be 0. 13 years ago
michi_cc c9e664d4cb (svn r23894) -Fix (r23893): Use the right variable, not the one that's always going to be 0. 13 years ago
michi_cc c586e162cb (svn r23893) -Change: [NewGRF] Extended chunked sprite encoding to work for bigger sprites. 13 years ago
michi_cc 4702924f6e (svn r23893) -Change: [NewGRF] Extended chunked sprite encoding to work for bigger sprites. 13 years ago
michi_cc c6f136a620 (svn r23890) -Add: [NewGRF] Support for RealSprites with multiple zoom levels. 13 years ago
michi_cc 5c1cc27b03 (svn r23890) -Add: [NewGRF] Support for RealSprites with multiple zoom levels. 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 949d2d3b55 (svn r23881) -Codechange: Move GRF sprite decoding into a separate function. 13 years ago
michi_cc 5af68295b0 (svn r23881) -Codechange: Move GRF sprite decoding into a separate function. 13 years ago
peter1138 42347d3c45 (svn r23670) -Feature: Add ability to adjust brightness of colour after remapping for 32bpp sprites 13 years ago
peter1138 3ef77e55c5 (svn r23670) -Feature: Add ability to adjust brightness of colour after remapping for 32bpp sprites 13 years ago
rubidium 16ccb8f246 (svn r23527) -Codechange: unify colo(u)r as far as it goes 13 years ago
rubidium fd559171b4 (svn r23527) -Codechange: unify colo(u)r as far as it goes 13 years ago
rubidium 9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
rubidium 58423b26d1 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
peter1138 9f787611fc (svn r23324) -Fix (r15555): Don't free reusable buffer. 13 years ago
peter1138 8be8d5e843 (svn r23324) -Fix (r15555): Don't free reusable buffer. 13 years ago
peter1138 b84174fd4d (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 13 years ago
peter1138 81598273e9 (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 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 d30b5d4ebe (svn r23008) -Add: Palette detection and conversion for the M part of 32bpp sprites. 13 years ago
frosch ca1df3ddab (svn r23008) -Add: Palette detection and conversion for the M part of 32bpp sprites. 13 years ago
frosch 64ac0cd696 (svn r22878) -Fix (r22873-ish): Check range before casting to uint16. 13 years ago
frosch b910ae9886 (svn r22878) -Fix (r22873-ish): Check range before casting to uint16. 13 years ago
michi_cc 4b6c2259ed (svn r22873) -Fix [FS#4747]: Validate image dimensions before loading. (Based on patch by monoid) 13 years ago
michi_cc 6c7cbb1d46 (svn r22873) -Fix [FS#4747]: Validate image dimensions before loading. (Based on patch by monoid) 13 years ago
rubidium 62886dfeed (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 13 years ago
rubidium b4edc30c64 (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 13 years ago
rubidium 26788cf363 (svn r22825) -Codechange: pass subdir to FioOpenFile 13 years ago
rubidium 2a12c9df2f (svn r22825) -Codechange: pass subdir to FioOpenFile 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