Commit Graph

23617 Commits (fba42681270df683613e75063dd356df15ccc413)
 

Author SHA1 Message Date
Jonathan G Rennison fba4268127 Build and refit vehicle test no longer needs to match exec command. 8 years ago
Jonathan G Rennison 4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 8 years ago
Jonathan G Rennison a36bac6d0e Readme formatting fix 8 years ago
Jonathan G Rennison 7f9ce94cbc Change SharesMap form std::map to btree map. 8 years ago
Jonathan G Rennison 117b56caeb Linkgraph: Replace a std::list with a std::vector. 8 years ago
Jonathan G Rennison c86a027e88 Linkgraph: Use an arena allocator for path objects.
Fixes leaks when job is aborted early.
8 years ago
Jonathan G Rennison a67ecb4f6e Merge branch 'cpp-11' into jgrpp 8 years ago
Jonathan G Rennison 3f2c561867 Linkgraph: Add support for aborting MCF passes early. 8 years ago
Jonathan G Rennison 2080daab8d Linkgraph: Refactoring to avoid manual deletes. 8 years ago
Jonathan G Rennison 8f3e0c4fe5 Add a custom arena allocator utility. 8 years ago
Jonathan G Rennison 28211c21fc Linkgraph: Fix a memory leak when aborting job early. 8 years ago
Jonathan G Rennison 9d5f34fea6 Replace various uses of std::set/map with btree containers. 8 years ago
Jonathan G Rennison 76de8f9b13 Merge branch 'cpp-btree' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
8 years ago
Jonathan G Rennison 1be9660730 Version: Committing version data for tag: jgrpp-0.17.0 8 years ago
Jonathan G Rennison ea11846d5d Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 3d0ed3547b Update source.list and project files with btree headers. 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 9d9799a39f Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 120fcf995d TBTR: Remove unused const variable. 8 years ago
Jonathan G Rennison 97d718ecee Merge branch 'lifetime_profit-sx' into jgrpp
# Conflicts:
#	src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison 9d8b1731cf Merge branch 'lifetime_profit' into lifetime_profit-sx 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 2533210fc9 Fix tunnels underground view merge issue with custom bridgeheads. 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 079a5a66da Custom bridge heads: Relax ownership checks to be similar to plain roads. 8 years ago
Jonathan G Rennison 0cd99e576c Custom bridge heads: Document landscape array use. 8 years ago
Jonathan G Rennison da177d063f Custom bridge heads: Initial implementation 8 years ago
Jonathan G Rennison 9782d70c53 Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/lang/korean.txt
8 years ago
Jonathan G Rennison e97a393a0f Merge branch 'master' into house_placing 8 years ago
Jonathan G Rennison 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.

This is to avoid clashing with the housing pick/place patch
8 years ago
Jonathan G Rennison 1f727e9029 Custom bridge heads: Add savegame version and setting. 8 years ago
frosch 30637d1580 (svn r27743) -Fix [FS#6537]: Extra viewports did not center on the selected tile. (hackalittlebit) 8 years ago
translators 31d4b1e8d6 (svn r27742) -Update from Eints:
spanish (mexican): 1 change by Absay
8 years ago
Jonathan G Rennison 3b45419a16 Merge branch 'master' into save_ext 8 years ago
Jonathan G Rennison 1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
8 years ago
Jonathan G Rennison d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 8 years ago
Jonathan G Rennison 1e1fcc471b Replace leftover debug print from veh repair fix with scope info fmt.
Fixes c6b1decaf
8 years ago
Jonathan G Rennison cfc04c6408 Merge branch 'lifetime_profit-sx' into jgrpp
# Conflicts:
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison 38bf6ade69 Merge branch 'lifetime_profit' into lifetime_profit-sx 8 years ago
Jonathan G Rennison 529aafd257 Reset overall lifetime profit to 0 when renewing vehicle. 8 years ago
Jonathan G Rennison 55e56cda52 Increase maximum permitted vehicle name length. 8 years ago
translators 0fc88ade9f (svn r27741) -Update from Eints:
luxembourgish: 26 changes by Phreeze
russian: 1 change by Lone_Wolf
8 years ago
translators cd18f2c10c (svn r27740) -Update from Eints:
korean: 1 change by telk5093
8 years ago
Jonathan G Rennison f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison f499de6673 TBTR: Fix incorrect cost estimates in GUI for templates. 8 years ago
Jonathan G Rennison 6ec8722258 Minor fixes and refactoring of timetable automation set/clear command. 8 years ago
Jonathan G Rennison 1276f5345d Implement a natural sort function to use if ICU is not usable. 8 years ago
Jonathan G Rennison ea9b28ef8c Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_gui.cpp
8 years ago