dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,793 Commits 1 Branch 0 Tags
0ac92b823681bb9dfb53f7371db63db8c323d76c
Commit Graph

46793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
frosch
bd68ed916d (svn r27915) -Fix (r27730) [FS#6620]: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf. 2017-09-11 18:31:32 +00:00
frosch
96b1ac9d09 (svn r27915) -Fix (r27730) [FS#6620]: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf. 2017-09-11 18:31:32 +00: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
d486d58d86 Version: Committing version data for tag: jgrpp-0.21.0 2017-09-05 18:11:50 +01: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
65f9adc11c Merge branch 'smallmap-screenshot' into jgrpp 2017-09-04 01:24:16 +01: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
b970fa693f Merge branch 'master' into smallmap-screenshot 2017-09-04 01:16:00 +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
Jonathan G Rennison
d3a1e8060d Fix vehicle draw flickering, particularly in viewport map mode 
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
 2017-08-31 20:23:32 +01:00
translators
eaf8d0ee07 (svn r27909) -Update from Eints: 
spanish (mexican): 4 changes by Absay
 2017-08-31 17:45:38 +00:00
translators
dc649f2738 (svn r27909) -Update from Eints: 
spanish (mexican): 4 changes by Absay
 2017-08-31 17:45:38 +00:00
adf88
13106675de (svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant 2017-08-31 06:55:38 +00:00
adf88
6dec889306 (svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant 2017-08-31 06:55:38 +00:00
adf88
7757f5050a (svn r27907) -Fix: AirportSpec::rotation was memleaking 2017-08-31 06:54:22 +00:00
adf88
b56453f93b (svn r27907) -Fix: AirportSpec::rotation was memleaking 2017-08-31 06:54:22 +00:00
adf88
0f8c868ea2 (svn r27906) -Cleanup: Remove some NPF code with no effect and mark possible bug about never used NPF_FLAG_IGNORE_RESERVED flag 2017-08-31 06:51:01 +00:00
adf88
1dd6930507 (svn r27906) -Cleanup: Remove some NPF code with no effect and mark possible bug about never used NPF_FLAG_IGNORE_RESERVED flag 2017-08-31 06:51:01 +00:00
adf88
322a053de7 (svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible 2017-08-31 06:48:55 +00:00
adf88
74e1fe130c (svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible 2017-08-31 06:48:55 +00:00
adf88
dbf7ed502a (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 2017-08-31 06:47:17 +00:00
adf88
88726f71b6 (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 2017-08-31 06:47:17 +00:00
translators
f1bf1f25bf (svn r27903) -Update from Eints: 
vietnamese: 37 changes by myquartz
 2017-08-30 17:45:39 +00:00
translators
13d0296e7c (svn r27903) -Update from Eints: 
vietnamese: 37 changes by myquartz
 2017-08-30 17:45:39 +00:00
Jonathan G Rennison
9212188191 Merge pull request #27 from kiwitreekor into jgrpp 2017-08-29 20:59:57 +01:00
adf88
b3d37c0032 (svn r27902) -Feature [FS#6614]: Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file (just like other variabes CFLAGS, LDFLAGS etc.) so they can be resused when OpenTTD re-configures itself 2017-08-27 16:07:24 +00:00