dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,261 Commits 1 Branch 0 Tags
70b6500d73cdc4ed0b19b8f3dc279e412efabe6b
Commit Graph

17757 Commits

Author SHA1 Message Date
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
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
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
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
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
25a2b98b4c (svn r27987) -Change: Increase maximum allowed vehicle sprite size to reduce clipping of ships. 2018-03-11 13:25: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
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
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
2a3d0cea50 (svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments 2018-03-11 13:18:13 +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
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
b1592787eb (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
frosch
6e19cbf219 (svn r27979) -Add: adf88 to readme 2018-03-11 12:18:30 +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
peter1138
7ed8067e1c (svn r27975) -Fix (r8969) [FS#6642]: Missing one hair style. 2018-03-11 07:16:58 +00:00
Jonathan G Rennison
ab1b04055a Fix incorrect handling of over-brightness in non-SSE 32bpp blitter. 2018-03-08 21:30:02 +00:00
peter1138
5df8ac52d6 (svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR) 2018-03-06 07:48:29 +00:00
peter1138
c46e470f07 (svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock. 2018-03-05 22:57:49 +00:00
peter1138
b85190128a (svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots. 2018-03-05 21:24:48 +00:00
Jonathan G Rennison
1fce82ac04 Merge branch 'tracerestrict-sx' into jgrpp 2018-03-03 18:08:20 +00:00
Jonathan G Rennison
6c631c6679 Merge branch 'tracerestrict' into tracerestrict-sx 2018-03-03 18:08:13 +00:00
Jonathan G Rennison
a9596b45aa Fix incorrect tile and trackdir in reserve through program execution 2018-03-03 18:07:57 +00:00
translators
9ce3403e2d (svn r27971) -Update from Eints: 
spanish (mexican): 2 changes by Absay
 2018-03-01 18:45:36 +00:00
translators
d6354f5408 (svn r27970) -Update from Eints: 
greek: 1 change by Jubilee
 2018-02-28 18:45:37 +00:00
Jonathan G Rennison
9a1a5a9d68 Increase maximum value of ticks per minute setting 2018-02-26 01:13:22 +00:00
Jonathan G Rennison
8a4d462d44 Merge branch 'chunnel' into jgrpp 2018-02-26 00:58:26 +00:00
HackaLittleBit
d5a316e365 Use flag GVF_CHUNNEL_BIT properly 2018-02-26 00:58:16 +00:00
translators
d6df92b6df (svn r27969) -Update from Eints: 
danish: 22 changes by Knogle
 2018-02-23 18:45:38 +00:00
Jonathan G Rennison
4bb8106c2a Adjust typenames of ConvertRect to avoid name collisions 2018-02-10 11:24:11 +00:00
Jonathan G Rennison
911ba8cb8b Merge branch 'master' into jgrpp 2018-02-09 18:10:57 +00:00
translators
eec6167155 (svn r27968) -Update from Eints: 
korean: 1 change by telk5093
 2018-02-07 18:45:38 +00:00
Jonathan G Rennison
955126efac Improve pathfinder support for multiple docks 
The pathfinder can now find docks other than the Manhattan closest one.

Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
 2018-02-05 18:21:05 +00:00
Jonathan G Rennison
ed04845514 Merge branch 'ship_collision_avoidance' into jgrpp 2018-02-04 13:32:37 +00:00
HackaLittleBit
691ce0f1ea An assert could be triggered while looking beyond the map border. 
This patch fixes that.
 2018-02-04 12:49:30 +00:00
HackaLittleBit
fca03da2bb Add wormhole ship detection, one tile only! 2018-02-04 12:48:55 +00:00
HackaLittleBit
9326706eb9 Code cleanup and preparation for ships in wormhole detection 2018-02-04 12:48:02 +00:00
HackaLittleBit
80500f8f08 Rework z position 2018-02-04 12:47:36 +00:00
HackaLittleBit
64c8985cd7 Remove 90 degree comment 2018-02-04 12:47:03 +00:00
Jonathan G Rennison
9f628e7e9a Show stops with timetabled wait time of 0 in departure board 2018-01-31 19:02:59 +00:00
Jonathan G Rennison
ec661d7ae9 Merge branch 'template_train_replacement' into jgrpp 2018-01-30 18:58:34 +00:00
Jonathan G Rennison
4a9df57665 TBTR: Enable autorenew when template replacement active 2018-01-30 18:58:09 +00:00
Jonathan G Rennison
06a2457efc Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 2018-01-29 22:09:40 +00:00
Jonathan G Rennison
64d9f88802 TBTR: Fix bugs when both autoreplace and template replacement active on same vehicle 2018-01-29 22:08:26 +00:00
Jonathan G Rennison
233b0f8e9e TBTR: Add sanity check assertions 2018-01-29 22:05:55 +00:00