dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,421 Commits 1 Branch 0 Tags
a07df413421cde9563ab1df2ca5001b9bd0e403f
Commit Graph

49421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
3014213186 Update: Translations from eints 
malay: 11 changes by eidan_shafie
 2018-07-17 19:45:39 +02:00
Jonathan G Rennison
42505f3532 Merge branch 'custom_bridgeheads' into jgrpp 2018-07-13 08:28:06 +01:00
Jonathan G Rennison
176fd2180b Fix regression preventing road vehicles from leaving tunnels 2018-07-13 08:27:52 +01:00
Jonathan G Rennison
e67cd04596 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 2018-07-13 03:14:31 +01:00
Jonathan G Rennison
6ca0fcbae2 Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole 2018-07-13 03:13:50 +01:00
Jonathan G Rennison
a7e767d766 Fix 90° turns being wrongly detected across bridges of non-zero length 
This prevented reservations
 2018-07-13 03:01:08 +01:00
translators
f70544074c Update: Translations from eints 
latin: 19 changes by Supercheese
english (us): 19 changes by Supercheese
 2018-07-11 19:45:41 +02:00
translators
85ef5acf29 Update: Translations from eints 
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
 2018-07-10 19:45:40 +02:00
translators
ae13f88c12 Update: Translations from eints 
malay: 9 changes by eidan_shafie
 2018-07-09 19:45:37 +02:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
dfd3e3dcaa Add track func: TrackdirToDirection 2018-07-08 23:01:29 +01:00
Jonathan G Rennison
8f574881e8 Add direction func: DirToDiagDirAlongAxis 2018-07-08 23:00:29 +01:00
translators
8bbf06e0d4 Update: Translations from eints 
belarusian: 7 changes by KorneySan
russian: 7 changes by Lone_Wolf
 2018-07-08 19:45:37 +02:00
translators
5a11c6a036 Update: Translations from eints 
russian: 6 changes by Lone_Wolf
 2018-07-07 19:45:37 +02:00
Ingo von Borstel
88b77a7883 Fix #6844: Compile warning when compiling dedicated server (#6849) 2018-07-07 18:48:17 +02:00
translators
2ed0e30a8f Update: Translations from eints 
malay: 37 changes by eidan_shafie
 2018-07-05 19:45:41 +02:00
Jonathan G Rennison
2419974f19 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-07-05 01:13:52 +01:00
Jonathan G Rennison
806dbc9e58 Update baseset text strings 2018-07-05 01:11:57 +01:00
translators
f86dc6867e Update: Translations from eints 
serbian: 37 changes by Srbija
 2018-07-04 19:45:39 +02:00
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