Commit Graph

23221 Commits

Author SHA1 Message Date
frosch
9aa9d7e898 (svn r27576) -Fix (r27570): Compilation failure with all compilers but mine. 2016-05-22 10:45:46 +00:00
frosch
7108b0aa3b (svn r27575) -Fix [FS#6404]: Memory leak when disabling palette animation. (JGR) 2016-05-22 10:28:57 +00:00
frosch
1124c15ccd (svn r27574) -Fix [FS#6432]: The house id as returned by house variable 66 was incorrect when querying neighboured tiles. (adf88) 2016-05-22 10:23:22 +00:00
frosch
6fafa3d93a (svn r27573) -Fix [FS#6467]: Compilation failure with gcc 6.1 due to headers included after safeguards.h (JGR) 2016-05-22 10:15:35 +00:00
frosch
2de4652d09 (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 2016-05-22 10:10:17 +00:00
frosch
14c1a7ad0b (svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect. 2016-05-22 10:07:48 +00:00
frosch
998a6c1302 (svn r27570) -Fix [FS#6449]: Various incorrect but uncritical size computations in the content client. 2016-05-22 10:04:41 +00:00
translators
f5c5783fac (svn r27569) -Update from Eints:
spanish (mexican): 3 changes by Absay
2016-05-20 17:45:35 +00:00
Jonathan G Rennison
0f11908a50 Merge branch 'measurement_tool' into jgrpp
# Conflicts:
#	src/viewport.cpp
2016-05-20 18:23:36 +01:00
Jonathan G Rennison
ab498dc0ba Move math.h include out of viewport_type.h, fixes gcc 6 compilation.
Make a system include.
2016-05-20 18:23:15 +01:00
Jonathan G Rennison
6542c164d5 Fix various headers in crashlog.cpp being included after safeguards.h
Fixes compilation failure when headers use malloc-type function.
2016-05-19 19:05:50 +01:00
translators
dd2f369e9d (svn r27568) -Update from Eints:
dutch: 1 change by habell
2016-05-18 17:45:35 +00:00
translators
e71afa0c10 (svn r27567) -Update from Eints:
finnish: 1 change by jpx_
2016-05-17 17:45:37 +00:00
translators
101a63c3f5 (svn r27566) -Update from Eints:
spanish (mexican): 6 changes by Absay
2016-05-14 17:45:37 +00:00
translators
724dd44355 (svn r27565) -Update from Eints:
spanish (mexican): 13 changes by Absay
2016-05-13 17:45:33 +00:00
Jonathan G Rennison
b24371fc04 Version: Committing version data for tag: jgrpp-0.13.2 2016-05-13 00:59:02 +01:00
Jonathan G Rennison
4c0423d6d8 Merge branch 'master' into jgrpp 2016-05-13 00:25:10 +01:00
Jonathan G Rennison
f6d374ade4 Merge branch 'house_placing' into jgrpp
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
2016-05-12 22:57:42 +01:00
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
frosch
bd71bcc616 (svn r27564) -Update: Ownname of es_MX. 2016-05-12 19:14:06 +00:00
translators
edfe26f2ee (svn r27563) -Update from Eints:
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
2016-05-12 17:45:36 +00:00
rubidium
49b69a5705 (svn r27562) -Fix: forgot one (hidden) case to force sorting to be locale independent 2016-05-12 17:24:06 +00:00
matthijs
7e06cdb455 (svn r27561) -Fix [Squirrel]: Fix typos in error messages 2016-05-11 21:28:39 +00:00
matthijs
91ddd32c20 (svn r27560) -Fix: typos in comments and string 2016-05-11 20:48:46 +00:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision.
This avoids rounding of start dates when using minutes and
day length > 1.
2016-05-11 21:31:31 +01:00
rubidium
baa11c8b0f (svn r27559) -Update: baseset translations 2016-05-11 18:42:32 +00:00
rubidium
6da8fede43 (svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able 2016-05-11 18:39:18 +00:00
rubidium
b892103747 (svn r27557) -Fix: bashism that caused different CFLAGS with bash vs dash 2016-05-11 18:38:44 +00:00
translators
f0db8a16d5 (svn r27556) -Update from Eints:
spanish (mexican): 36 changes by Absay
2016-05-11 17:45:36 +00:00
Jonathan G Rennison
f82673bed8 Merge branch 'auto_timetables-sx' into jgrpp 2016-05-09 23:41:11 +01:00
Jonathan G Rennison
c042a6de9c Fix disable state of buttons in timetable window.
Fixes crash when using buttons which should be disabled.
2016-05-09 23:41:04 +01:00
Jonathan G Rennison
ba5e9470ca Version: Committing version data for tag: jgrpp-0.13.1 2016-05-09 22:24:23 +01:00
Jonathan G Rennison
eac2f0720c Merge branch 'master' into jgrpp 2016-05-09 21:51:04 +01:00
translators
3d476cf432 (svn r27555) -Update from Eints:
croatian: 3 changes by VoyagerOne
2016-05-08 17:45:37 +00:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default.
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
2016-05-08 01:12:07 +01:00
translators
3ae6dab58b (svn r27554) -Update from Eints:
korean: 1 change by Gimel3830
2016-05-07 17:45:33 +00:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +01:00
Jonathan G Rennison
ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 2016-05-06 23:16:17 +01:00
Jonathan G Rennison
04b188bd7d Add client setting to show leftover ticks in timetable. 2016-05-06 19:47:46 +01:00
frosch
b21e13a2a4 (svn r27553) -Update: Project files 2016-04-30 14:33:36 +00:00
frosch
a3ffac0025 (svn r27552) -Feature: Mexican Spanish (Absay) 2016-04-30 08:28:40 +00:00
Jonathan G Rennison
cf59b4fcab Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2016-04-28 22:24:36 +01:00
Jonathan G Rennison
6e545d1138 Merge branch 'infrastructure_sharing-sx' into jgrpp 2016-04-28 22:23:22 +01:00
Jonathan G Rennison
16de93413e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-04-28 22:23:12 +01:00
Jonathan G Rennison
22f9e3b97c Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2016-04-28 22:19:46 +01:00
Jonathan G Rennison
17f74e4c51 Fix signalled bridge/tunnel not always being redrawn on (un)reservation. 2016-04-28 22:19:35 +01:00
Jonathan G Rennison
3ae94d857c Fix FindTrainOnTrackEnum finding trains inside signalled bridge/tunnels.
Now only find trains on the given entrance/exit tile.
This fixes trains not leaving stations by PBS into non-empty signalled
bridge/tunnels.
2016-04-28 22:07:16 +01:00
Jonathan G Rennison
781bf73c6d Fix incorrect calculation of final delivery payment.
Calculation was incorrect for partial packet delivery after a transfer.
2016-04-28 19:39:06 +01:00
translators
806d97435e (svn r27551) -Update from Eints:
ukrainian: 3 changes by odisseus
2016-04-28 17:45:35 +00:00