Commit Graph

22882 Commits

Author SHA1 Message Date
Jonathan G Rennison
6b107d65d9 Merge branch 'tracerestrict' into tracerestrict-sx 2019-04-28 11:09:25 +01:00
Jonathan G Rennison
0d2277211c Fix enum type mismatch in TestOrderCondition 2019-04-28 11:09:05 +01:00
Jonathan G Rennison
cae0b21534 Trace restrict: Bump size of item type field
Reserve value for TRIT_REVERSE
2018-12-05 20:14:21 +00:00
Jonathan G Rennison
bd6f7b29fc Fix incorrect description of TraceRestrictPathfinderPenaltyAuxField enum 2018-12-05 20:08:48 +00:00
Jonathan G Rennison
7877b40699 Fix missing switch-case break in tracerestrict GUI
Fixes #66
2018-08-28 07:26:15 +01:00
Jonathan G Rennison
60cc1a48ac Refresh trace restrict slots window as with the train list window 2018-08-15 19:38:56 +01:00
keldorkatarn
acdeaa715e Tracerestrict slots: Fix a crash bug when selling a train that's in a tracerestrict slot. Again a use of an invalid iterator. We need to check FIRST if range.first and reange.second are equal. After erasing the range those iterators are invalid.
(cherry picked from commit 7aea2ced3ced5ec4201fbad9c206451aad057718)
2018-08-15 19:22:18 +01:00
Jonathan G Rennison
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +01:00
Jonathan G Rennison
1b4db7d86c Trace restrict: Add wait at entrance PBS for reservation ending here 2018-06-17 18:55:33 +01:00
Jonathan G Rennison
751f379cdd Trace restrict: Fix wrong position of safeguards header include 2018-06-17 18:54:16 +01:00
keldorkatarn
f10840438e TraceRestrictSlots: Fix highlighting behavior. Marking group ALL_SLOTS didn't reset the selected slot and dragging from ALL to ALL threw an unnecessary error.
(cherry picked from commit c76b560134bd8d9869ead872f7a434e61a5c5a48)

Fixes: #38
2018-04-17 16:34:19 +01:00
keldorkatarn
2f3e4044b7 FIX: TraceRestrictSlots: Fix crash when removing vehicle from slot. Invalid iterator got used. (it was no longer valid after calling erase with it)
(cherry picked from commit 3571f1bc898b9ffd8b124040882caa5357085f42)

Fixes: #37
2018-04-17 16:34:03 +01:00
Jonathan G Rennison
6c631c6679 Merge branch 'tracerestrict' into tracerestrict-sx 2018-03-03 18:08:13 +00:00
Jonathan G Rennison
a9596b45aa Fix incorrect tile and trackdir in reserve through program execution 2018-03-03 18:07:57 +00: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
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
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
translators
34cd504d65 (svn r27892) -Update from Eints:
finnish: 41 changes by USephiroth
2017-07-28 17:45:36 +00:00
translators
bf3fd277c1 (svn r27891) -Update from Eints:
spanish: 29 changes by SilverSurferZzZ
2017-07-25 17:45:37 +00: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
frosch
2f7ac7c41f (svn r27886) -Fix [FS#6575-ish]: Do not modify argv[0]. 2017-06-22 17:29:53 +00:00
frosch
dd3d824894 (svn r27885) -Cleanup (r27844): ESR_MAX_COST_EXCEEDED and ESR_PATH_TOO_LONG meant the same thing, but only one was used. Keep PATH_TOO_LONG since it has the better documentation. 2017-06-22 16:57:06 +00:00
frosch
5e7a50c8eb (svn r27884) -Fix: Console command parser failed when the command had many parameters, and also did not print any error messages about it. 2017-06-22 16:32:50 +00:00
frosch
968f1151d1 (svn r27883) -Fix [FS#6576]: Console command parser passed invalid strings to the debug output, if command lines had many parameters. 2017-06-22 16:31:04 +00:00
Jonathan G Rennison
b004c1998f Merge branch 'tracerestrict' into tracerestrict-sx 2017-06-20 19:19:21 +01:00
Jonathan G Rennison
7986367c1f Tracerestrict: Add program append management action. 2017-06-20 19:18:39 +01:00
translators
cfb75beef6 (svn r27882) -Update from Eints:
greek: 7 changes by kyrm
2017-06-19 17:45:37 +00:00
translators
3319616117 (svn r27879) -Update from Eints:
polish: 19 changes by lion
2017-06-11 17:45:38 +00:00
translators
eb294906ba (svn r27878) -Update from Eints:
vietnamese: 7 changes by nglekhoi
2017-06-10 17:45:37 +00:00
translators
16f74c6a2f (svn r27877) -Update from Eints:
turkish: 28 changes by wakeup
2017-06-08 17:45:37 +00:00
Jonathan G Rennison
843343fcf1 Merge branch 'master' into save_ext 2017-06-06 18:40:04 +01:00
translators
b153db2568 (svn r27876) -Update from Eints:
swedish: 3 changes by Joel_A
2017-05-27 17:45:39 +00:00
translators
063c8509b7 (svn r27875) -Update from Eints:
chinese (simplified): 7 changes by chenwt0315
2017-05-23 17:45:37 +00:00
translators
cc650ca82b (svn r27874) -Update from Eints:
luxembourgish: 6 changes by Phreeze
2017-05-16 17:45:37 +00:00
translators
8b1bf56b29 (svn r27873) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-05-15 17:45:36 +00:00
translators
8ab8a8f9b4 (svn r27872) -Update from Eints:
swedish: 19 changes by Joel_A
2017-05-13 17:45:37 +00:00
translators
092ede70fd (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
2017-05-11 17:45:37 +00:00
translators
4b7a30c44e (svn r27870) -Update from Eints:
hungarian: 38 changes by Brumi
2017-05-09 17:45:37 +00:00
translators
5d80417591 (svn r27869) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
2017-05-08 17:45:36 +00:00
translators
497aca8175 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-05-05 17:45:38 +00:00
translators
49ca5b0192 (svn r27861) -Update from Eints:
swedish: 49 changes by Joel_A
2017-04-29 17:45:37 +00:00
translators
9b4f7a6d4b (svn r27860) -Update from Eints:
scottish gaelic: 4 changes by GunChleoc
2017-04-28 17:45:37 +00:00
peter1138
5932c84011 (svn r27859) -Revert (r27858): Committed too much :( 2017-04-23 09:20:53 +00:00
peter1138
e9e44105eb (svn r27858) -Change [FS#6560]: Add missing game script event for ships arriving at a station. (juanjo) 2017-04-23 09:19:32 +00:00
translators
24406b44c3 (svn r27857) -Update from Eints:
galician: 27 changes by permudo
2017-04-21 17:45:36 +00:00