Jonathan G Rennison
|
d5ee260daf
|
Update changed format code in translation.
|
2016-07-06 17:26:50 +01:00 |
|
Jonathan G Rennison
|
f0fee802a9
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
|
2016-07-05 22:34:50 +01:00 |
|
Jonathan G Rennison
|
ed33a62bcd
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
2016-07-05 22:19:34 +01:00 |
|
Jonathan G Rennison
|
0ab2abbc23
|
Add client setting to show train weight ratios in details header.
Off by default.
|
2016-07-05 21:54:43 +01:00 |
|
Jonathan G Rennison
|
8ec1b2200e
|
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
|
2016-07-05 21:20:06 +01:00 |
|
Jonathan G Rennison
|
f3e0da1e63
|
Update project files.
|
2016-07-01 18:33:27 +01:00 |
|
Jonathan G Rennison
|
80e3af6bf5
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
|
2016-06-30 20:25:22 +01:00 |
|
Jonathan G Rennison
|
71aa4c75cb
|
Bump tracerestrict version due to weight/power/TE conditionals.
|
2016-06-30 20:17:45 +01:00 |
|
Jonathan G Rennison
|
e4b932d53a
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
2016-06-30 20:15:27 +01:00 |
|
Jonathan G Rennison
|
f942de699c
|
Add power/weight and max TE/weight ratio tracerestrict conditionals.
Minor refactorings.
|
2016-06-30 19:31:45 +01:00 |
|
Jonathan G Rennison
|
91ba866852
|
Fix comment typo.
|
2016-06-30 18:55:26 +01:00 |
|
Jonathan G Rennison
|
b11d48b431
|
Update project files
|
2016-06-30 18:37:39 +01:00 |
|
Jonathan G Rennison
|
2c6f74a982
|
Move header definition for unit conversion functions to own header.
|
2016-06-30 18:28:42 +01:00 |
|
Jonathan G Rennison
|
b5531975da
|
Add train weight, power, and max TE tracerestrict conditionals.
Minor refactorings.
|
2016-06-29 22:08:05 +01:00 |
|
Jonathan G Rennison
|
929327ecaf
|
Merge branch 'template_train_replacement-sx' into jgrpp
|
2016-06-21 18:56:47 +01:00 |
|
Jonathan G Rennison
|
84e467328f
|
Merge branch 'template_train_replacement' into template_train_replacement-sx
|
2016-06-21 18:56:40 +01:00 |
|
Jonathan G Rennison
|
ff922f41da
|
Fix NewGRF vehicle variables 4A, FE and FF crashing with virtual trains.
This is due to attempts to look up the rail type of the current tile.
|
2016-06-21 18:56:29 +01:00 |
|
Jonathan G Rennison
|
cf26d48c9b
|
Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine.
|
2016-06-18 13:22:59 +01:00 |
|
Jonathan G Rennison
|
2cdc4c5fa0
|
Use preview instead of purchase sprites for engine preview width calc.
|
2016-06-18 13:22:08 +01:00 |
|
Jonathan G Rennison
|
afb5b625ef
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/rail_cmd.cpp
|
2016-06-18 11:12:20 +01:00 |
|
Jonathan G Rennison
|
fe1fee456a
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
2016-06-18 11:11:18 +01:00 |
|
Jonathan G Rennison
|
a091780843
|
Fix type mismatch in GRF externals.
|
2016-06-18 11:10:57 +01:00 |
|
Jonathan G Rennison
|
3db5b67376
|
Version: Committing version data for tag: jgrpp-0.13.3
|
2016-06-12 21:37:31 +01:00 |
|
Jonathan G Rennison
|
6bcd6aec76
|
Merge branch 'master' into jgrpp
|
2016-06-12 21:25:38 +01:00 |
|
Jonathan G Rennison
|
74ff8b9e8e
|
Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
# Makefile.src.in
|
2016-06-12 21:21:55 +01:00 |
|
Jonathan G Rennison
|
62631cba02
|
Attempt to log distro name/version in Unix crashlog.
Factor out fork/execve/read stdout code into own function.
|
2016-06-12 20:58:52 +01:00 |
|
Jonathan G Rennison
|
8d078acb4e
|
Log registers and fault instruction in Unix crashlog.
|
2016-06-12 19:34:06 +01:00 |
|
translators
|
1234b7d0f8
|
(svn r27599) -Update from Eints:
persian: 2 changes by rkarimabadi
|
2016-06-12 17:45:36 +00:00 |
|
Jonathan G Rennison
|
0951cb320c
|
Show ./configure invocation in crash log.
|
2016-06-10 23:39:26 +01:00 |
|
Jonathan G Rennison
|
411f91731d
|
Config: Fix --with-self-gdb-debug config re-exec
|
2016-06-10 23:39:26 +01:00 |
|
Jonathan G Rennison
|
abbc960e96
|
Linux crashlog: Use sigaction to get more info on fatal signals.
|
2016-06-10 23:39:26 +01:00 |
|
Jonathan G Rennison
|
e95a24a4e9
|
Merge branch 'template_train_replacement-sx' into jgrpp
|
2016-06-10 00:06:16 +01:00 |
|
Jonathan G Rennison
|
ed20e1c61a
|
Merge branch 'template_train_replacement' into template_train_replacement-sx
|
2016-06-10 00:05:57 +01:00 |
|
Jonathan G Rennison
|
b7aac40da8
|
Fix deleting an in-use template vehicle, only updating the first group.
|
2016-06-10 00:05:24 +01:00 |
|
frosch
|
9a7618aeb6
|
(svn r27598) -Fix: Company 0 could accept engine previews before they were offered.
|
2016-06-09 19:04:53 +00:00 |
|
Jonathan G Rennison
|
3b42e299aa
|
Merge branch 'town_cargo_adj-sx' into jgrpp
|
2016-06-06 22:16:18 +01:00 |
|
Jonathan G Rennison
|
947d118595
|
Merge branch 'town_cargo_adj' into town_cargo_adj-sx
|
2016-06-06 22:16:10 +01:00 |
|
Jonathan G Rennison
|
5428c9e5ab
|
Fix generation of town cargo other than pax/mail (e.g. ECS tourists).
|
2016-06-06 22:15:57 +01:00 |
|
Jonathan G Rennison
|
5b7eb46fe4
|
Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
# src/saveload/extended_ver_sl.cpp
|
2016-06-05 23:21:55 +01:00 |
|
Jonathan G Rennison
|
0d20a54606
|
Fix broken-down aircraft stuck at 0 speed on load.
Bump improved breakdowns version.
|
2016-06-05 23:20:25 +01:00 |
|
Jonathan G Rennison
|
8d330314ef
|
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
|
2016-06-05 22:31:59 +01:00 |
|
Jonathan G Rennison
|
60d5bbc0e7
|
Fix improved breakdowns aircraft speed-reductions.
Breakdown speed was wrong and possibly 0 for planes with
GRF-defined speed limits.
|
2016-06-05 22:28:17 +01:00 |
|
Jonathan G Rennison
|
655b329142
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
|
2016-06-02 19:25:23 +01:00 |
|
smatz
|
5ac736ec00
|
(svn r27595) -Fix: prevent GCC 6 over-optimization
|
2016-05-31 19:33:33 +00:00 |
|
frosch
|
842aaf7cdd
|
(svn r27594) -Fix [FS#6473]: [Script] Kill scripts, when a non-suspendable valuator call takes way too long.
|
2016-05-30 21:03:11 +00:00 |
|
frosch
|
05a91106b8
|
(svn r27586) -Fix [FS#6410]: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away. (juanjo)
|
2016-05-29 14:14:52 +00:00 |
|
frosch
|
0b2f8c13a2
|
(svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations.
|
2016-05-29 13:35:17 +00:00 |
|
frosch
|
a66e0ff1f4
|
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
|
2016-05-29 13:33:20 +00:00 |
|
frosch
|
c5ae45c764
|
(svn r27583) -Fix [FS#6415]: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave. (Airbus)
|
2016-05-29 12:21:40 +00:00 |
|
Jonathan G Rennison
|
09291a3b74
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
|
2016-05-23 18:41:00 +01:00 |
|