Jonathan G Rennison
|
62d524eaef
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/spritecache.cpp
# src/timetable_gui.cpp
|
2 years ago |
Rubidium
|
f7af9a299a
|
Codechange: prevent suspicious pointer scaling
|
2 years ago |
Jonathan G Rennison
|
b2d8f3ce43
|
Add setting to disable water animation depending on zoom level
|
2 years ago |
Jonathan G Rennison
|
ffef1c9e44
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
|
3 years ago |
Jonathan G Rennison
|
5e14b54a0c
|
Merge branch 'master' into jgrpp
|
4 years ago |
Michael Lutz
|
ae1f7bd695
|
Fix 937d60f2: Broken company colours for 40bpp-blitter. (#8821)
|
4 years ago |
Jonathan G Rennison
|
5a364d3e8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/blitter/32bpp_optimized.cpp
# src/lang/serbian.txt
|
4 years ago |
Michael Lutz
|
937d60f239
|
Fix #8774: Black screenshots when using 40bpp-blitter. (#8791)
This affected all screenshot types that render to an off-screen
buffer and don't copy the actual screen contents.
|
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 |
Jonathan G Rennison
|
4ef363422a
|
Add 32bpp blitter support for adjusting brightness of drawn sprites
|
4 years ago |
Michael Lutz
|
94d8acb7d0
|
Add: A 32 bpp blitter that uses the animation buffer from the video backend to speed up palette animation.
|
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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
Jonathan G Rennison
|
11a10299d1
|
Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder
|
7 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 |
rubidium
|
eabb35a874
|
(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites
|
10 years ago |
rubidium
|
9c31ffd893
|
(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites
|
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 |
peter1138
|
3465686076
|
(svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites.
|
11 years ago |
peter1138
|
209d3e2e9e
|
(svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites.
|
11 years ago |
frosch
|
554e14420c
|
(svn r25820) -Codechange: More const-ness.
|
11 years ago |
frosch
|
640d39c001
|
(svn r25820) -Codechange: More const-ness.
|
11 years ago |
rubidium
|
ddae614e74
|
(svn r24111) -Codechange: use Colour more instead of manually bitstuffing
|
13 years ago |
rubidium
|
54e36c4ff8
|
(svn r24111) -Codechange: use Colour more instead of manually bitstuffing
|
13 years ago |
frosch
|
b421b2a97a
|
(svn r23989) -Fix-ish: Zero the offsets of disabled zoomlevels.
|
13 years ago |
frosch
|
058017e178
|
(svn r23989) -Fix-ish: Zero the offsets of disabled zoomlevels.
|
13 years ago |
frosch
|
d8db4e3e9e
|
(svn r23988) -Fix: Typo in comment.
|
13 years ago |
frosch
|
dac51654fe
|
(svn r23988) -Fix: Typo in comment.
|
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 |
rubidium
|
d5eeab43b7
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
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 |
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 |
rubidium
|
33d71b45fe
|
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
|
13 years ago |
rubidium
|
7fd1e1df81
|
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
|
13 years ago |
rubidium
|
3053d8e3b5
|
(svn r23194) -Codechange: don't cast away const needlessly
|
13 years ago |
rubidium
|
4f87d2e88c
|
(svn r23194) -Codechange: don't cast away const needlessly
|
13 years ago |
rubidium
|
7dfcc69011
|
(svn r22397) -Document: some tidbits of the blitter code
|
14 years ago |
rubidium
|
485c7cd99e
|
(svn r22397) -Document: some tidbits of the blitter code
|
14 years ago |
frosch
|
dfff637487
|
(svn r21782) -Codechange: Move declaration of AllocatorProc from Blitter:: to spritecache.h
|
14 years ago |
frosch
|
3d1008318b
|
(svn r21782) -Codechange: Move declaration of AllocatorProc from Blitter:: to spritecache.h
|
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 |