dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,871 Commits 1 Branch 0 Tags
27e0937eefb43b8d015801f67b61d02b31ef8771
Commit Graph

22871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
3af9438fb5 (svn r27415) -Update from WebTranslator v3.0: 
spanish - 6 changes by SilverSurferZzZ
 2015-10-28 17:45:08 +00:00
translators
2d684b8e76 (svn r27414) -Update from WebTranslator v3.0: 
spanish - 11 changes by SilverSurferZzZ
 2015-10-27 17:45:08 +00:00
translators
3c269df00d (svn r27413) -Update from WebTranslator v3.0: 
spanish - 12 changes by SilverSurferZzZ
 2015-10-26 17:45:10 +00:00
Jonathan G Rennison
b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
 2015-10-25 21:50:14 +00:00
Jonathan G Rennison
60a677692e Merge branch 'order_occupancy-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
 2015-10-25 21:47:07 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting. 
Move auto TT by default setting to PLYX chunk.
 2015-10-25 21:41:25 +00:00
Jonathan G Rennison
a380573c32 Merge branch 'save_ext' into auto_timetables-sx 2015-10-25 21:41:20 +00:00
Jonathan G Rennison
6d263226d8 Move order occupancy smoothness to company settings. 2015-10-25 21:37:27 +00:00
Jonathan G Rennison
8001d86350 Merge branch 'save_ext' into order_occupancy-sx 2015-10-25 21:36:21 +00:00
Jonathan G Rennison
e606a847c6 Add an un-ordered chunk for extra company settings: PLYX. 
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
 2015-10-25 21:35:40 +00:00
Heiko August
da2a263c5f Merge branch 'jgrpp' into translate-de 2015-10-25 19:28:38 +01:00
Heiko August
6d21d46969 Merge remote-tracking branch 'upstream/jgrpp' into jgrpp 2015-10-25 19:25:02 +01:00
Heiko August
fab9331a82 translate-de: add translation for additional infos in the group window 2015-10-25 19:21:31 +01:00
translators
e156f43848 (svn r27412) -Update from WebTranslator v3.0: 
vietnamese - 16 changes by myquartz
 2015-10-25 17:45:10 +00:00
Heiko August
17a25b08ad translate-de: add translations for train length and vehicle group in the detais window 2015-10-25 18:06:38 +01:00
Heiko August
3c3a139e22 translate-de: add translation of the zoning toolbar 2015-10-25 16:36:47 +01:00
Heiko August
0bb71475a2 translate-de: add missing non breaking space 2015-10-25 15:40:47 +01:00
translators
6155d6a3e0 (svn r27411) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-10-24 17:45:11 +00:00
Jonathan G Rennison
5dd3306850 Merge branch 'departure-boards-sx' into jgrpp 2015-10-21 18:51:19 +01:00
Jonathan G Rennison
e5e669d8f9 Merge branch 'departure-boards' into departure-boards-sx 2015-10-21 18:50:58 +01:00
Jonathan G Rennison
e3ca9524f5 Fix timetable rounding depending on the client time display mode setting. 
This causes desyncs if clients and the server have different values
for this client setting.
 2015-10-21 18:48:12 +01:00
Jonathan G Rennison
d0960f2a40 Version: Committing version data for tag: jgrpp-0.6.0 2015-10-17 10:46:09 +01:00
Jonathan G Rennison
3d40ca2db9 Merge branch 'master' into jgrpp 2015-10-17 10:42:10 +01:00
Jonathan G Rennison
c833b9334b Check and commit changelog in version_utils.sh when creating release tag. 2015-10-17 10:42:06 +01:00
Jonathan G Rennison
95bf67878e Add a changelog file, reference from the readme. 2015-10-16 20:28:51 +01:00
Jonathan G Rennison
bbe4ea7f50 Log truncated revision strings at debug level 1 instead of 0. 2015-10-16 19:31:40 +01:00
Jonathan G Rennison
ffe17bc986 Fix false positive in FindNearestSafeTile desync check when path not reservable. 2015-10-16 19:23:40 +01:00
Jonathan G Rennison
6eebd31e5d Save YAPF state dumps to new files on Unix platforms. 2015-10-16 19:16:57 +01:00
Jonathan G Rennison
defd5dcc50 Add debug category "yapfdesync" to enable desync checks for YAPF only. 2015-10-16 19:16:34 +01:00
translators
67da640e97 (svn r27410) -Update from WebTranslator v3.0: 
indonesian - 24 changes by UseYourIllusion
 2015-10-15 17:45:09 +00:00
Jonathan G Rennison
09227ef450 Fix CFollowTrackT::Follow returning EC_NO_WAY instead of EC_RAIL_TYPE. 
This can result in YAPF desyncs as this then ends up in the cache as a
ESRB_DEAD_END instead of a ESRB_RAIL_TYPE, which is problematic
when some vehicles can use the rail type but some cannot.
 2015-10-15 02:08:27 +01:00
Jonathan G Rennison
ee87b1d7d3 Pause on savegame load if ctrl key is pressed. 2015-10-15 00:45:22 +01:00
Jonathan G Rennison
34ce418b63 Zoning: Add mode to show restricted signals. 2015-10-15 00:23:46 +01:00
translators
0608ab5f81 (svn r27409) -Update from WebTranslator v3.0: 
indonesian - 20 changes by UseYourIllusion
 2015-10-13 17:45:08 +00:00
Jonathan G Rennison
a1b60bcc85 Fix build and refit cost estimation with artic/multihead vehicles. 
Trailing vehicle part refit costs were not being added to the cost
estimate.
 2015-10-12 20:06:59 +01:00
translators
e9a338f9ef (svn r27408) -Update from WebTranslator v3.0: 
simplified_chinese - 9 changes by xiangyigao
 2015-10-09 17:45:08 +00:00
translators
440af97436 (svn r27407) -Update from WebTranslator v3.0: 
simplified_chinese - 6 changes by xiangyigao
 2015-10-05 17:45:09 +00:00
Jonathan G Rennison
f170bc91e1 Version: Committing version data for tag: jgrpp-0.5.3 2015-10-03 14:35:06 +01:00
Jonathan G Rennison
6c5b86bd21 Merge branch 'progsig-sx' into jgrpp 2015-10-03 14:34:01 +01:00
Jonathan G Rennison
8760187899 progsig: Show target coordinates in signal state conditional. 2015-10-03 14:31:51 +01:00
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