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

34674 Commits

Author SHA1 Message Date
Jonathan G Rennison
a93cc441a9 Merge branch 'cpp-11' into jgrpp 2017-10-05 18:20:54 +01:00
Jonathan G Rennison
2b38268e2f Add printf format codes for 64-bit unsigned integers 2017-10-05 18:20:29 +01:00
Jonathan G Rennison
6f5dc695fa Add templated versions of CeilDiv and Ceil maths functions 2017-10-05 18:16:44 +01:00
Jonathan G Rennison
124d9a753e Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-10-05 18:16:37 +01:00
Jonathan G Rennison
39701cf5df Merge branch 'master' into cpp-11 2017-10-05 18:15:32 +01:00
translators
4cfccc7e85 (svn r27924) -Update from Eints: 
hebrew: 5 changes by Metheny
 2017-10-04 17:45:38 +00:00
translators
0502a9c332 (svn r27924) -Update from Eints: 
hebrew: 5 changes by Metheny
 2017-10-04 17:45:38 +00:00
Jonathan G Rennison
f03de4bcc1 Fix not being allowed to build docks, ship depots, when removing water is disabled 2017-10-03 21:43:15 +01:00
translators
539f6f50f7 (svn r27923) -Update from Eints: 
polish: 15 changes by McZapkie
 2017-10-01 17:45:39 +00:00
translators
278400042d (svn r27923) -Update from Eints: 
polish: 15 changes by McZapkie
 2017-10-01 17:45:39 +00:00
Jonathan G Rennison
3d629b0dea Fix timetabled full-load order warning being shown for non station orders 2017-10-01 16:41:36 +01:00
translators
6cf47d2280 (svn r27922) -Update from Eints: 
polish: 12 changes by McZapkie
 2017-09-28 17:45:40 +00:00
translators
ac5074fb53 (svn r27922) -Update from Eints: 
polish: 12 changes by McZapkie
 2017-09-28 17:45:40 +00:00
translators
83c2158e7c (svn r27921) -Update from Eints: 
polish: 22 changes by McZapkie
 2017-09-27 17:45:38 +00:00
translators
3c1e6d5a88 (svn r27921) -Update from Eints: 
polish: 22 changes by McZapkie
 2017-09-27 17:45:38 +00:00
frosch
24a1b82840 (svn r27916) -Codechange: Enable usage of static_assert for MSVC 2017-09-24 13:35:27 +00:00
frosch
7bb2dedbd5 (svn r27916) -Codechange: Enable usage of static_assert for MSVC 2017-09-24 13:35:27 +00:00
Jonathan G Rennison
9559ad4946 Merge branch 'template_train_replacement' into jgrpp 2017-09-23 11:40:07 +01:00
Jonathan G Rennison
40c99956ed TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual 2017-09-23 11:39:59 +01:00
Jonathan G Rennison
51e018c9a4 Merge branch 'departure-boards' into jgrpp 2017-09-22 22:24:57 +01:00
Jonathan G Rennison
07ca7cfb8c Add show passenger and show freight buttons to departure window 2017-09-22 22:24:44 +01:00
Jonathan G Rennison
a9ca7c1ead Fix crash when loading old savegames with buoys 2017-09-20 19:51:25 +01:00
Jonathan G Rennison
be37aad470 Update multiple docks to use savegame framework, fix merge conflicts 2017-09-20 19:50:53 +01:00
keldorkatarn
06abeb4570 Move dock creation code in afterload further up so it runs before the catchment area is created, since that code checks for the presence of the new docks. 
(cherry picked from commit 80cf10dc0788644ed844b313e5c73dc634f7b43a)

# Conflicts:
#	src/saveload/afterload.cpp
 2017-09-20 19:19:27 +01:00
keldorkatarn
e3b33b45c9 Simplify direction lookup to also work for oil rigs. 
(cherry picked from commit acbff5528b6aa5a01d17b814a44b6d884ee03f69)
 2017-09-20 19:12:19 +01:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station. 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
 2017-09-20 19:11:48 +01:00
adf88
be48b325fd (svn r27914) -Fix/Feature: 'unban' console command - fix invalid help text and be more verbose 2017-09-10 14:03:29 +00:00
adf88
56ffa35511 (svn r27914) -Fix/Feature: 'unban' console command - fix invalid help text and be more verbose 2017-09-10 14:03:29 +00:00
adf88
43f162c664 (svn r27913) -Fix: 'unban' console command was not handling IPv6 adresses properly 2017-09-10 14:02:13 +00:00
adf88
f3fbf6beb8 (svn r27913) -Fix: 'unban' console command was not handling IPv6 adresses properly 2017-09-10 14:02:13 +00:00
Jonathan G Rennison
414d5b2c8a Add warning/info messages to timetable GUI 2017-09-05 00:35:00 +01:00
Jonathan G Rennison
d6ebda485c Remove programmable signals from CTRL-click signal type cycling 2017-09-05 00:35:00 +01:00
Jonathan G Rennison
aa138baec9 Add UI setting for whether programmable signals shown in UI (default off) 
Add setting subcategory for advanced signal features
 2017-09-04 19:25:45 +01:00
Jonathan G Rennison
5199e19213 Move timetable interface settings to GUI subcategory 2017-09-04 19:02:24 +01:00
Jonathan G Rennison
93c5f9336a Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-09-04 18:58:46 +01:00
innocenat
1b3969a014 Fix scheduled dispatch for multiplayer 2017-09-04 10:40:37 +07:00
Jonathan G Rennison
6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 2017-09-04 01:24:10 +01:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
509e20406f Merge branch 'master' into cpp-11 2017-09-04 01:22:19 +01:00
Jonathan G Rennison
2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/smallmap_gui.cpp
 2017-09-04 01:04:04 +01:00
Jonathan G Rennison
19e62d089f Merge branch 'master' into save_ext 2017-09-04 00:57:48 +01:00
Jonathan G Rennison
2f85326a4a Increase crashlog length limits 2017-09-04 00:56:57 +01:00
michi_cc
6f98cde882 (svn r27912) -Fix (r13948): [NPF] Reserved track bits were not accounted for when trying to find any safe position. 2017-09-03 13:06:29 +00:00
michi_cc
016a68815d (svn r27912) -Fix (r13948): [NPF] Reserved track bits were not accounted for when trying to find any safe position. 2017-09-03 13:06:29 +00:00
translators
6d1effd3c9 (svn r27911) -Update from Eints: 
korean: 1 change by telk5093
hebrew: 4 changes by dnd_man
 2017-09-02 17:45:39 +00:00
translators
6d08d054ef (svn r27911) -Update from Eints: 
korean: 1 change by telk5093
hebrew: 4 changes by dnd_man
 2017-09-02 17:45:39 +00:00
translators
f1e54b4375 (svn r27910) -Update from Eints: 
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
 2017-09-01 17:45:42 +00:00
translators
6b46133a2a (svn r27910) -Update from Eints: 
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
 2017-09-01 17:45:42 +00:00
Jonathan G Rennison
add9be20a0 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-08-31 20:23:54 +01:00