Commit Graph

23935 Commits

Author SHA1 Message Date
Jonathan G Rennison
9077d6f4d2 Add support for loading SpringPP v2.3, v2.4 savegames 2017-06-14 00:26:52 +01:00
Jonathan G Rennison
965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-06-08 23:27:33 +01:00
innocenat
0a6ddf31a2 Double-clicking order in timetable change wait time
This makes the process of setting up timetable manually easier.
2017-06-08 13:10:54 +07:00
innocenat
c4c891a6c1 Proper handling of invalid text input in scheduled dispatch 2017-06-08 13:09:17 +07:00
Jonathan G Rennison
d68b2809a3 Merge branch 'departure-boards' into jgrpp 2017-06-07 21:13:24 +01:00
Jonathan G Rennison
7d5f277a96 Fix not being able to enter 00:00 as a timetable start time. 2017-06-07 21:13:15 +01:00
Jonathan G Rennison
95e8bc67cc Merge branch 'chunnel' into jgrpp 2017-06-07 21:00:00 +01:00
HackaLittleBit
60345d2e18 Fix cost of building tunnels. 2017-06-07 19:56:20 +01:00
innocenat
02b53a2f52 Fix bug in cloning of schedued dispatch order 2017-06-07 17:04:29 +07:00
Jonathan G Rennison
bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
2017-06-06 21:08:37 +01:00
Jonathan G Rennison
21696cc126 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
2017-06-06 21:06:47 +01:00
Jonathan G Rennison
350c2bb24f Make trains break down after collision with road vehicle. 2017-06-06 20:20:33 +01:00
Jonathan G Rennison
bcbe74f339 Adjust formatting of schedule dispatch summary.
Use different string if departure hasn't left yet.
2017-06-06 20:05:13 +01:00
Jonathan G Rennison
44fa555c6d Merge branch 'save_ext' into improved_breakdowns 2017-06-06 18:41:01 +01:00
Jonathan G Rennison
843343fcf1 Merge branch 'master' into save_ext 2017-06-06 18:40:04 +01:00
Jonathan G Rennison
27d9255f53 Fix trailing whitespace in schdispatch_gui.cpp 2017-06-06 18:27:00 +01:00
Jonathan G Rennison
e15b3bb032 Fix typo in text string for maximum schedule slot delay. 2017-06-06 18:25:45 +01:00
Jonathan G Rennison
735fc1fc68 Increase maximum permitted depot and station name lengths. 2017-06-01 21:33:36 +01:00
Jonathan G Rennison
4528004bb8 Call UpdateScheduledDispatch() at first waiting, even when not travelling.
This is so that the schedule start point is advanced if a train
arrives at the first waiting point before but leaves at or after the
schedule end time.
2017-05-31 19:03:25 +01:00
Jonathan G Rennison
e7a2907a9b Consolidate window invalidations in UpdateScheduledDispatch() 2017-05-31 19:00:59 +01:00
innocenat
59554a5dd2 Fix bug in new SL_VARVEC save/load code 2017-05-30 02:56:02 +07:00
innocenat
0b8f0e64ec Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
2017-05-30 01:37:08 +07:00
innocenat
2895b1921d Add variable std::vector save type
SL_VEC in the game currenty only support SlRefType, not VarType. This add another save type, SL_VARVEC, to support saving std::vector with POD type. It supports all integer type.
2017-05-29 19:08:15 +07: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
Jonathan G Rennison
d6e62a8a39 Merge pull request #18 into jgrpp 2017-05-16 20:56:18 +01:00
Jonathan G Rennison
10a91b291e Fix string references in pull request #18 2017-05-16 20:54:42 +01: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
TELK
f81cdf0312 Erase original text 2017-05-14 14:12:25 +09:00
translators
8ab8a8f9b4 (svn r27872) -Update from Eints:
swedish: 19 changes by Joel_A
2017-05-13 17:45:37 +00:00
TELK
d3dc1c0945 ko-KR: Update Korean translation
Not fluently translated and seems that 7 strings are missed
2017-05-12 03:27:47 +09: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
Jonathan G Rennison
4007dc9f1b Version: Committing version data for tag: jgrpp-0.19.0 2017-05-10 19:52:38 +01:00
Jonathan G Rennison
40b89902a5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/galician.txt
2017-05-10 19:40:39 +01:00
translators
4b7a30c44e (svn r27870) -Update from Eints:
hungarian: 38 changes by Brumi
2017-05-09 17:45:37 +00:00
Jonathan G Rennison
0073c4e71e Road vehicles may no longer be stopped on level crossings. 2017-05-08 21:54:15 +01: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
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
Jonathan G Rennison
2ee66e9b24 Merge branch 'departure-boards' into jgrpp
# Conflicts:
#	src/timetable_gui.cpp
2017-05-07 13:59:41 +01:00
Jonathan G Rennison
0cbb45ec63 Close child query input window when clicking buttons in timetable GUI.
Fixes assertion failure if unrelated button is clicked between
opening and confirming query input window.
2017-05-07 13:59:16 +01:00
translators
497aca8175 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
2017-05-05 17:45:38 +00:00
Jonathan G Rennison
d1dd5937eb Merge branch 'send_money_company' into jgrpp 2017-05-01 14:50:56 +01:00
Jonathan G Rennison
e43f0dad21 Fix crashes/issues with non-broadcast network chat. 2017-05-01 14:50:45 +01: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
Jonathan G Rennison
668702dc7e Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/misc_gui.cpp
2017-04-26 20:26:15 +01:00
Jonathan G Rennison
d94e37d9d1 Fix viewport tooltips not being cleared when scrolling using the keyboard.
Fix documentation typo.
2017-04-26 20:25:50 +01:00
Jonathan G Rennison
4979309094 TBTR: Fix build and refit of template trains. 2017-04-26 19:09:57 +01:00
peter1138
5932c84011 (svn r27859) -Revert (r27858): Committed too much :( 2017-04-23 09:20:53 +00:00