Commit Graph

46951 Commits

Author SHA1 Message Date
Jonathan G Rennison
1b4db7d86c Trace restrict: Add wait at entrance PBS for reservation ending here 2018-06-17 18:55:33 +01:00
Jonathan G Rennison
751f379cdd Trace restrict: Fix wrong position of safeguards header include 2018-06-17 18:54:16 +01:00
Michael Lutz
ae467ffc8a Fix: Scale default FreeType font size selection by UI zoom level. 2018-06-17 12:59:59 +02:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 2018-06-17 04:01:31 +01:00
translators
4099506093 Update: Translations from eints
chinese (simplified): 5 changes by xiangyigao
2018-06-16 19:45:39 +02:00
Michael Lutz
574f547aca Fix 768a31b: When cascading to another text layouter, clear the old font run state left over from the previous (failed) layout attempt. 2018-06-16 11:04:03 +02:00
Niels Martin Hansen
5ab06ef8a3 Fix: Don't complain if CAT music files are missing entirely
Just complain if an index into a CAT file that exists is invalid.
2018-06-15 23:09:17 +02:00
Niels Martin Hansen
a1b7812c7e Change: Improved looping of title song 2018-06-15 23:09:17 +02:00
Niels Martin Hansen
11a846e3d5 Change: Compensate for MIDI transmission time when skipping start of song 2018-06-15 23:09:17 +02:00
Niels Martin Hansen
276192f714 Change #6684: Cutting point overrides for music base sets
This improves bad looping of title screen song from Windows TTD, and fixes
a long silence at the end of "Can't get there from here" from Windows TTD.
2018-06-15 23:09:17 +02:00
Niels Martin Hansen
836d25e738 Codechange: Address some MSVC compiler warnings 2018-06-15 22:36:55 +02:00
translators
f5f2125238 Update: Translations from eints
russian: 11 changes by Lone_Wolf
2018-06-15 19:45:39 +02:00
PeterN
c2a7728084 Fix: Prevent ships moving into docks after finishing (un)loading. (#6791) 2018-06-14 09:25:39 +01:00
Jonathan G Rennison
efdbde63c8 Version: Committing version data for tag: jgrpp-0.25.2 2018-06-13 02:11:38 +01:00
Jonathan G Rennison
ca4a4869a2 Revert "Add: [Win32] Uniscribe configure options for MinGW targets."
Revert "Change: [Win32] Use Uniscribe instead of ICU for text caret handling."
Revert "Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs."
Revert "Add: [Win32] Text layout using the native Windows Uniscribe library."
Revert "Codechange: Move ParagraphLayouter-specific functions into factory classes instead of relying on overloads."
Revert "Add: [Win32] Native natural sort implementation."

This reverts commit cd966f3810.
This reverts commit eec3f40931.
This reverts commit 33829dc6ab.
This reverts commit 768a31bfe3.
This reverts commit a4278c302b.
This reverts commit f4394debdc.

This is to fix various problems and crashes with text rendering
and font handling on Windows.

See #58.
2018-06-13 01:46:19 +01:00
translators
7ae1e3e1e2 Update: Translations from eints
korean: 15 changes by telk5093
greek: 4 changes by Jubilee
2018-06-12 19:45:40 +02:00
Jonathan G Rennison
21040dc00b Implementing sending server GRF info list response in multiple packets
Add/adjust GRF info message logging
2018-06-11 06:26:25 +01:00
Jonathan G Rennison
847a46d107 Fix assertion failure in RequestContentList with many GRFs 2018-06-11 01:47:44 +01:00
Jonathan G Rennison
2c7b96cf1e Merge branch 'save_ext' into jgrpp 2018-06-11 00:58:52 +01:00
Jonathan G Rennison
a3156804c5 Fix narrowing/type conversion warning on big endian platforms 2018-06-11 00:55:49 +01:00
Jonathan G Rennison
c5954fd1bd Fix syntax errors in saveload_buffer.h on strict pointer alignment platforms
Fixes #57
2018-06-11 00:54:29 +01:00
translators
470ed2643e Update: Translations from eints
croatian: 4 changes by VoyagerOne
french: 3 changes by glx
polish: 2 changes by McZapkie
2018-06-08 19:45:41 +02:00
Jonathan G Rennison
15f80f16c3 Version: Committing version data for tag: jgrpp-0.25.1 2018-06-08 02:35:19 +01:00
Jonathan G Rennison
f2987854c7 Merge branch 'master' into jgrpp 2018-06-08 02:20:07 +01:00
Andy
11d1690acb Doc: note in README licensing section that CONTRIBUTING.md is adapted from Bootstrap (#6818) 2018-06-07 22:00:01 +02:00
translators
20b0f0f90b Update: Translations from eints
italian: 3 changes by lorenzodv
2018-06-07 19:45:38 +02:00
Jonathan G Rennison
71450881fc Codechange: Avoid call to memcpy using null pointer in TooltipsWindow constructor
Strictly speaking, calling memcpy with src as a nullptr is undefined behaviour
and the optimiser is entitled to delete any null ptr checks which occur afterwards.
This removes the warning emitted by UndefinedBehaviorSantizer.
2018-06-07 09:49:26 +01:00
Jonathan G Rennison
2bd6c9ae95 Change "Base music set song missing..." debug message to level 1 2018-06-07 06:58:04 +01:00
Jonathan G Rennison
a732dc440a Fix use of %zu in debug format strings, which isn't supported on Windows 2018-06-07 06:54:43 +01:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp
# Conflicts:
#	src/string.cpp
2018-06-07 06:49:18 +01:00
Jonathan G Rennison
55083a0f65 Merge branch 'save_ext' into jgrpp 2018-06-07 06:45:18 +01:00
Jonathan G Rennison
3caf92c514 Fix default for orderproc not being set in table/win32_settings.ini 2018-06-07 06:41:46 +01:00
Michael Lutz
cd966f3810 Add: [Win32] Uniscribe configure options for MinGW targets. 2018-06-06 21:37:09 +02:00
Michael Lutz
eec3f40931 Change: [Win32] Use Uniscribe instead of ICU for text caret handling.
This removes the need for the ICU lib on Windows.
2018-06-06 21:37:09 +02:00
Michael Lutz
33829dc6ab Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs. 2018-06-06 21:37:09 +02:00
Michael Lutz
768a31bfe3 Add: [Win32] Text layout using the native Windows Uniscribe library.
Uniscribe is sometimes producing different results compared to ICU, especially
when RTL and LTR content is mixed. Comparing the results to other programs
(like editors or web browsers) leads me to believe that the result are at least
not worse than ICU and possibly better.
2018-06-06 21:37:09 +02:00
Michael Lutz
a4278c302b Codechange: Move ParagraphLayouter-specific functions into factory classes instead of relying on overloads. 2018-06-06 21:37:09 +02:00
Michael Lutz
f4394debdc Add: [Win32] Native natural sort implementation. 2018-06-06 21:37:09 +02:00
Jonathan G Rennison
8f25bbc93c Fix use of HasBit beyond field width in ShowDropDownMenu masks 2018-06-06 19:24:17 +01:00
translators
2b662b448c Update: Translations from eints
french: 1 change by glx
2018-06-06 19:45:38 +02:00
Jonathan G Rennison
b5dea7f236 Fix undefined behaviour in Vehicle destructor 2018-06-06 18:38:18 +01:00
Jonathan G Rennison
e1fb35b16f Fix undefined behaviour when left-shifting negative values by casting to unsigned
This silences warning spam from UndefinedBehaviorSanitizer.
2018-06-06 18:25:45 +01:00
Jonathan G Rennison
6573a67b69 Change window allocation/destruction to avoid undefined behaviour
Create a new window base class which holds the front/back pointers
and the window class.
This fixes the voluminous warning spam about deleted windows when using
UndefinedBehaviorSanitizer.
2018-06-06 18:14:51 +01:00
Alexis
25dbc6542c Fix #6659: Bus stations can be demolished when not in demolish mode (#6815)
For Bus and Road stations only, if you are in demolish mode and click on the station
without releasing the button. Then you cancel demolish mode with R key.
Finally you release the mouse button. The station was demolished, instead of being built.

The demolish mode was not checked when mouse up event occured.
2018-06-06 13:08:22 +01:00
Jonathan G Rennison
0bd1022238 Codechange: Change element type used for rail type usage stats array in SetDefaultRailGui
The array is rail type sized in terms of number of elements.
Each element should be a unsigned integer, not a rail type itself.
This fixes runtime warnings reported by UndefinedBehaviorSanitizer.
2018-06-06 11:02:50 +01:00
Jonathan G Rennison
d8ab61cab3 Change type of track bits mask in MaskWireBits
This is to fix warnings from UndefinedBehaviorSanitizer.
2018-06-06 08:28:50 +01:00
Jonathan G Rennison
18d00ff47e Avoid using memcpy from null pointer in TooltipsWindow constructor 2018-06-06 08:22:58 +01:00
Jonathan G Rennison
c36c5ac851 Tag NewGRF unaligned memory load in StationChangeInfo 2018-06-06 08:22:33 +01:00