1be9660730
Version: Committing version data for tag: jgrpp-0.17.0
8 years ago
ea11846d5d
Merge branch 'master' into jgrpp
8 years ago
3d0ed3547b
Update source.list and project files with btree headers.
8 years ago
b4cfb1adbc
Import cpp-btree library into 3rdparty section.
...
Repo: https://github.com/JGRennison/cpp-btree
Commmit: 6cabdb40fcbb7e12e6d499f92b898f6ec80ae0f1
Remove test program, build scripts, etc.
8 years ago
9d9799a39f
Merge branch 'template_train_replacement' into jgrpp
8 years ago
120fcf995d
TBTR: Remove unused const variable.
8 years ago
97d718ecee
Merge branch 'lifetime_profit-sx' into jgrpp
...
# Conflicts:
# src/vehicle_gui.cpp
8 years ago
9d8b1731cf
Merge branch 'lifetime_profit' into lifetime_profit-sx
8 years ago
6d99162df9
Fix disable mask for sorter drop-down being mis-aligned.
...
Sort by length was incorrectly available, and crashed for non ground
vehicles.
8 years ago
2533210fc9
Fix tunnels underground view merge issue with custom bridgeheads.
8 years ago
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
079a5a66da
Custom bridge heads: Relax ownership checks to be similar to plain roads.
8 years ago
0cd99e576c
Custom bridge heads: Document landscape array use.
8 years ago
da177d063f
Custom bridge heads: Initial implementation
8 years ago
9782d70c53
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
8 years ago
e97a393a0f
Merge branch 'master' into house_placing
8 years ago
e079fd043f
Revert "(svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88)"
...
This reverts commit 6c573dc3b5
8 years ago
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
30637d1580
(svn r27743) -Fix [FS#6537]: Extra viewports did not center on the selected tile. (hackalittlebit)
8 years ago
31d4b1e8d6
(svn r27742) -Update from Eints:
...
spanish (mexican): 1 change by Absay
8 years ago
3b45419a16
Merge branch 'master' into save_ext
8 years ago
1e5c788541
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
8 years ago
d762835903
Signals on tunnel/bridges are now added to infrastructure stats.
8 years ago
1e1fcc471b
Replace leftover debug print from veh repair fix with scope info fmt.
...
Fixes c6b1decaf
8 years ago
cfc04c6408
Merge branch 'lifetime_profit-sx' into jgrpp
...
# Conflicts:
# src/vehicle_base.h
8 years ago
38bf6ade69
Merge branch 'lifetime_profit' into lifetime_profit-sx
8 years ago
529aafd257
Reset overall lifetime profit to 0 when renewing vehicle.
8 years ago
55e56cda52
Increase maximum permitted vehicle name length.
8 years ago
0fc88ade9f
(svn r27741) -Update from Eints:
...
luxembourgish: 26 changes by Phreeze
russian: 1 change by Lone_Wolf
8 years ago
cd18f2c10c
(svn r27740) -Update from Eints:
...
korean: 1 change by telk5093
8 years ago
f3bea35fcc
Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp
8 years ago
11e4bcee40
Slightly decrease proximity required for trains to crash.
...
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
8 years ago
f499de6673
TBTR: Fix incorrect cost estimates in GUI for templates.
8 years ago
6ec8722258
Minor fixes and refactoring of timetable automation set/clear command.
8 years ago
1276f5345d
Implement a natural sort function to use if ICU is not usable.
8 years ago
ea9b28ef8c
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_gui.cpp
8 years ago
c60bc7be1a
Fix refresh/validity issues for cargo type orders GUI.
...
Handle case where the order disappears/moves, fixes crash if
order list is now too short.
Refresh drop-down when running as a multiplayer client, or
when another player updates the cargo options.
8 years ago
6c573dc3b5
(svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88)
8 years ago
da058213e6
Merge branch 'group_collapse' into jgrpp
8 years ago
a0fe6c3c3f
Fix collapse all disable state and functionality when partially collapsed.
...
Fix being able to collapse empty groups with double-click.
8 years ago
24b3424ca3
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
d4157b3662
TBTR: Handle leftover template vehicles without owners in old saves.
8 years ago
285ba41699
TBTR: Fix spelling issues in comment and a method name.
8 years ago
4800e47270
TBTR: Remove partial implementation of all-group replacement.
8 years ago
e79541b166
TBTR: Remove/change owner of template vehicles on company buy/deletion.
8 years ago
d17d2f81dd
TBTR: Remove lots of unused/dead code.
8 years ago
1b3077bdc9
TBTR: Clean up template replacements when removing company.
8 years ago
b3f49672ec
Change default for cargo recalc interval not scaled by day length, to true.
8 years ago
71bda2a4dd
Merge branch 'more_cond_orders-sx' into jgrpp
8 years ago
03f3ba157b
Merge branch 'more_cond_orders' into more_cond_orders-sx
8 years ago
Jonathan G Rennison
frosch
translators