Jonathan G Rennison
da1ac73c02
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
...
# Conflicts:
# src/lang/estonian.txt
# src/lang/hungarian.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/packet.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/string_func.h
2021-09-18 22:10:04 +01:00
Rubidium
6bd12e24d7
Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality
...
(cherry picked from commit fdc11a9f94
2021-05-30 22:02:14 +01:00
rubidium42
cb89d22cf2
Codechange: add DrawString(Multiline) that accepts std::string&
2021-05-06 21:45:36 +02:00
Peter Nelson
7bf0eefd36
Codechange: Simplify calling of DrawCharCentered()
...
(cherry picked from commit 2efa390a7d
2021-05-06 19:59:39 +01:00
Peter Nelson
2efa390a7d
Codechange: Simplify calling of DrawCharCentered()
2021-04-30 17:08:15 +01:00
Jonathan G Rennison
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
2021-04-25 02:14:58 +01:00
Peter Nelson
636e37d183
Codechange: Add internal widget alignment property, along with widget part.
2021-04-22 16:42:04 +01:00
Jonathan G Rennison
2a13c8623c
Revert: 4c59dfb6, move DoPaletteAnimations back into GameLoop
...
Race fix to follow
2021-04-05 19:55:53 +01:00
Patric Stout
f183ded9fe
Add: settings to limit your fast-forward game speed
...
By default this setting is set to 2500% normal game speed.
(cherry picked from commit c3dc27e37e
2021-03-01 17:54:15 +00:00
Patric Stout
c3dc27e37e
Add: settings to limit your fast-forward game speed
...
By default this setting is set to 2500% normal game speed.
2021-02-28 18:04:51 +00:00
Jonathan G Rennison
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
2021-02-19 15:38:34 +00:00
Michael Lutz
22f5aeab07
Feature: Automatic UI and font zoom levels when supported by the OS.
2021-02-14 14:16:40 +01:00
SamuXarick
f9dee5aaa0
Feature: Show rainforest under vegetation on small map
2021-01-13 15:05:15 +00:00
Jonathan G Rennison
0902243ab3
Allow changing the colour of plans
2020-11-06 22:40:02 +00:00
Jonathan G Rennison
d29a08dfe1
Add gfx_debug console command
2020-10-02 02:10:09 +01:00
TechGeekNZ
8652a4db76
Cleanup: Give SetDirtyBlocks a more descriptive name.
2020-06-09 13:15:47 +01:00
Jonathan G Rennison
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
Michael Lutz
808c8198d5
Codechange: Consistently use WChar when passing characters around, and also define it as char32_t.
2020-05-21 20:02:34 +02:00
Jonathan G Rennison
4c59dfb6b1
Fix data race during palette animation with threaded blitters
2020-04-12 00:12:58 +01:00
Jonathan G Rennison
c227d30801
Fix window re-rendering when ReInit() called within OnPaint/draw handler
2020-03-23 00:22:46 +00:00
Jonathan G Rennison
8f442500ea
Change how dirty screen, window and viewport areas are tracked for later redrawing
...
Track dirty viewport areas seperately form general screen redraws.
Maintain a dirty block grid per viewport, with a smaller block size.
Use even smaller block size in viewport map mode.
Use a rectangle array for general screen redraws instead of a block grid.
Add a dirty bit to windows and widgets, to simplify the common case
of repainting a whole window or widget, without catching
neighbouring windows or viewports.
2020-03-05 00:27:17 +00:00
Jonathan G Rennison
a152e2327c
Viewport: Reduce unnecessary region redraws when scrolling viewports
2020-02-09 10:54:32 +00:00
Jonathan G Rennison
4adfe0c9ae
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
2020-01-08 18:40:34 +00:00
Niels Martin Hansen
35c55dfe70
Add: Filled polygon drawing function
2020-01-07 18:13:58 +01:00
Jonathan G Rennison
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
2020-01-06 18:45:51 +00:00
Niels Martin Hansen
ac3bc30a30
Add: Highlight item under mouse in file browser
2020-01-05 23:50:00 +01:00
TELK
e04ca904a9
Feature: Minimap screenshot
2020-01-04 18:21:38 +01:00
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
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
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
2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768
Fix: Some typos found using codespell
2019-09-29 21:27:32 +01:00
Jonathan G Rennison
b3431512ee
Add modifier key window for toggling shift/ctrl key states using mouse
2019-09-05 23:21:41 +01:00
Jonathan G Rennison
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
2019-04-23 08:11:52 +01:00
glx
9195f2337a
Codechange: use std::vector for _resolutions
2019-04-18 21:49:34 +02:00
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
Jonathan G Rennison
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
2019-04-09 19:06:26 +01:00
Michael Lutz
ae748166d0
Codechange: Use platform independent C++11 function for sleeping on a thread.
2019-04-06 11:27:39 +02:00
Jonathan G Rennison
458bc90678
Fix: Poor contrast in cargo dest flow legend window cargo labels.
...
Select foreground colour depending on the brightness of the background.
Previously all cargo labels were rendered using black text, even
the background cargo colour was dark/black.
As an example: FIRS coal was black text on a black background.
2018-06-24 19:32:04 +02:00
Jonathan G Rennison
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
2017-04-01 01:14:28 +01:00
Jonathan G Rennison
83091f55da
Merge branch 'vehicle_group_info' into jgrpp
2017-04-01 01:02:22 +01:00
peter1138
dac0a3e86e
(svn r27829) -Fix (r27821): Occasional crash caused by mixing int/uint arithmetic.
2017-03-25 23:19:41 +00:00
peter1138
01c8ba0d5d
(svn r27829) -Fix (r27821): Occasional crash caused by mixing int/uint arithmetic.
2017-03-25 23:19:41 +00:00
peter1138
2c0ef5c659
(svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo)
2017-03-23 22:00:00 +00:00
peter1138
bcc5c9f81d
(svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo)
2017-03-23 22:00:00 +00:00
Jonathan G Rennison
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
2016-12-26 15:38:56 +00:00
frosch
60a79b599e
(svn r27711) -Doc: Fontsizes (adf88)
2016-12-25 17:55:10 +00:00
frosch
eae9234c07
(svn r27711) -Doc: Fontsizes (adf88)
2016-12-25 17:55:10 +00:00
Jonathan G Rennison
fa261207ae
Link graph GUI: Fix poor contrast in graph legend window cargo labels.
...
Select foreground colour depending on brightness of background.
2016-11-21 23:08:13 +00:00
Jonathan G Rennison
761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
2016-08-26 00:19:11 +01:00
