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
cfc04c6408 Merge branch 'lifetime_profit-sx' into jgrpp 
# Conflicts:
#	src/vehicle_base.h
 2017-01-30 19:31:25 +00:00
Jonathan G Rennison
38bf6ade69 Merge branch 'lifetime_profit' into lifetime_profit-sx 2017-01-30 19:30:23 +00:00
Jonathan G Rennison
529aafd257 Reset overall lifetime profit to 0 when renewing vehicle. 2017-01-30 19:30:08 +00:00
Jonathan G Rennison
55e56cda52 Increase maximum permitted vehicle name length. 2017-01-30 19:11:11 +00:00
translators
0fc88ade9f (svn r27741) -Update from Eints: 
luxembourgish: 26 changes by Phreeze
russian: 1 change by Lone_Wolf
 2017-01-26 18:45:36 +00:00
translators
cd18f2c10c (svn r27740) -Update from Eints: 
korean: 1 change by telk5093
 2017-01-25 18:45:36 +00:00
Jonathan G Rennison
f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 2017-01-24 19:49:01 +00:00
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.
 2017-01-24 19:47:13 +00:00
Jonathan G Rennison
f499de6673 TBTR: Fix incorrect cost estimates in GUI for templates. 2017-01-24 19:45:32 +00:00
Jonathan G Rennison
6ec8722258 Minor fixes and refactoring of timetable automation set/clear command. 2017-01-24 19:21:00 +00:00
Jonathan G Rennison
1276f5345d Implement a natural sort function to use if ICU is not usable. 2017-01-24 00:24:18 +00:00
Jonathan G Rennison
ea9b28ef8c Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_gui.cpp
 2017-01-23 21:49:10 +00:00
Jonathan G Rennison
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.
 2017-01-23 21:47:09 +00:00
frosch
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) 2017-01-22 13:13:15 +00:00
Jonathan G Rennison
da058213e6 Merge branch 'group_collapse' into jgrpp 2017-01-21 02:32:43 +00:00
Jonathan G Rennison
a0fe6c3c3f Fix collapse all disable state and functionality when partially collapsed. 
Fix being able to collapse empty groups with double-click.
 2017-01-21 02:32:18 +00:00
Jonathan G Rennison
24b3424ca3 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
 2017-01-21 01:44:05 +00:00
Jonathan G Rennison
d4157b3662 TBTR: Handle leftover template vehicles without owners in old saves. 2017-01-21 01:40:26 +00:00
Jonathan G Rennison
285ba41699 TBTR: Fix spelling issues in comment and a method name. 2017-01-21 01:39:59 +00:00
Jonathan G Rennison
4800e47270 TBTR: Remove partial implementation of all-group replacement. 2017-01-21 01:39:13 +00:00
Jonathan G Rennison
e79541b166 TBTR: Remove/change owner of template vehicles on company buy/deletion. 2017-01-21 01:39:11 +00:00
Jonathan G Rennison
d17d2f81dd TBTR: Remove lots of unused/dead code. 2017-01-21 01:38:08 +00:00
Jonathan G Rennison
1b3077bdc9 TBTR: Clean up template replacements when removing company. 2017-01-21 01:38:08 +00:00
Jonathan G Rennison
b3f49672ec Change default for cargo recalc interval not scaled by day length, to true. 2017-01-21 00:20:25 +00:00
Jonathan G Rennison
71bda2a4dd Merge branch 'more_cond_orders-sx' into jgrpp 2017-01-20 20:08:14 +00:00
Jonathan G Rennison
03f3ba157b Merge branch 'more_cond_orders' into more_cond_orders-sx 2017-01-20 20:08:05 +00:00
Jonathan G Rennison
15e4174332 Fix inverted condition for cargo waiting conditional order. 
Fixes incorrect port in 2d47c47a
 2017-01-20 20:07:35 +00:00
translators
3245922407 (svn r27738) -Update from Eints: 
croatian: 1 change by VoyagerOne
 2017-01-20 18:45:37 +00:00
translators
1d6f3fda80 (svn r27737) -Update from Eints: 
czech: 27 changes by djst
 2017-01-18 18:45:37 +00:00
Jonathan G Rennison
d25daebf2f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2017-01-17 19:25:55 +00:00
Jonathan G Rennison
82152d8605 Merge branch 'tracerestrict' into tracerestrict-sx 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-01-17 19:23:33 +00:00
Jonathan G Rennison
f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 2017-01-17 19:20:46 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
translators
2335acdc16 (svn r27736) -Update from Eints: 
italian: 1 change by lorenzodv
 2017-01-16 18:45:36 +00:00
translators
140bb8409a (svn r27735) -Update from Eints: 
catalan: 1 change by juanjo
 2017-01-15 18:45:39 +00:00
frosch
2f5cc263c7 (svn r27734) -Change: Hide the drive-in stops from the tram station picker. 2017-01-15 14:27:54 +00:00
frosch
a2e53d5ab4 (svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers. 2017-01-15 13:59:46 +00:00
Jonathan G Rennison
1ff60c44bf Increase max vehicle-type unit setting limits. 2017-01-15 01:32:13 +00:00
Jonathan G Rennison
42a4bd63e0 Adjust setting texts for pay for repair, and move within settings GUI. 2017-01-15 01:06:26 +00:00
Jonathan G Rennison
c6b1decafd Do not pay for repair cost when vehicle is being auto-replaced. 2017-01-15 01:00:37 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
79027cbf9d (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf 
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
 2017-01-14 15:48:19 +00:00
frosch
8bd3a8a991 (svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game. 
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
 2017-01-14 13:12:49 +00:00
Jonathan G Rennison
c600ffe6d5 Fix go to nearest depot and halt orders, not halting. 2017-01-11 23:49:23 +00:00
translators
9f858cefd1 (svn r27728) -Update from Eints: 
latin: 1 change by Supercheese
 2017-01-08 18:45:37 +00:00
frosch
b276dd7c63 (svn r27726) -Fix: Improve error message when trying to build rail track over a depot. (adf88) 2017-01-08 11:45:08 +00:00
frosch
a76847f362 (svn r27725) -Codechange: Remove IsOpenTTDBaseGRF and test for GCF_CONFIG instead, which does the same in all use-cases. 2017-01-07 21:36:25 +00:00
frosch
dc024f0e3a (svn r27724) -Cleanup: Remove pointless usage of IsOpenTTDBaseGRF. System GRFs are never listed in the NewGRF GUI. 2017-01-07 21:28:03 +00:00
frosch
373a6d3497 (svn r27723) -Codechange: Simplify tests by using GCF_SYSTEM. 2017-01-07 21:22:26 +00:00
frosch
ca329cd275 (svn r27722) -Fix (r7490): GCF_SYSTEM was never set correctly. 2017-01-07 21:20:02 +00:00