Commit Graph

46951 Commits

Author SHA1 Message Date
Jonathan G Rennison
bce0ce85b3 Fix comment on setting update for 0.1 increment town cargo scale factor 2018-07-04 18:35:28 +01:00
translators
210afa3701 Update: Translations from eints
serbian: 23 changes by Srbija
greek: 6 changes by Jubilee
russian: 1 change by Lone_Wolf
danish: 7 changes by filli1303
finnish: 21 changes by ln
2018-07-03 19:45:42 +02:00
Jonathan G Rennison
f86dd1010c Fix assertion failure on cancel depot/service in vehicle list window
Fixes #61
2018-07-03 00:25:51 +01:00
Jonathan G Rennison
491a884944 Fix: ALL_CARGOTYPES mask constant was 32 instead of 64 bits (#6845)
NUM_CARGO and CargoTypes were increased from 32 to 64 cargoes/bits
respectively in commit 11ab3c4ea2
2018-07-02 22:47:55 +02:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
2018-07-02 21:04:06 +01:00
Jonathan G Rennison
00b1fe6246 Cargo type orders: Add support for 64 cargo types 2018-07-02 21:03:53 +01:00
Jonathan G Rennison
0ae32838ea Merge branch 'save_ext' into cargo_type_order
# Conflicts:
#	src/core/smallstack_type.hpp
2018-07-02 18:52:22 +01:00
translators
4a35409e0f Update: Translations from eints
italian: 1 change by lorenzodv
2018-07-02 19:45:39 +02:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
2018-07-02 18:41:39 +01:00
Jonathan G Rennison
5770f1407a Signals on bridges: Shrink M2 simulated signal states field 2018-07-02 18:29:10 +01:00
translators
8f278b3405 Update: Translations from eints
croatian: 4 changes by VoyagerOne
2018-07-01 19:45:40 +02:00
Niels Martin Hansen
6cf4d7d3ef Fix: Put last SVN revision back in NewGRF version number (#6843)
This is necessary to be compatible with some Game Scripts that might trigger compatibility modes if the SVN revision part is wrong. Potentially some NewGRFs might also be affected.

See for example [SuperLib's Helper class](https://dev.openttdcoop.org/projects/superlib/repository/entry/helper.nut#L280), containing this function:

    function _SuperLib_Helper::HasWorldGenBug()
    {
    	local version = _SuperLib_Helper.GetOpenTTDVersion();
    
    	if (version.Major == 0 || (version.Major == 1 && version.Minor <= 3)) {
    		return version.Revision < 25339;
    	} else {
    		return version.Revision < 25305;
    	}
    }

If this function sees a Revision value of zero, it might trigger a workaround not required, causing a regression in scripts dependent on this. The MinimalGS example, for one, will trigger this.
2018-07-01 12:15:00 +02:00
J0anJosep
4189cb85ba Codechange: Use HasTracks with TrackStatus. 2018-06-27 23:14:30 +02:00
J0anJosep
d01c09fb73 Codechange: Use HasTrack(dir) to improve code readability. 2018-06-27 23:14:30 +02:00
J0anJosep
31ac11bddb Codechange: Increase readability of track functions and pathfinders. 2018-06-27 23:14:30 +02:00
Juanjo
85ebe20a76 Cleanup: Unnecessary assignation on FollowTileExit(): done previously on the function. 2018-06-27 23:14:30 +02:00
Juanjo
6a9df285d0 Codechange: Separate an assertion. More information if assert is triggered. 2018-06-27 23:14:30 +02:00
Charles Pigott
2aacddd412 Codechange: lengthof is not defined for runtime-length strings, use sizeof instead 2018-06-27 22:54:46 +02:00
Charles Pigott
5f86e1a390 Codechange: Silence -Wclass-memaccess warnings with GCC8 2018-06-27 22:54:46 +02:00
Charles Pigott
e1b9187e9b Codechange: Add initialisation values for all CompanyProperty attributes 2018-06-27 22:54:46 +02:00
Michael Lutz
dbfc417e65 Fix: [Win32] Garbage in OS window title if branch name was too long.
This was caused by a missing \0-character on reaching the buffer limit.
2018-06-27 22:16:43 +02:00
translators
6c02c19931 Update: Translations from eints
italian: 3 changes by lorenzodv
2018-06-27 19:45:41 +02:00
Jonathan G Rennison
79ca5c8b7d Merge branch 'custom_bridgeheads' into jgrpp 2018-06-26 18:34:17 +01:00
Jonathan G Rennison
25af12814b Fix double-adding of road tunnel/bridge infra counts when changing owner 2018-06-26 18:30:31 +01:00
PeterN
11ab3c4ea2 Change: Increase cargo type limit to 64. 2018-06-26 13:32:58 +01:00
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
2018-06-25 18:57:48 +01:00
translators
7eca4a9b47 Update: Translations from eints
french: 5 changes by glx
2018-06-25 19:45:40 +02:00
Jonathan G Rennison
b48a6ef368 Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
This reverts commit ca4a4869a2.
2018-06-25 18:39:59 +01:00
Niels Martin Hansen
336d6cab68 Fix 6298b96: Playlist window not drawing playlist
Copy-paste error in change to remove C++11 usage...
2018-06-25 00:00:56 +02:00
Pavel Stupnikov
9fc3212679 Feature #6397: Keep town growth rate in sync with house count
Takes some code and ideas from #6378 patch, but doesn't change anything GS-related.
2018-06-24 20:55:48 +02:00
Jonathan G Rennison
dc8fff2c4d Add: Hover tool-tips to cargo dest flow legend window.
This is to improve the usability of the window.
The two-letter abbreviations are not always clear, in particular
when using a large number of cargoes.
The company colours can be ambiguous when there are a large
number of companies.
2018-06-24 20:18:10 +02:00
Niels Martin Hansen
6298b96571 Change: Modernise music control logic implementation (#6839)
Rewrite of almost the entire music control logic to a more modern style, hopefully also easier to understand. The old playlist handling made it look like arcane magic, which it doesn't have to be.

- Playlists are now stored in std::vector of objects instead of arrays of bytes with magic sentinel values, that need to be rotated around all the time. Position in playlist is stored as a simple index.
- The theme song is now reserved for the title screen, it doesn't play on any of the standard playlists, but is still available for use on custom playlists.
- When the player enters/leaves the game from the main menu, the music always restarts.
- Playback state (playing or not) is kept even if music becomes unavailable due to an empty playlist (or an empty music set), so it can restart immediately if music becomes available again.
- The shuffle algorithm was changed to a standard Fisher-Yates.
- Possibly better behavior when editing a custom playlist while it's playing.
- Custom playlists should be compatible.
- Framework for supporting custom playlists with songs from multiple music sets.
2018-06-24 20:06:05 +02:00
translators
889175f7ad Update: Translations from eints
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
french: 1 change by glx
2018-06-24 19:45:46 +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
Alberth
7fed8fe004 Fix #6553: Make viewport button text unambiguous. 2018-06-24 15:03:06 +02:00
Greg-21
38f29fd5d6 Update: Updated changelog based on... (#6835)
...the changelog in release 1.8 branch.
2018-06-24 00:56:11 +02:00
Greg-21
388bca6a42 Update: Changed some things in Readme file
Changed HTTP links to HTTPS, fixed some links to articles on OpenTTD Wiki, added Windows 10 and 8.1 to info section about path structure in these OSes, removed some
unnecessary whitespaces (and added several others), and some other less important changes.
2018-06-23 15:28:55 +02:00
Niels Martin Hansen
4fb76db42f Feature #986: Automatic save when losing connection to a network game 2018-06-23 15:22:31 +02:00
Alberth289346
11ba094582 Feature #4186: Append '(City)' behind cities in the town directory (sbr) 2018-06-23 14:02:50 +02:00
Alberth
1a5a95aa49 Fix: Make switch on MD5File::ChecksumResult complete to avoid compiler warning 2018-06-23 14:00:41 +02:00
translators
21ac11548a Update: Translations from eints
korean: 1 change by telk5093
2018-06-22 19:45:39 +02:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders
Controlled by a setting (default off)
2018-06-21 23:28:19 +01:00
kiwitreekor
f00930fa52 Merge pull request #59 from kiwitreekor
Squashed commit of the following:

commit 0497399a03f7279d47d67879516613105dd64f92
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 22:10:27 2018 +0900

    Update korean.txt

commit c4d60bc9e9db9543df68799d72cb903323a4ef37
Merge: 27729f1 0ac92b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:10:11 2018 +0900

    Merge branch 'jgrpp' into jgrpp

commit 27729f10fc82bea86bfe790998c95a780bfe3d9e
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:02:20 2018 +0900

    Update Korean Translation

commit 1e67b51ed818f241acd28cdd1f5104d7839cb1f0
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:33:04 2018 +0900

    Add files via upload

commit 9ee0445edd2f44ab8c885114ad1f49c8d20506b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:30:43 2018 +0900

    upload mistake

commit 21bc4d9db104b151e90648855c2ca6b45df80097
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:27:51 2018 +0900

    Fix Mistypo

commit 716b451d8b32bcfa8a051637fe41ed809a8989b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:25:15 2018 +0900

    Update Korean Translation
2018-06-21 20:56:56 +01:00
Jonathan G Rennison
670ed0de5b Fix double-accounting of bidi signals on bridge/tunnel during owner change 2018-06-21 18:45:40 +01:00
Jonathan G Rennison
fd08259698 Fix fast path being unconditionally disabled in save/load whole map 2018-06-21 18:29:39 +01:00
Jonathan G Rennison
0ac92b8236 Update current order unload type and cargo type load/unload on modify order 2018-06-19 18:50:23 +01:00
Jonathan G Rennison
e5a8dbee35 Through load: Fix handling of load if available cargo type orders 2018-06-19 18:34:00 +01:00
Jonathan G Rennison
2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
2018-06-17 23:24:22 +01:00
Jonathan G Rennison
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +01:00
glx
10d8b83038 Fix: library detection on MSYS2 file system 2018-06-17 21:56:46 +02:00