Jonathan G Rennison
|
5e14b54a0c
|
Merge branch 'master' into jgrpp
|
4 years ago |
Matt Kimber
|
bcb3313e13
|
Feature: allow setting maximum zoom level at which sprites are drawn (#8604)
|
4 years ago |
Jonathan G Rennison
|
f4e29071be
|
Merge tag '1.11.0-beta2' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
|
4 years ago |
Michael Lutz
|
70aa3b4011
|
Codechange: Give sprite encoders a hint which colour components of a sprite are filled with useful information.
|
4 years ago |
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
4 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
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
|
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
|
6 years ago |
Michael Lutz
|
38729297f9
|
Codechange: No need for AutoFreePtr if there's std::unique_ptr.
|
6 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
|
11 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
|
11 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
|
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 |
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 |
frosch
|
74e71380ef
|
(svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
|
14 years ago |
frosch
|
bbcd2bab5d
|
(svn r22419) -Change: Always use the DOS palette for drawing.
-Remove: the '-i' option for palette selection.
|
14 years ago |
rubidium
|
05199a641a
|
(svn r21890) -Cleanup: remove some unneeded includes
|
14 years ago |
rubidium
|
7eba2bf4d3
|
(svn r21890) -Cleanup: remove some unneeded includes
|
14 years ago |
alberth
|
137e2b64c9
|
(svn r20211) -Codechange: Indented code should have curly braces around it.
|
14 years ago |
alberth
|
be6c058424
|
(svn r20211) -Codechange: Indented code should have curly braces around it.
|
14 years ago |
smatz
|
5504b1105e
|
(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit
|
15 years ago |
smatz
|
f051066bc4
|
(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit
|
15 years ago |
rubidium
|
3de085a143
|
(svn r18683) -Fix: it's not an other
|
15 years ago |
rubidium
|
b2e9b5d612
|
(svn r18683) -Fix: it's not an other
|
15 years ago |
frosch
|
48efc698bb
|
(svn r18391) -Fix (r0): (Invalid) GRFs could trigger invalid reads.
|
15 years ago |
frosch
|
169141433a
|
(svn r18391) -Fix (r0): (Invalid) GRFs could trigger invalid reads.
|
15 years ago |