dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,117 Commits 1 Branch 0 Tags
24a85d1c99c308b76cf3aad22b9aca6657bf1eb3
Commit Graph

16699 Commits

Author SHA1 Message Date
Jonathan G Rennison
0577d7cbf8 progsig: Fix test remove rail action clearing signal programs. 
This could be triggered by using shift, using the land info window, etc.
 2015-10-03 14:28:47 +01:00
Jonathan G Rennison
b2b9c0a070 Progsig: Fix various issues with removing program dependencies. 
Fix RemoveProgramDependencies using one parameter for both source
and target, and rename the parameters to something sensible.
Update program window when invalidating in RemoveProgramDependencies.
Make SignalStateCondition::IsSignalValid const and add CheckSignalValid
for non-const validaty checking.
 2015-10-03 14:15:58 +01:00
Jonathan G Rennison
1823deae7d Programmable signals: Fix whitespace issues. 2015-10-03 13:51:35 +01:00
Jonathan G Rennison
587ffc2cfa Merge branch 'extra_large_maps-sx' into jgrpp 2015-10-02 20:16:16 +01:00
Jonathan G Rennison
f695ae025c Fix terrain generator limiting height to 0 when both edges > 4k. 2015-10-02 20:15:59 +01:00
Jonathan G Rennison
b258321f18 Merge branch 'progsig-sx' into jgrpp 2015-10-02 19:02:59 +01:00
Jonathan G Rennison
bc8818d9ac Merge branch 'progsig-rebase' into progsig-sx 2015-10-02 19:01:57 +01:00
Jonathan G Rennison
b7373c3eb5 Check tile type in SignalStateCondition::IsSignalValid() 
This is to avoid triggering an assertion, particularly
when clearing the program state in InitializeGame(), as the map has
just been reset, or when deleting a signal referenced by a condition.
 2015-10-02 19:01:47 +01:00
Jonathan G Rennison
3089068e1a Merge branch 'progsig-sx' into jgrpp 2015-10-01 20:58:34 +01:00
Jonathan G Rennison
17b6713362 Merge branch 'progsig-rebase' into progsig-sx 2015-10-01 20:57:22 +01:00
Jonathan G Rennison
41a818cb7d Merge branch 'master' into progsig-rebase 2015-10-01 20:57:10 +01:00
Jonathan G Rennison
ad4f4525f3 Fix programmable signal programs not being cleared in InitializeGame. 
This could leave dangling signal programs in subsequent games
which can cause crashes during saving.
 2015-10-01 20:56:38 +01:00
frosch
0d4b84f06b (svn r27406) -Doc: Use same start/end tile convention in CmdPlantTree as in other TileArea commands. (HackaLittleBit) 2015-09-30 17:28:58 +00:00
Jonathan G Rennison
d715b7eb07 Merge branch 'improved_breakdowns-sx' into jgrpp 2015-09-27 23:18:40 +01:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
cc79a4d0f8 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2015-09-27 23:17:58 +01:00
Jonathan G Rennison
eed722c777 Improved breakdowns: Remove non-deterministic changes to breakdown_chance. 
These cause desyncs in multiplayer.
 2015-09-27 23:16:43 +01:00
Jonathan G Rennison
26d0eb041d Increase thoroughness of vehicle and YAPF cache desync debug checks. 2015-09-27 23:16:12 +01:00
Jonathan G Rennison
60d15aa755 Log desync debug output to the console as well as the file. 
Be fault tolerant if the desync and/or random file cannot be created,
and write to the console.
 2015-09-27 23:15:56 +01:00
Jonathan G Rennison
cce270d780 Merge branch 'day_length' into day_length-sx 2015-09-27 23:12:23 +01:00
Jonathan G Rennison
f03cd98d04 Check/print tick skip counter in desync and random logging. 2015-09-27 23:12:00 +01:00
translators
0df4b5142c (svn r27405) -Update from WebTranslator v3.0: 
latin - 2 changes by Supercheese
vietnamese - 18 changes by nglekhoi
 2015-09-27 17:45:15 +00:00
translators
334b2319ef (svn r27404) -Update from WebTranslator v3.0: 
arabic_egypt - 64 changes by abdumzn
 2015-09-26 17:45:17 +00:00
translators
12b35b301c (svn r27403) -Update from WebTranslator v3.0: 
polish - 7 changes by McZapkie
 2015-09-22 17:45:10 +00:00
Jonathan G Rennison
531956bb4d Merge branch 'house_placing' into jgrpp 2015-09-21 22:17:37 +01:00
Jonathan G Rennison
7bd91f172b Change house GUI picker logic to be more like object GUI window. 
Deselect house on object placement abort.
Set object placement on init or house selection.
Adjust display to still work even if no house selected,
by continuing to show the previous selection.
 2015-09-21 22:16:47 +01:00
Jonathan G Rennison
0007e6fda2 Merge branch 'master' into house_placing 
Conflicts:
	src/terraform_gui.cpp
 2015-09-21 19:39:10 +01:00
Jonathan G Rennison
2a4f196d34 Merge branch 'everest_treeline-sx' into jgrpp 2015-09-21 19:03:58 +01:00
patch-import
1796957258 Everest patch: Fix plant random trees planting cacti above the snowline. 
Fix from HackaLittleBit
http://www.tt-forums.net/viewtopic.php?p=1156793#p1156793
 2015-09-21 19:02:36 +01:00
translators
0d0b15875f (svn r27402) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-09-21 17:45:08 +00:00
Jonathan G Rennison
c5de99c6b3 Fix off by one error in documentation comment for GetRandomTreeType. 2015-09-21 18:24:45 +01:00
translators
67b605337f (svn r27401) -Update from WebTranslator v3.0: 
frisian - 2 changes by BAJansen
norwegian_bokmal - 8 changes by hafting
welsh - 4 changes by kazzie
 2015-09-19 17:45:17 +00:00
rubidium
e8788019fa (svn r27400) -Fix [FS#6368] (r26449): when a dedicated server was paused with no clients the tick length was increased significantly, making any assumptions about the tick length used further down in the code are not true anymore. One of such assumptions was that one should readvertise every 15 minutes worth of original ticks, but due to the lengthening this timeframe would be more like 45-60 minutes. Now we'll take the operating system's millisecond counter instead 2015-09-19 16:49:46 +00:00
Jonathan G Rennison
d453c478e6 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-09-18 22:13:29 +01:00
Jonathan G Rennison
0f715f0a05 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-09-18 22:13:14 +01:00
Jonathan G Rennison
6e3b3c04de Enhanced viewports: Fix bug in previous fix for aqueducts in viewport map mode. 
Tile type tests were being performed on the wrong tile index.
This fixes commit 5540374227.
 2015-09-18 22:12:58 +01:00
Jonathan G Rennison
f312301276 Merge branch 'extra_large_maps-sx' into jgrpp 2015-09-18 21:58:29 +01:00
Jonathan G Rennison
736bfcf7eb Fix RV pathfinder performance regression caused by map size increase. 
The YAPF road vehicle pathfinder previously limited the path length
to the map size (previously 2048).
The extra large maps path increases this to 1M, nearly 3 orders of
magnitude, and this can result in a major performance penalty due
to excessively long pathfinder paths.
Instead limit the RV pathfinder length to a hard-coded 2048.
 2015-09-18 21:58:16 +01:00
translators
65f8b1c95e (svn r27398) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by xiangyigao
 2015-09-15 17:45:08 +00:00
alberth
65db59da81 (svn r27397) -Fix(r27346)[FS#6370]: Fix object editing crash in scenario editor (based on work by adf88) 2015-09-13 12:04:47 +00:00
Jonathan G Rennison
2f077f0c42 Use a single action for build & refit, to make it MP safe. 
Pass the cargo ID through the text field (in binary mode).
 2015-09-12 23:35:32 +01:00
Jonathan G Rennison
40b7d6d335 Import, rebase and make changes to build and refit patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=35805
 2015-09-12 22:05:00 +01:00
Jonathan G Rennison
ecc0442a8b Merge branch 'crashlog_improvements' into jgrpp 2015-09-12 20:36:58 +01:00
Jonathan G Rennison
1ee1c6201a Fix compilation on 32 bit windows due to type mismatches. 2015-09-12 20:36:20 +01:00
Jonathan G Rennison
58dbc8fbd6 Scale link graph timeout and compression intervals by day length. 2015-09-12 18:51:15 +01:00
translators
a5355ec6c4 (svn r27396) -Update from WebTranslator v3.0: 
latin - 17 changes by Supercheese
 2015-09-12 17:45:16 +00:00
Jonathan G Rennison
361b8b4540 Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-09-12 14:19:26 +01:00
Jonathan G Rennison
421b9034e2 Add an extended version feature for map sizes > 8kx8k. 
This is to prevent earlier versions from trying to load the savegame
and aborting.
 2015-09-12 14:17:37 +01:00
Jonathan G Rennison
72dadf7c6b Merge branch 'save_ext' into extra_large_maps-sx 2015-09-12 14:15:47 +01:00
Jonathan G Rennison
d6395b97a7 Enable extended feature versions for saving to be set at run time. 2015-09-12 14:15:32 +01:00