Jonathan G Rennison
|
309f1b47d2
|
Only apply sprite_zoom_min setting when suitable zoom levels are available
Only discard sprite zoom levels when a suitable higher zoom level is
defined in the same colour mode
See: https://github.com/OpenTTD/OpenTTD/issues/9804
|
2 years ago |
|
Jonathan G Rennison
|
27316f70ec
|
Create enum for sprite cache control flag bits
|
2 years ago |
|
Jonathan G Rennison
|
7d86909a90
|
Ensure that sprite data is cleared when loading over an existing sprite
Fixes crash when looking at recolour sprite in sprite viewer window
which has been overriden by a non-recolour sprite by a faulty GRF
|
2 years ago |
|
Jonathan G Rennison
|
1a4b0d6ecf
|
Prevent NewGRFs from using Action A to replace internal sprites
|
2 years ago |
|
Jonathan G Rennison
|
80236f5c4c
|
Remove a dubious use of FIND_FIRST_BIT
|
3 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
|
1002c6d9d2
|
Fix various compiler warnings
See: #267
|
3 years ago |
Patric Stout
|
28e90769f7
|
Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
|
3 years ago |
|
Jonathan G Rennison
|
fe64093cc0
|
Avoid reading non-32bpp sprites twice where possible
Try to avoid unnecessary over-reading
|
3 years ago |
Rubidium
|
6bd12e24d7
|
Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality
(cherry picked from commit fdc11a9f94)
|
3 years ago |
|
Rubidium
|
fdc11a9f94
|
Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality
|
3 years ago |
|
Jonathan G Rennison
|
edfa04286b
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
|
3 years ago |
Charles Pigott
|
dd798d688b
|
Fix #8919: Release builds with asserts enabled (#8925)
|
3 years ago |
|
Patric Stout
|
fece1c57ca
|
Codechange: Suppress warnings when asserts are disabled (#8917)
|
3 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
|
3 years ago |
Michael Lutz
|
3e49aff35c
|
Codechange: Allow video drivers to handle the cursor themselves.
|
3 years ago |
|
Michael Lutz
|
6776229047
|
Codechange: Make the simple Malloc sprite allocator globally usable.
|
3 years ago |
|
Michael Lutz
|
70aa3b4011
|
Codechange: Give sprite encoders a hint which colour components of a sprite are filled with useful information.
|
3 years ago |
|
Michael Lutz
|
e7e5316340
|
Add: Allow sprite encoders (blitters) to specify an alignment for sprite width and height.
|
3 years ago |
|
Michael Lutz
|
02e8741457
|
Codechange: Allow for using a sprite encoder that is not the currently active blitter when loading a sprite.
|
3 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
|
3 years ago |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
3 years ago |
|
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
3 years ago |
|
Jonathan G Rennison
|
aefefb61c2
|
Fix GetSpriteMainColour with non-default zoom sprites
This fixes viewport map mode with extra zoom ground tile sets
|
3 years ago |
|
Jonathan G Rennison
|
81a1094cc8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/date.cpp
# src/economy.cpp
# src/misc.cpp
# src/newgrf_house.cpp
|
4 years ago |
Niels Martin Hansen
|
c8779fb311
|
Feature: NewGRF callback profiling (#7868)
Adds a console command newgrf_profile to collect some profiling data about NewGRF action 2 callbacks and produce a CSV file.
|
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
|
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
|
5 years ago |
|
Jonathan G Rennison
|
f645222d8f
|
Add scope info logging to sprite read/load
|
5 years ago |
|
Jonathan G Rennison
|
3f03d03d92
|
Fix uint8 file_slot in LoadNextSprite
|
5 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.
|
7 years ago |
|
Jonathan G Rennison
|
90cd312428
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/fios.h
|
7 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.
|
7 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.
|
7 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 |