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

17442 Commits

Author SHA1 Message Date
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-19 12:12:52 +00:00
alberth
17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
1f70279419 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 2017-03-18 20:48:54 +00:00
alberth
119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
b110c9c259 (svn r27800) -Change: Rename long aircraft string names of the preview window 2017-03-18 20:47:48 +00:00
alberth
fa5fd39c23 (svn r27799) -Add: Display aircraft type in buy window (patch by Samu) 2017-03-18 20:46:15 +00:00
alberth
7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00
alberth
e2e9bd0b25 (svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu) 2017-03-18 20:43:43 +00:00
frosch
206a0838e9 (svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal. 2017-03-18 17:14:53 +00:00
translators
5c7f97aff2 (svn r27795) -Update from Eints: 
luxembourgish: 3 changes by Phreeze
 2017-03-14 18:45:36 +00:00
peter1138
36837a070c (svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding. 2017-03-14 00:57:52 +00:00
peter1138
57745b1c74 (svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status. 2017-03-13 22:16:44 +00:00
translators
9169ab6ce2 (svn r27789) -Update from Eints: 
polish: 3 changes by wojteks86
greek: 1 change by kyrm
 2017-03-13 18:45:37 +00:00
peter1138
a77044f185 (svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger. 2017-03-13 07:37:05 +00:00
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
 2017-03-12 20:37:26 +00:00
Jonathan G Rennison
c1a26459d8 Merge branch 'chunnel' into jgrpp 
# Conflicts:
#	src/ground_vehicle.hpp
 2017-03-12 20:36:04 +00:00
HackaLittleBit
de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 2017-03-12 20:33:59 +00:00
peter1138
980871a87b (svn r27787) -Fix: Update scrollbar when rebuilding AI/GS setting list. 2017-03-12 18:19:01 +00:00
peter1138
9a489375e3 (svn r27786) -Fix [FS#6479]: AI configuration changed incorrect parameter when some parameters are hidden. 2017-03-12 16:33:40 +00:00
peter1138
c366425de6 (svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu). 2017-03-12 15:32:40 +00:00
peter1138
7501b7cf7a (svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu). 2017-03-12 15:26:31 +00:00
frosch
ed63b48e76 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
d3de080883 (svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames. 2017-03-11 20:37:32 +00:00
frosch
bc61ff380a (svn r27777) -Doc: Yearly increment 2017-03-11 16:49:51 +00:00
frosch
ffcdd47321 (svn r27776) -Merge: Documentation updates from 1.6 branch 2017-03-11 13:34:01 +00:00
frosch
51c6ae62d1 (svn r27775) -Fix [FS#6510]: Insufficient thread synchronisation when switching blitters. (JGR) 2017-03-11 13:05:54 +00:00
frosch
5b7a04ca27 (svn r27774) -Fix [FS#5889]: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows. 
-Revert (r23978): No SDL-specific fix required anymore. The new fix applies to all backends.
 2017-03-11 12:52:26 +00:00
Jonathan G Rennison
d14d5731d8 Fix wrong palette being used when switching to animated blitter. 
Fixes black sprites and UI elements when switching on full
animations on win32 and OSX.
 2017-03-07 23:37:06 +00:00
frosch
5e28cc4757 (svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options. 2017-03-07 20:18:54 +00:00
Jonathan G Rennison
2d473c05b0 Fix use-after-free when switching blitters in SDL and Win32 modes. 
This mostly occurs when disabling pallete animation when fast-forward
is enabled.
 2017-03-07 19:12:15 +00:00
translators
4d12cce1c4 (svn r27771) -Update from Eints: 
malay: 27 changes by stress_043
 2017-03-07 18:45:38 +00:00
Jonathan G Rennison
93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 2017-03-05 19:13:42 +00:00
Jonathan G Rennison
4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel 
Use this to avoid inclination change code in non-chunnel wormholes.
 2017-03-05 18:37:35 +00:00
Jonathan G Rennison
ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 2017-03-05 18:05:04 +00:00
fonsinchen
0d5ee772fc (svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR) 2017-03-05 17:06:14 +00:00
Jonathan G Rennison
68c280bef8 Ifdef out expensive assert in non-debug mode. 
The vehicle slope algorithm goes to pains to avoid GetSlopePixelZ,
but then calls it anyway in the assert...
 2017-03-05 16:58:28 +00:00
Jonathan G Rennison
0690dbb8bf Merge branch 'jgrpp' into chunnel 2017-03-05 15:30:27 +00:00
Jonathan G Rennison
fa044852d5 Merge branch 'day_length' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
 2017-03-05 15:29:45 +00:00
Jonathan G Rennison
1f148322fb Reset day length factor to 1 when loading pre day length savegame 2017-03-05 15:25:34 +00:00
Jonathan G Rennison
11906f24c5 Merge branch 'save_ext' into day_length 2017-03-05 15:05:13 +00:00
frosch
bc2382af06 (svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF. 2017-03-05 14:45:13 +00:00
frosch
724f1f3b69 (svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values. 2017-03-05 14:44:15 +00:00
frosch
f469b0be3e (svn r27767) -Codechange: Industries and houses should just use the default-case in Action 4. 2017-03-05 14:43:21 +00:00
frosch
4180276c81 (svn r27766) -Fix: Obiwan opposed translations for text id D3FF and DCFF in Action 13. 2017-03-05 14:42:41 +00:00
Jonathan G Rennison
500ef49694 Chunnel: Double cost of building and removing chunnels. 2017-03-05 14:39:17 +00:00
Jonathan G Rennison
89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 2017-03-05 14:39:10 +00:00
Jonathan G Rennison
ad15b47f72 Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID. 2017-03-05 14:39:06 +00:00
Jonathan G Rennison
afd8c6b867 Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit. 
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
 2017-03-05 14:39:01 +00:00
Jonathan G Rennison
87142ed840 Add a PreCleanPool() static method to pool item types. 2017-03-04 23:39:27 +00:00
Jonathan G Rennison
702404dc6a Fix issues with uncleared variables when loading old save games. 2017-03-04 20:28:07 +00:00