dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,405 Commits 1 Branch 0 Tags
2e626d70e8a80f5db9cca48efd3daec3f9d28e1a
Commit Graph

51405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
1f5322de20 Version: Committing version data for tag: jgrpp-0.34.3 2020-05-14 22:22:39 +01:00
Jonathan G Rennison
47a55afe6d findversion.sh: Handle YEAR part of .ottdrev-vc 2020-05-14 22:22:21 +01:00
translators
9b8d5ea074 Update: Translations from eints 
spanish (mexican): 16 changes by Absay
russian: 3 changes by Lone_Wolf
 2020-05-14 19:45:40 +02:00
Jonathan G Rennison
212f6f4dcb Improve link refresher handling of conditional orders 2020-05-14 18:40:25 +01:00
Jonathan G Rennison
d37d08ebb3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-14 00:40:16 +01:00
Jonathan G Rennison
a94a8da990 Suppress warning about using operator ^ on bool 2020-05-13 20:23:10 +01:00
translators
83cd040c61 Update: Translations from eints 
latvian: 21 changes by Tranzistors
korean: 5 changes by telk5093
 2020-05-13 19:45:39 +02:00
Jonathan G Rennison
77673b731c Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/openttd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-13 11:17:09 +01:00
Jonathan G Rennison
e67669d6ed Add missing include to ini_type.h 2020-05-13 11:10:16 +01:00
dP
f2a9a1e2a5 Fix #8137: New clients can't join (desync) after funding an industry 2020-05-13 08:43:01 +01:00
dP
7bd52970a1 Codechange: Refactor FindStationsAroundTiles to avoid code duplication 2020-05-13 08:43:01 +01:00
Matthijs Kooijman
2d5869fc79 Fix: sdl2-config would always be detected as present 
The presence of sdl2-config is used go determine whether to look for
sdl2 first, or just sdl1. However, when sdl2-config is *not* present,
`which` returns an empty string. Due to lack of quoting, this produces
`[ -x ]`, rather than `[ -x "" ]` and it turns out the former actually
has a succesful exit status for some reason.

This was not a problem when just running configure, because it would
then just fail to detect sdl2 and fall back to sdl1. However, when
passing `--with-sdl` (without specifying a version), this would only
attempt to detect sdl2, even when sdl2-config was not present, but sdl1
is.

Adding quotes makes the check work as intended.
 2020-05-13 08:33:34 +01:00
translators
6dcc99edab Update: Translations from eints 
latvian: 45 changes by Tranzistors
spanish (mexican): 9 changes by Absay
 2020-05-12 19:45:38 +02:00
glx22
cca613e3b8 Fix #8142, 5aa6351: Buoy owner and tile owner can be different (#8143) 2020-05-12 15:22:58 +02:00
glx22
d15c7dbdeb Add: stations_near and industries_near cache check (#8139) 2020-05-12 01:19:52 +02:00
translators
48c61c1da1 Update: Translations from eints 
latvian: 54 changes by Tranzistors
spanish (mexican): 4 changes by Absay
 2020-05-11 19:45:38 +02:00
Ilayaraja
48d2eb703c Add: INR currency (#8136) 
Co-authored-by: ilayarja97 <ilayarja97@gmail.com>
 2020-05-11 14:31:03 +01:00
Jonathan G Rennison
763a2826b6 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gamelog.cpp
 2020-05-11 00:45:24 +01:00
Jonathan G Rennison
0202211514 Conditional orders: Add slot acquire modes to train in slot conditional 2020-05-10 21:06:09 +01:00
glx
39092ee13b Fix #8119: Update docking area when clearing a shore rail tile 2020-05-10 20:10:12 +01:00
Charles Pigott
d6a995fc2e Add: [AzurePipelines] Ubuntu Focal (20.04) 64bit build for releases 2020-05-10 20:03:57 +01:00
glx
5aa6351042 Fix #8132: Corrupted savegame crashing OpenTTD on load 2020-05-10 20:03:41 +01:00
glx
0ed00ae111 Fix: Stop any gamelog action when recovering from SlError() 2020-05-10 20:02:55 +01:00
translators
3ba34a72aa Update: Translations from eints 
latvian: 80 changes by Tranzistors
spanish (mexican): 10 changes by Absay
 2020-05-10 19:45:39 +02:00
Jonathan G Rennison
0dd9562ead Continue waiting at rail waypoint if next order is a wait order for the same waypoint 2020-05-10 17:06:45 +01:00
Jonathan G Rennison
0100ea4e32 Conditional orders: Add mode to check waiting station cargo via next node 2020-05-10 15:32:12 +01:00
Jonathan G Rennison
1c768705a1 Use lower_bound instead of equal_range in StationCargoList::ShiftCargo 
Calling erase could potentially invalidate the upper_bound iterator
 2020-05-10 15:20:03 +01:00
Jonathan G Rennison
ea8a89e377 Reset conditional order comp operator when switching to load % or waiting cargo amount. 2020-05-10 12:15:37 +01:00
SamuXarick
a95fbd59a3 Fix #8119, f538179: Update docking tile area when placing a diagonal rail next to a dock end (#8124) 2020-05-09 22:27:06 +02:00
translators
61e1a45100 Update: Translations from eints 
latvian: 8 changes by Tranzistors
spanish (mexican): 1 change by Absay
 2020-05-09 19:45:37 +02:00
Niels Martin Hansen
2c84549db0 Fix: Two issues in MIDI file writer 
Variable-length values would write threshold values with a byte too many.
System Exclusive messages would cause write to fail since the end byte was treated as part of next message.
 2020-05-08 22:43:43 +02:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
Jonathan G Rennison
58c02030c2 Network: Avoid racy use of flags in TCPConnecter::CheckCallbacks 2020-05-07 20:53:50 +01:00
Jonathan G Rennison
ef7e658dee Network: Remove static buffer form of NetworkAddress::GetAddressAsString 
This is used in multiple threads concurrently
 2020-05-07 20:53:50 +01:00
Jonathan G Rennison
af09391bfb Use atomic load for _realtime_tick in _SetGeneratingWorldProgress 2020-05-07 20:53:50 +01:00
Jonathan G Rennison
a1d85b812b Network: Use unique_ptr for packets, use deque for packet queues 2020-05-07 20:53:50 +01:00
Jonathan G Rennison
caa27cfa39 Network: Fix locking issues around server map PacketWriter 2020-05-07 20:53:50 +01:00
translators
170f3f9b2b Update: Translations from eints 
latvian: 38 changes by Tranzistors
 2020-05-07 19:45:39 +02:00
glx22
82573a5e73 Fix #8117: Memory leak in admin port (#8122) 2020-05-07 02:00:53 +02:00
glx22
86e9326b7f Add: docking tiles cache check (#8120) 2020-05-07 01:14:22 +02:00
glx
bc8333723c Fix #8021: limit savegame range for docking tiles fixing 2020-05-06 23:12:59 +02:00
Yexo
64278fd598 Fix: reset roadtype/streetcartype info for non-road bridges 2020-05-06 22:10:08 +02:00
translators
364f6806c8 Update: Translations from eints 2020-05-06 19:45:39 +02:00
glx
f0747c8c51 Update: Lang files 2020-05-06 09:54:36 +01:00
glx
e0d20a44d2 Codechange: Use a dynamic copyright year 2020-05-06 09:54:36 +01:00
Jonathan G Rennison
197a4f2e3e fcitx: Use XLookupString instead of XLookupKeysym to fix modifier keys 
See: #142
 2020-05-05 23:05:50 +01:00
duck
e1c85e67a7 Fix #8102: Update Windows installer strings to reference newer Windows version (#8114) 
* Fix #8102: Update Windows installer strings to reference versions newer than 7

* Fix 2c53390: Version strings incorrectly capitalised
 2020-05-05 22:05:40 +02:00
Jonathan G Rennison
b11852a076 Fix insufficient YAPF cost added when reversing behind signal 
Fix 29520437, which was an insufficient fix

See: #150
 2020-05-05 00:12:46 +01:00
Yexo
19dc31e0b3 Fix #8108: always update tile_hash after updating v->tile 2020-05-04 23:26:50 +02:00
SamuXarick
8edbb42fe8 Fix c01a2e2: crash on loading old savegames with invalid animated tile information 2020-05-04 21:21:06 +02:00