dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,999 Commits 1 Branch 0 Tags
18f104e64420fc552947f255ec67306244270ad8
Commit Graph

17520 Commits

Author SHA1 Message Date
Jonathan G Rennison
3ba859727c Increase verbosity of asserts in OrderList::DebugCheckSanity. 2017-02-19 14:44:38 +00:00
Jonathan G Rennison
fe150d097d Merge branches 'cpp-btree' and 'progsig-sx' into jgrpp 2017-02-19 13:57:13 +00:00
Jonathan G Rennison
e459ebe2ad Remove assert.h include from progsig, as this overrides OpenTTD's assert 2017-02-19 13:57:02 +00:00
Jonathan G Rennison
418e9f4158 Remove assert.h include from btree.h, as this overrides OpenTTD's assert 2017-02-19 13:55:31 +00:00
Jonathan G Rennison
064a36b319 Merge branch 'crashlog_improvements' into jgrpp 2017-02-19 12:57:55 +00:00
Jonathan G Rennison
102405e082 Fix recursive faults in Window crash logger due to message box event loop. 2017-02-19 12:56:56 +00:00
Jonathan G Rennison
018cc59079 Add scope logging for IndividualRoadVehicleController. 2017-02-19 12:47:22 +00:00
Jonathan G Rennison
bac7fe5542 Increase maximum permitted group name length. 2017-02-19 11:52:27 +00:00
translators
9eff17e66b (svn r27747) -Update from Eints: 
korean: 7 changes by telk5093
 2017-02-17 18:45:37 +00:00
Jonathan G Rennison
987e752cee Fix articulated trams decoupling when turning around 
In the case where the front of the tram starts turning due to a
non-waitable dead-end, and before the next vehicle part can turn
the dead-end is removed.
 2017-02-16 22:11:41 +00:00
Jonathan G Rennison
f89e8b76d6 Fix increased number of NewGRFs support. 
Improve error handling if multiplayer limit is exceeded.
 2017-02-14 00:35:15 +00:00
Jonathan G Rennison
7e89b9789f Linkgraph: Fix divide by 0 error when total linkgraph cost estimate <= 1. 2017-02-13 21:29:58 +00:00
Jonathan G Rennison
e474f3b740 Merge remote-tracking branch 'kiwitreekor/jgrpp' into jgrpp 2017-02-13 19:14:31 +00:00
Jonathan G Rennison
fba4268127 Build and refit vehicle test no longer needs to match exec command. 2017-02-13 18:45:40 +00:00
kiwitreekor
daa9671aee Translation update for JGRPP 0.17.0 
Add String STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS and STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
 2017-02-13 18:08:16 +09:00
Jonathan G Rennison
4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 2017-02-12 12:17:51 +00:00
Jonathan G Rennison
e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 2017-02-12 12:17:43 +00:00
frosch
9d85de4d3e (svn r27746) -Fix [FS#6538]: PR_CLEAR_ROAD refers to cost per roadbit. Removing secondary roadtypes from bridges was too cheap. (JGR) 2017-02-12 12:03:07 +00:00
translators
594b328c7e (svn r27744) -Update from Eints: 
basque: 20 changes by Thadah
dutch: 4 changes by habell
 2017-02-09 18:45:40 +00:00
Jonathan G Rennison
7f9ce94cbc Change SharesMap form std::map to btree map. 2017-02-09 18:03:22 +00:00
Jonathan G Rennison
117b56caeb Linkgraph: Replace a std::list with a std::vector. 2017-02-08 22:08:39 +00:00
Jonathan G Rennison
c86a027e88 Linkgraph: Use an arena allocator for path objects. 
Fixes leaks when job is aborted early.
 2017-02-08 22:03:59 +00:00
Jonathan G Rennison
a67ecb4f6e Merge branch 'cpp-11' into jgrpp 2017-02-08 22:03:52 +00:00
Jonathan G Rennison
3f2c561867 Linkgraph: Add support for aborting MCF passes early. 2017-02-08 22:00:35 +00:00
Jonathan G Rennison
2080daab8d Linkgraph: Refactoring to avoid manual deletes. 2017-02-08 21:59:41 +00:00
Jonathan G Rennison
8f3e0c4fe5 Add a custom arena allocator utility. 2017-02-08 21:46:50 +00:00
Jonathan G Rennison
28211c21fc Linkgraph: Fix a memory leak when aborting job early. 2017-02-08 02:01:27 +00:00
Jonathan G Rennison
9d5f34fea6 Replace various uses of std::set/map with btree containers. 2017-02-08 00:18:09 +00:00
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
 2017-02-07 22:29:44 +00:00
Jonathan G Rennison
ea11846d5d Merge branch 'master' into jgrpp 2017-02-07 19:21:54 +00:00
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.
 2017-02-07 19:07:11 +00:00
Jonathan G Rennison
9d9799a39f Merge branch 'template_train_replacement' into jgrpp 2017-02-07 18:52:03 +00:00
Jonathan G Rennison
120fcf995d TBTR: Remove unused const variable. 2017-02-07 18:51:31 +00:00
Jonathan G Rennison
97d718ecee Merge branch 'lifetime_profit-sx' into jgrpp 
# Conflicts:
#	src/vehicle_gui.cpp
 2017-02-06 19:18:46 +00:00
Jonathan G Rennison
9d8b1731cf Merge branch 'lifetime_profit' into lifetime_profit-sx 2017-02-06 19:17:44 +00:00
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.
 2017-02-06 19:16:56 +00:00
Jonathan G Rennison
2533210fc9 Fix tunnels underground view merge issue with custom bridgeheads. 2017-02-06 01:53:06 +00:00
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
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
079a5a66da Custom bridge heads: Relax ownership checks to be similar to plain roads. 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
da177d063f Custom bridge heads: Initial implementation 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
9782d70c53 Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
 2017-02-05 19:05:09 +00:00
Jonathan G Rennison
e97a393a0f Merge branch 'master' into house_placing 2017-02-05 19:00:22 +00:00
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
 2017-02-05 18:58:33 +00:00
Jonathan G Rennison
1f727e9029 Custom bridge heads: Add savegame version and setting. 2017-02-05 18:01:31 +00:00
frosch
30637d1580 (svn r27743) -Fix [FS#6537]: Extra viewports did not center on the selected tile. (hackalittlebit) 2017-02-05 17:54:46 +00:00
translators
31d4b1e8d6 (svn r27742) -Update from Eints: 
spanish (mexican): 1 change by Absay
 2017-02-03 18:45:39 +00:00
Jonathan G Rennison
3b45419a16 Merge branch 'master' into save_ext 2017-02-02 20:41:48 +00:00
Jonathan G Rennison
1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
 2017-01-30 21:41:20 +00:00
Jonathan G Rennison
d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 2017-01-30 21:37:17 +00:00
Jonathan G Rennison
1e1fcc471b Replace leftover debug print from veh repair fix with scope info fmt. 
Fixes c6b1decaf
 2017-01-30 19:45:53 +00:00