dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,669 Commits 1 Branch 0 Tags
290471c70f63cd46ee314e59dcbbcc142c292d16
Commit Graph

35138 Commits

Author SHA1 Message Date
Jonathan G Rennison
a983a94ee5 Update vehicle window depot/refit button states at build and when paused 2019-02-06 18:08:49 +00:00
Peter Nelson
e3b440c9c5 Add #5006: Flag to hide rail type from construction. 2019-02-06 07:40:55 +00:00
PeterN
4764d1c45e Doc #7181: AAT_STATION_AIRPLANE_LAND triggers only a single tile, not all airport tiles. (#7182) 2019-02-06 00:33:49 +01:00
translators
9fc430a920 Update: Translations from eints 
swedish: 21 changes by Joel_A
german: 1 change by smwforever45
 2019-02-05 19:45:42 +01:00
Jonathan G Rennison
b11f1a233f Fix type mismatch in _sl_version extern declaration 2019-02-05 18:03:28 +00:00
Peter Nelson
b1e40b6b56 Fix #7151: Hang when concurrently starting AIs in multiplayer, or with shift pressed. 2019-02-05 14:49:04 +01:00
Jonathan G Rennison
c59ecb01ad Fix loading of bridges from Spring 2013 Patchpack v2.1.147 and later 2019-02-04 22:26:02 +00:00
Peter Nelson
64878320cc Fix #6803: CargoMonitorID bit packing updated to handle 64 cargo types. 
This requires a saveload bump to change the bitpacking on loading older saves.
 2019-02-04 20:43:14 +00:00
Peter Nelson
0b10678050 Change: Make ships stop in locks to move up/down instead of following the slope. 2019-02-04 20:20:49 +00:00
glx
8e7fe3973f Add: CompanyCtrlAction enum for CMD_COMPANY_CTRL actions 2019-02-04 21:08:36 +01:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-02-04 18:24:38 +00:00
Jonathan G Rennison
09c62d6951 Merge branch 'master' into cpp-11 2019-02-04 18:09:36 +00:00
Peter Nelson
33e3f49161 Fix #7119: When rotating a ship, apply an additional offset to avoid movement glitch. 2019-02-04 00:19:48 +00:00
Peter Nelson
0749a291c4 Revert 479f13fc41, Fix #7133, Fix #7136: "Codechange: Tweak ViewportAddLandscape so it no more relies on "go down as fast as possible" tile height model (Patch by adf88, #6583)" 
This reverts commit 479f13fc41.
 2019-02-03 19:39:20 +00:00
translators
de5614a4d8 Update: Translations from eints 
german: 64 changes by smwforever45
 2019-02-03 19:45:41 +01:00
Niels Martin Hansen
5f8354f358 Change: Make a shortened network revision string for use in server queries 2019-02-03 18:00:16 +01:00
Niels Martin Hansen
c511b0e801 Change: Increase NETWORK_REVISION_LENGTH to 33 bytes 2019-02-03 18:00:16 +01:00
Niels Martin Hansen
cd757ecbf4 Change: Use git revision hash (with "modified" prefix) for gamelog 2019-02-03 18:00:16 +01:00
Niels Martin Hansen
faee0737e0 Codechange: Separate gamelog revision length from network revision length 2019-02-03 18:00:16 +01:00
Niels Martin Hansen
67c6f945fb Change: Include the full raw git revision hash in rev.cpp 2019-02-03 18:00:16 +01:00
Peter Nelson
cca952d94b Fix #7108: Group livery command did not check its parameters properly. 2019-02-03 15:52:19 +00:00
Jonathan G Rennison
7ae2aa93ea Allow trains to reverse in station when front is in a bridge/tunnel 2019-02-03 09:51:39 +00:00
Jonathan G Rennison
f64cb4048e Fix trains not reversing in station when front is on a diagonal rail piece 2019-02-03 09:34:32 +00:00
Jonathan G Rennison
47b8f9b286 Fix order list corruption when drag-moving towards end of list 
Fixes regression in 0bb9207f4d
 2019-02-02 23:30:05 +00:00
Peter Nelson
e21ade375e Codechange: Change from numeric to descriptive SLV enum labels for last entries. 2019-02-02 21:39:06 +00:00
Peter Nelson
0f37a683a2 Codechange: Additional type safety for saveload version variables. 2019-02-02 21:39:06 +00:00
Peter Nelson
9de12521ec Codechange: Convert saveload numbers to enum values. 
(This was mostly achieved with a few in-place regexes)
 2019-02-02 21:39:06 +00:00
Peter Nelson
ea4ea62816 Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared. 2019-02-02 21:39:06 +00:00
translators
bdf0dc67e9 Update: Translations from eints 
croatian: 4 changes by VoyagerOne
korean: 4 changes by telk5093
russian: 2 changes by Lone_Wolf
german: 4 changes by smwforever45, 4 changes by ShadowCop
spanish (mexican): 2 changes by Absay
portuguese: 52 changes by vesgo
finnish: 3 changes by hpiirai
dutch: 238 changes by JanWillem
estonian: 1 change by rm87
 2019-02-02 19:45:42 +01:00
Peter Nelson
9dc36057eb Fix #7058, Fix #7161: Network chat messages did not expire. 2019-02-02 16:58:04 +00:00
Peter Nelson
e8f1c446a6 Fix: DMU/EMU livery should apply to passenger carriages with DMU/EMU engines. 2019-02-02 16:57:47 +00:00
Peter Nelson
c9d801a98d Fix: Make livery window resize properly if GUI scale changes whilst open. 2019-02-02 16:57:47 +00:00
Samu
011257dc88 Change: Allow AI companies to start immediately. 
Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.
 2019-02-02 16:37:11 +00:00
Jonathan G Rennison
3099d6c2c6 Fix compilation on MinGW 
See: 255fa6e1a8
 2019-02-02 07:53:11 +00:00
Jonathan G Rennison
1dd8629227 Define socket constants on MinGW if missing 2019-02-02 07:42:53 +00:00
Jonathan G Rennison
3a77f75bf6 Add GUI setting to control savegame overwrite confirmation dialog 
Adjust game ID indications in save window UI
 2019-02-02 02:09:40 +00:00
Jonathan G Rennison
9d3b77c5a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
 2019-02-02 01:27:56 +00:00
Jonathan G Rennison
ec736d8b40 Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 (#7018)" 
This reverts commit e934f09f02.
 2019-02-02 01:03:23 +00:00
Jonathan G Rennison
b93c9c5148 Revert "Codechange: Tweak ViewportAddLandscape so it no more relies on "go down as fast as possible" tile height model (Patch by adf88, #6583)" 
This reverts commit 479f13fc41.

# Conflicts:
#	src/viewport.cpp

See: https://github.com/OpenTTD/OpenTTD/issues/7133
 2019-02-01 22:25:46 +00:00
Peter Nelson
fa53abe864 Doc: Yearly increment. 2019-02-01 22:12:07 +00:00
Niels Martin Hansen
0bca363401 Add: Warn before overwriting an existing save file 2019-02-01 21:49:36 +00:00
translators
5a5861f245 Update: Translations from eints 
french: 2 changes by glx
german: 23 changes by planetmaker
danish: 139 changes by nielsmh
spanish (mexican): 3 changes by Absay
portuguese: 55 changes by vesgo
dutch: 214 changes by JanWillem
estonian: 30 changes by rm87
 2019-02-01 19:45:44 +01:00
glx
8418e27403 Fix: close Textfile windows when closing Option window 2019-02-01 16:46:45 +01:00
Peter Nelson
0355f887d9 Fix #6438: Properly invalidate AI Settings window when max no competitor setting is changed. 2019-02-01 15:20:52 +00:00
Peter Nelson
9e9d485713 Fix 23960d0f2c: Scrollbar was broken for non-group liveries. 
Simplify how list position is determined by using existing functions.
Also rename livery_height -> rows and SetLiveryHeight() -> SetRows(), as height implies pixels.
 2019-02-01 13:25:42 +00:00
Peter Nelson
12b6fe47c7 Fix: Set MU flag on some default engines. 2019-02-01 07:08:55 +00:00
Peter Nelson
21dc725762 Fix: Don't consider engines not in the current climate towards used livery classes. 2019-02-01 07:08:55 +00:00
SamuXarick
1e5a6765d9 Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988) 2019-01-31 23:08:03 +00:00
J0an Josep
029c48cf4a Cleanup: [NPF] Remove unused parameter. 2019-01-31 22:15:56 +00:00