Commit Graph

23705 Commits

Author SHA1 Message Date
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
c72f21e410 (svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf 2017-01-14 18:00:02 +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
michi_cc
3e7bdb0c73 (svn r27727) -Fix(-or-not) [FS#6295]: [OSX] Out-of-the-box compilation on newer OSX versions (dunn). 2017-01-08 17:00:18 +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
frosch
4955e71ee0 (svn r27721) -Fix: Testing GRFs for static-safety (when reloading the config) invalidated file slot 62, which may be in use by an active GRF. 2017-01-07 21:18:17 +00:00
translators
43ee8e8d38 (svn r27720) -Update from Eints:
turkish: 25 changes by barisdemirdelen
2017-01-07 18:45:37 +00:00
Jonathan G Rennison
6e829c39e4 Version: Committing version data for tag: jgrpp-0.16.1 2017-01-05 23:08:38 +00:00
Jonathan G Rennison
d361120fa0 Merge branch 'master' into jgrpp 2017-01-05 22:42:51 +00:00
Jonathan G Rennison
7ecdebddb3 Change and simplify algorithm for vehicle repair cost.
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
2017-01-02 20:21:58 +00:00
Jonathan G Rennison
a71a6ecec2 Fix Pop() method of SmallStack/StationIDStack.
Fixes 8deac54c
2017-01-02 19:28:22 +00:00
Jonathan G Rennison
51d4a6b14d Merge branch 'improved_breakdowns' into jgrpp 2017-01-02 19:28:11 +00:00
Jonathan G Rennison
5ba666883b Fix double/inconsistent updating of variables when servicing vehicle. 2017-01-02 19:27:39 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/train_cmd.cpp
2017-01-02 18:13:45 +00:00
translators
12d17ed62b (svn r27719) -Update from Eints:
polish: 25 changes by nouwak
2016-12-31 18:45:36 +00:00
translators
a8496153d6 (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
2016-12-30 18:45:38 +00:00
translators
151956d471 (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
2016-12-29 18:45:38 +00:00
Jonathan G Rennison
5e30d389af Merge branch 'signal_tunnels_bridges' into jgrpp 2016-12-28 15:07:11 +00:00
Jonathan G Rennison
08062096ab Make back of bridge/tunnel PBS exit a line-end safe waiting point. 2016-12-28 15:07:03 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
translators
9bbc6e7ab5 (svn r27716) -Update from Eints:
catalan: 1 change by juanjo
2016-12-27 18:45:39 +00:00
translators
db6e65f4f3 (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
2016-12-26 18:45:38 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
2016-12-26 15:38:56 +00:00
Jonathan G Rennison
509da024cc Fix viewport order lines/markers for multiplayer clients. 2016-12-26 15:35:11 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
2016-12-26 15:35:01 +00:00
Jonathan G Rennison
56f173e15e Merge branch 'master' into save_ext 2016-12-26 15:26:08 +00:00
translators
1c7e978b09 (svn r27714) -Update from Eints:
catalan: 2 changes by juanjo
russian: 1 change by Lone_Wolf
2016-12-25 18:45:37 +00:00