Commit Graph

591 Commits (0b2b28959c3a959e77c896934c36fee8d9dfa95e)

Author SHA1 Message Date
Jonathan G Rennison 281d346fe2 Merge branch 'master' into jgrpp
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
5 years ago
glx e76fd99c47 Fix #7007: deadlock when launched with -n switch 6 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison 4d1bd8e4b4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
6 years ago
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.
6 years ago
Jonathan G Rennison ad1c402ad8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
6 years ago
Patric Stout aef69443e7 Remove: WinCE support 6 years ago
Jonathan G Rennison fa261207ae Link graph GUI: Fix poor contrast in graph legend window cargo labels.
Select foreground colour depending on brightness of background.
8 years ago
Jonathan G Rennison 761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
8 years ago
frosch 3cb7d9703b (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 8 years ago
frosch 0e3e4eeb53 (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 8 years ago
frosch 4d1843a95e (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 8 years ago
frosch 2337d169e8 (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 8 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
michi_cc 2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 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
frosch 4830497f0b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
frosch 67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
frosch 240bf9f551 (svn r27324) -Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines. (noticed by adf88) 9 years ago
frosch d1c2eae95d (svn r27324) -Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines. (noticed by adf88) 9 years ago
frosch 2e2b35c733 (svn r27323) -Fix: Spelling. 9 years ago
frosch e55f1adfa8 (svn r27323) -Fix: Spelling. 9 years ago
frosch a65a194416 (svn r27322) -Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width'. (adf88) 9 years ago
frosch 70e2c23772 (svn r27322) -Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width'. (adf88) 9 years ago
frosch 70e575e7d7 (svn r27172) -Fix [FS#6238] (r27167): Apparently Windows randomly drops SetCursorPos calls. According to internet due to incorrect/missing synchronisation in threads accessing the event queue. 9 years ago
frosch c0801cbd8d (svn r27172) -Fix [FS#6238] (r27167): Apparently Windows randomly drops SetCursorPos calls. According to internet due to incorrect/missing synchronisation in threads accessing the event queue. 9 years ago
frosch 352e528cda (svn r27167) -Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped way to far, when OpenTTD lagged during mouse event processing. 9 years ago
frosch 3cceb21a94 (svn r27167) -Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped way to far, when OpenTTD lagged during mouse event processing. 9 years ago
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 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
peter1138 2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
peter1138 253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 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
peter1138 ee266b9b9d (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 10 years ago
peter1138 5a924dcbbc (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 10 years ago
frosch 599a5a1969 (svn r26792) -Fix: TC_NO_SHADE did not work for 32bpp text rendering. 10 years ago
frosch 93722be21f (svn r26792) -Fix: TC_NO_SHADE did not work for 32bpp text rendering. 10 years ago
rubidium beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 10 years ago
rubidium b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 10 years ago
frosch b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
10 years ago
frosch 631e8b45fd (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
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
peter1138 f2a47eb080 (svn r26467) -Fix: Include shadow on ... 10 years ago
peter1138 e943d355e2 (svn r26467) -Fix: Include shadow on ... 10 years ago
peter1138 3465686076 (svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites. 10 years ago
peter1138 209d3e2e9e (svn r26463) -Fix (r10190ish): Add special handling for PALETTE_CRASH to work for non-8bpp-mapped sprites. 10 years ago
rubidium 4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 31fd320d5f (svn r26204) -Codechange: rework GfxBlitter to remove some unneeded operations when there is no sub sprite (based on patch by MJP) 11 years ago
rubidium c98a94da44 (svn r26204) -Codechange: rework GfxBlitter to remove some unneeded operations when there is no sub sprite (based on patch by MJP) 11 years ago
rubidium cb397e9455 (svn r26203) -Codechange: unduplicate GfxMainBlitter and GfxMainBlitterViewport 11 years ago
rubidium 256a3160c4 (svn r26203) -Codechange: unduplicate GfxMainBlitter and GfxMainBlitterViewport 11 years ago
rubidium 83119ed8ab (svn r26018) -Codechange: since there's a wrapper for ICU functions now, we can use proper coding style for names again 11 years ago
rubidium 4c5ccc8b94 (svn r26018) -Codechange: since there's a wrapper for ICU functions now, we can use proper coding style for names again 11 years ago
rubidium f3f03d97ef (svn r26016) -Codechange: prepare for some class renames 11 years ago
rubidium 6449e96f1a (svn r26016) -Codechange: prepare for some class renames 11 years ago
rubidium 40f31d7c0a (svn r26015) -Codechange: some constificaton 11 years ago
rubidium b9e4697d8a (svn r26015) -Codechange: some constificaton 11 years ago
fonsinchen 19661eeef8 (svn r25911) -Add: Support for drawing dashed lines. 11 years ago
fonsinchen 89b7afbac8 (svn r25911) -Add: Support for drawing dashed lines. 11 years ago
frosch 433565b98f (svn r25816) -Add [FS#5748]: Toggle button for wrapping lines in the textfile GUI (LordAro) 11 years ago
frosch dfa0e61f25 (svn r25816) -Add [FS#5748]: Toggle button for wrapping lines in the textfile GUI (LordAro) 11 years ago
fonsinchen 4396dcf642 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 11 years ago
fonsinchen 0baa72aff9 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 11 years ago
michi_cc e34fe220e2 (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 30867c487f (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 82d6d4be3d (svn r25651) -Fix: Textbuf caret rendering for complex scripts (e.g. Tamil). 11 years ago
michi_cc 33f3cf3a5d (svn r25651) -Fix: Textbuf caret rendering for complex scripts (e.g. Tamil). 11 years ago
frosch 8701f523ae (svn r25567) -Codechange: Revive dead DrawStringParams as FontState. 11 years ago
frosch 3fa1b4e8c3 (svn r25567) -Codechange: Revive dead DrawStringParams as FontState. 11 years ago
frosch 0532f86dbf (svn r25564) -Add: a simple clipping rule to decide whether a string without linebreaks is visible before computing the layouting. This skips around 2/3 of layout computations in usual-sized list-like windows. 11 years ago
frosch 290fbd2231 (svn r25564) -Add: a simple clipping rule to decide whether a string without linebreaks is visible before computing the layouting. This skips around 2/3 of layout computations in usual-sized list-like windows. 11 years ago
rubidium cb4f89a60f (svn r25547) -Fix [FS#5626]: ICU returns the width of the visual run as if the trailing space was added (in case a newline was added). This caused the width to be more than the requested width, but it would still be drawn correctly 11 years ago
rubidium 7bc4845aac (svn r25547) -Fix [FS#5626]: ICU returns the width of the visual run as if the trailing space was added (in case a newline was added). This caused the width to be more than the requested width, but it would still be drawn correctly 11 years ago
frosch 6be31ca86c (svn r25478) -Fix: Clip glyphs using the actual sprite dimensions instead of the text advancement. 11 years ago
frosch 653a005d19 (svn r25478) -Fix: Clip glyphs using the actual sprite dimensions instead of the text advancement. 11 years ago
rubidium bb7a5cbb76 (svn r25477) -Fix: truncation didn't work because the string was truncated (or rather a newline was added) too early 11 years ago
rubidium 809120bc05 (svn r25477) -Fix: truncation didn't work because the string was truncated (or rather a newline was added) too early 11 years ago
frosch be9ed9a2bb (svn r25476) -Cleanup: Remove unused _max_char_size, _max_char_height, _max_char_width. 11 years ago
frosch eb7962a72e (svn r25476) -Cleanup: Remove unused _max_char_size, _max_char_height, _max_char_width. 11 years ago
rubidium ba3eda7c1e (svn r25472) -Cleanup: remove the old methods for drawing text 11 years ago
rubidium f980d1a43c (svn r25472) -Cleanup: remove the old methods for drawing text 11 years ago
rubidium 8a1af5c1b2 (svn r25471) -Fix/Feature [FS#5481]: support for Brahmic scripts (e.g. Tamil and Thai) 11 years ago
rubidium 8bbbb1b37a (svn r25471) -Fix/Feature [FS#5481]: support for Brahmic scripts (e.g. Tamil and Thai) 11 years ago
rubidium 0178092c2c (svn r25467) -Add: truncation support to the drawing routine 11 years ago
rubidium 899c4d85e4 (svn r25467) -Add: truncation support to the drawing routine 11 years ago
rubidium fd2c650463 (svn r25466) -Add: drawing routine for the layout engine 11 years ago
rubidium 4f0ef61d4e (svn r25466) -Add: drawing routine for the layout engine 11 years ago
rubidium a290f2d53a (svn r25455) -Cleanup: make local function really local 11 years ago
rubidium be2b87c1cd (svn r25455) -Cleanup: make local function really local 11 years ago
rubidium 2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 7c0f34130c (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 30394cb05e (svn r25438) -Codechange: introduce classes for the FontCache 11 years ago