Commit Graph

22621 Commits (d1192bb3f9eb932ccc0f40116de843de51af532c)
 

Author SHA1 Message Date
Jonathan G Rennison d1192bb3f9 Fix incorrect merge-conflict resolution of previous commit. 9 years ago
Jonathan G Rennison 2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 79da755c45 Fix excessive amounts of vehicle smoke when reversing at waypoints. 9 years ago
Jonathan G Rennison 7bcd090a0f Add reverse at waypoint orders.
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
Jonathan G Rennison 78f8627c34 Add order waypoint flags. 9 years ago
Jonathan G Rennison adb4fd54b8 Merge branch 'master' into save_ext 9 years ago
translators 3af9438fb5 (svn r27415) -Update from WebTranslator v3.0:
spanish - 6 changes by SilverSurferZzZ
9 years ago
translators 2d684b8e76 (svn r27414) -Update from WebTranslator v3.0:
spanish - 11 changes by SilverSurferZzZ
9 years ago
translators 3c269df00d (svn r27413) -Update from WebTranslator v3.0:
spanish - 12 changes by SilverSurferZzZ
9 years ago
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
9 years ago
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
9 years ago
Jonathan G Rennison 26d32269a3 Make auto TT separation rate a company setting.
Move auto TT by default setting to PLYX chunk.
9 years ago
Jonathan G Rennison a380573c32 Merge branch 'save_ext' into auto_timetables-sx 9 years ago
Jonathan G Rennison 6d263226d8 Move order occupancy smoothness to company settings. 9 years ago
Jonathan G Rennison 8001d86350 Merge branch 'save_ext' into order_occupancy-sx 9 years ago
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.
9 years ago
translators e156f43848 (svn r27412) -Update from WebTranslator v3.0:
vietnamese - 16 changes by myquartz
9 years ago
translators 6155d6a3e0 (svn r27411) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
Jonathan G Rennison 5dd3306850 Merge branch 'departure-boards-sx' into jgrpp 9 years ago
Jonathan G Rennison e5e669d8f9 Merge branch 'departure-boards' into departure-boards-sx 9 years ago
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.
9 years ago
Jonathan G Rennison d0960f2a40 Version: Committing version data for tag: jgrpp-0.6.0 9 years ago
Jonathan G Rennison 3d40ca2db9 Merge branch 'master' into jgrpp 9 years ago
Jonathan G Rennison c833b9334b Check and commit changelog in version_utils.sh when creating release tag. 9 years ago
Jonathan G Rennison 95bf67878e Add a changelog file, reference from the readme. 9 years ago
Jonathan G Rennison bbe4ea7f50 Log truncated revision strings at debug level 1 instead of 0. 9 years ago
Jonathan G Rennison ffe17bc986 Fix false positive in FindNearestSafeTile desync check when path not reservable. 9 years ago
Jonathan G Rennison 6eebd31e5d Save YAPF state dumps to new files on Unix platforms. 9 years ago
Jonathan G Rennison defd5dcc50 Add debug category "yapfdesync" to enable desync checks for YAPF only. 9 years ago
translators 67da640e97 (svn r27410) -Update from WebTranslator v3.0:
indonesian - 24 changes by UseYourIllusion
9 years ago
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.
9 years ago
Jonathan G Rennison ee87b1d7d3 Pause on savegame load if ctrl key is pressed. 9 years ago
Jonathan G Rennison 34ce418b63 Zoning: Add mode to show restricted signals. 9 years ago
translators 0608ab5f81 (svn r27409) -Update from WebTranslator v3.0:
indonesian - 20 changes by UseYourIllusion
9 years ago
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.
9 years ago
translators e9a338f9ef (svn r27408) -Update from WebTranslator v3.0:
simplified_chinese - 9 changes by xiangyigao
9 years ago
translators 440af97436 (svn r27407) -Update from WebTranslator v3.0:
simplified_chinese - 6 changes by xiangyigao
9 years ago
Jonathan G Rennison f170bc91e1 Version: Committing version data for tag: jgrpp-0.5.3 9 years ago
Jonathan G Rennison 6c5b86bd21 Merge branch 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison 8760187899 progsig: Show target coordinates in signal state conditional. 9 years ago
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.
9 years ago
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.
9 years ago
Jonathan G Rennison 1823deae7d Programmable signals: Fix whitespace issues. 9 years ago
Jonathan G Rennison 587ffc2cfa Merge branch 'extra_large_maps-sx' into jgrpp 9 years ago
Jonathan G Rennison f695ae025c Fix terrain generator limiting height to 0 when both edges > 4k. 9 years ago
Jonathan G Rennison b258321f18 Merge branch 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison bc8818d9ac Merge branch 'progsig-rebase' into progsig-sx 9 years ago
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.
9 years ago
Jonathan G Rennison 3089068e1a Merge branch 'progsig-sx' into jgrpp 9 years ago
Jonathan G Rennison 17b6713362 Merge branch 'progsig-rebase' into progsig-sx 9 years ago