Commit Graph

24066 Commits

Author SHA1 Message Date
Jonathan G Rennison
ac016eae5e Add client setting to enable shared order group window for single vehicles 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
2a3f59dc8a Refresh screen when changing day length 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
2e7380bc72 Add scope info logging to tile loop 2017-08-16 18:30:06 +01:00
Jonathan G Rennison
473fbe6cd5 Merge branch 'tracerestrict-sx' into jgrpp 2017-08-15 19:28:44 +01:00
Jonathan G Rennison
ba33754993 Merge branch 'save_ext' into tracerestrict-sx
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/vehicle.cpp
2017-08-15 19:17:12 +01:00
Jonathan G Rennison
258e591f71 Merge branch 'cpp-11' into save_ext 2017-08-15 18:44:36 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
2017-08-15 18:44:17 +01:00
Jonathan G Rennison
1d1718c226 Merge branch 'tracerestrict-sx' into jgrpp 2017-08-13 22:55:33 +01:00
Jonathan G Rennison
58a860c087 Fix selected item in dropdown for conditional to test slot occupancy state 2017-08-13 22:55:21 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
acea2e83fe Merge branch 'crashlog_improvements' into jgrpp 2017-08-12 00:58:03 +01:00
Jonathan G Rennison
fd9a2e680c Fix using crash abort reason string as printf format string 2017-08-12 00:57:54 +01:00
Jonathan G Rennison
43f847cebb Merge remote-tracking branch 'auge8472/lang-de' into jgrpp
Fix a STRING/STRING2 mixup
2017-08-12 00:48:52 +01:00
Heiko August
fcd08d0daa translation for safer level crossings 2017-08-11 23:22:32 +02:00
Heiko August
18f104e644 translation for custom street bridge heads 2017-08-11 23:18:09 +02:00
Heiko August
550e393f86 translation for several viewport map settings 2017-08-11 23:09:40 +02:00
Heiko August
dd4fe36bf8 next part of translation for more conditional orders(comparators) 2017-08-11 23:08:37 +02:00
Heiko August
a61d6ae95e translation for adjusted placement of arctic trees 2017-08-11 23:07:17 +02:00
Heiko August
28cd475ccd translation for removing sea and river tiles ingame 2017-08-11 23:05:27 +02:00
Heiko August
c5d233904e partial translation for more conditional orders (orders) 2017-08-11 22:36:22 +02:00
Heiko August
65726ff9a1 translation for increase of station catchment area 2017-08-11 22:35:26 +02:00
Jonathan G Rennison
31e343b4ff Merge remote-tracking branch 'auge8472/lang-de' into jgrpp 2017-08-11 20:05:48 +01:00
Jonathan G Rennison
724d19f47d Sound: Add checks for incorrect sample rate, channel num and rate
Log a message instead of asserting
2017-08-11 19:53:24 +01:00
Jonathan G Rennison
10766f116c Debug logging: add sound category 2017-08-11 19:52:21 +01:00
Jonathan G Rennison
835c172edf Fix wrong type of whitespace in Korean translation 2017-08-11 19:42:52 +01:00
Heiko August
6c5ef1ea38 translation for map mode 2017-08-10 23:21:58 +02:00
Heiko August
7567e8fcf5 translation for random road reconstruction 2017-08-10 22:43:08 +02:00
Heiko August
05337d067b translation for towns building street bridges over rails 2017-08-10 22:32:03 +02:00
Heiko August
50f2095b50 translation for minimal distance between towns 2017-08-10 22:31:06 +02:00
Charles Pigott
f5931e1782 Fix: Broken assert.
Patch applied from https://gist.github.com/LordAro/421dacee7b6911628849beaabc209f0c#file-0004-fix-broken-assert-patch
2017-08-10 12:37:31 +01:00
Jonathan G Rennison
fa89013bc8 Merge pull request #22 from kiwitreekor/jgrpp
Add Korean Translations
2017-08-03 21:23:04 +01:00
kiwitreekor
181988e1fd Add Korean Translations
Translated STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL / STR_CONFIG_SETTING_TOWN_ROAD_OVER_RAIL_HELPTEXT
2017-08-02 13:17:01 +09:00
kiwitreekor
c2148890c9 Merge and squash pull request #21
Fix whitespace issues
2017-08-01 18:41:31 +01:00
Jonathan G Rennison
9ed0541e77 Import town bridges over rails patch
Add setting (default off)

From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
2017-07-31 18:40:44 +01:00
Jonathan G Rennison
4db69283c1 Add setting to disable removing sea/rivers 2017-07-30 14:27:42 +01:00
translators
34cd504d65 (svn r27892) -Update from Eints:
finnish: 41 changes by USephiroth
2017-07-28 17:45:36 +00:00
Jonathan G Rennison
24eeb512ef Version: Committing version data for tag: jgrpp-0.20.1 2017-07-27 20:42:10 +01:00
Jonathan G Rennison
52dadc9252 Merge branch 'master' into jgrpp 2017-07-27 18:41:43 +01:00
Jonathan G Rennison
103cabb178 Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-07-26 00:31:33 +01:00
translators
bf3fd277c1 (svn r27891) -Update from Eints:
spanish: 29 changes by SilverSurferZzZ
2017-07-25 17:45:37 +00:00
innocenat
c2a8d0fc81 Schdispatch: Fix crash when cloning vehicle with empty order 2017-07-25 22:29:36 +07:00
Jonathan G Rennison
b76d594654 Merge branch 'adjacent_crossings' into jgrpp
# Conflicts:
#	src/road_func.h
2017-07-20 01:07:52 +01:00
Jonathan G Rennison
3e85e9fc53 Fix MaybeBarCrossingWithSound setting crossing reservation
Improve efficiency of adjacent crossings checks
2017-07-20 01:07:02 +01:00
translators
de2ef2b543 (svn r27890) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-07-13 17:45:38 +00:00
frosch
b8456196ef (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +00:00
frosch
f1f07b55f4 (svn r27888) -Fix: Member access coding style (adf88) 2017-07-11 19:34:41 +00:00
frosch
1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 2017-07-11 19:34:21 +00:00
Jonathan G Rennison
f030318bb4 Merge branch 'improved_breakdowns' into jgrpp 2017-07-06 21:44:28 +01:00