Commit Graph

46860 Commits

Author SHA1 Message Date
Jonathan G Rennison
f012d45491 Merge branch 'signal_tunnels_bridges' into jgrpp 2018-03-26 20:49:11 +01:00
Jonathan G Rennison
df72bc6e09 Fix signal on tun/bridge gradual decel end tile detection 2018-03-26 20:48:52 +01:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
52edafab5e Add savegame support for 32 bit Train::flags field 2018-03-26 19:50:34 +01:00
Jonathan G Rennison
09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
2018-03-26 18:42:23 +01:00
Jonathan G Rennison
def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 2018-03-26 18:40:05 +01:00
Jonathan G Rennison
10db379202 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/train_cmd.cpp
2018-03-25 00:57:59 +00:00
Jonathan G Rennison
38cb80872b Gradually slow down for red signals on bridges/tunnels
Instead of coming to a sudden halt immediately before the signal
2018-03-25 00:57:20 +00:00
Jonathan G Rennison
70b6500d73 Merge branch 'save_ext' into jgrpp 2018-03-22 23:13:16 +00:00
Jonathan G Rennison
c2ab4cb2ae Fix commit fb946f6a, which broke new game/map creation 2018-03-22 23:11:19 +00:00
translators
080f7b3cba (svn r27998) -Update from Eints:
welsh: 9 changes by kazzie
2018-03-22 18:45:37 +00:00
Jonathan G Rennison
22724e13bc Merge branch 'save_ext' into jgrpp 2018-03-20 01:15:21 +00:00
Jonathan G Rennison
fb946f6a2b Don't reset savegame feature versions at end of DoLoad, so that -q works 2018-03-20 01:15:01 +00:00
translators
328a4ff00d (svn r27994) -Update from Eints:
welsh: 2 changes by kazzie
2018-03-18 18:45:38 +00:00
frosch
09d4735679 (svn r27993) -Change: Heading for 1.9 now 2018-03-14 19:36:41 +00:00
translators
080d57d97a (svn r27991) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-03-14 18:45:37 +00:00
frosch
8c458c153d (svn r27990) -Update: Docs 2018-03-14 18:05:06 +00:00
Jonathan G Rennison
80c0655c06 Relax validation for conditional order travel time in old savegame load 2018-03-11 22:42:37 +00:00
Jonathan G Rennison
ab390253b1 Fix typo in changelog: trunk SVN rev number for jgrpp-0.23.0
See #32
2018-03-11 22:27:22 +00:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
2018-03-11 22:16:19 +00:00
Jonathan G Rennison
16c67ea484 Merge branch 'master' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/saveload/saveload.cpp
#	src/stdafx.h
#	src/vehicle.cpp
2018-03-11 22:10:21 +00:00
Jonathan G Rennison
cb2077edd5 Zoning: Fix unserved building/industry highlight not being removed when tile cleared 2018-03-11 22:07:33 +00:00
frosch
55a503e6f2 (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases.
2018-03-11 15:08:51 +00:00
frosch
a537fd5d0e (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases.
2018-03-11 15:08:51 +00:00
frosch
c6eb633d18 (svn r27988) -Codechange: Extent hg- and gitignore for .vs 2018-03-11 13:34:28 +00:00
frosch
23b21b15eb (svn r27988) -Codechange: Extent hg- and gitignore for .vs 2018-03-11 13:34:28 +00:00
frosch
043274afd6 (svn r27987) -Change: Increase maximum allowed vehicle sprite size to reduce clipping of ships. 2018-03-11 13:25:26 +00:00
frosch
25a2b98b4c (svn r27987) -Change: Increase maximum allowed vehicle sprite size to reduce clipping of ships. 2018-03-11 13:25:26 +00:00
frosch
5558899621 (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 2018-03-11 13:23:26 +00:00
frosch
6b088d37bf (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 2018-03-11 13:23:26 +00:00
frosch
07d841d0ef (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. 2018-03-11 13:21:27 +00:00
frosch
30f73d907a (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. 2018-03-11 13:21:27 +00:00
frosch
d9d669dcf8 (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. 2018-03-11 13:19:41 +00:00
frosch
29dca1be3b (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. 2018-03-11 13:19:41 +00:00
frosch
7c406f0d9d (svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments 2018-03-11 13:18:13 +00:00
frosch
2a3d0cea50 (svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments 2018-03-11 13:18:13 +00:00
frosch
4fc178aebd (svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent. 2018-03-11 13:17:44 +00:00
frosch
aee8ffc73b (svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent. 2018-03-11 13:17:44 +00:00
frosch
db54db00df (svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu) 2018-03-11 12:46:05 +00:00
frosch
8f47687b84 (svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu) 2018-03-11 12:46:05 +00:00
frosch
91464af737 (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
frosch
b1592787eb (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
frosch
ebe6564e8b (svn r27979) -Add: adf88 to readme 2018-03-11 12:18:30 +00:00
frosch
6e19cbf219 (svn r27979) -Add: adf88 to readme 2018-03-11 12:18:30 +00:00
frosch
59dd7be686 (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
frosch
91bcc210cf (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 2018-03-11 12:11:09 +00:00
frosch
6eac63622e (svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC) 2018-03-11 12:03:17 +00:00
frosch
bdc775e941 (svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC) 2018-03-11 12:03:17 +00:00
frosch
8f3dbd2efc (svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC) 2018-03-11 11:43:32 +00:00