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

17518 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
79439925c8 Clear discardable chunk IDs in SlXvResetState. 2017-03-04 20:09:42 +00:00
translators
3342c5a367 (svn r27765) -Update from Eints: 
russian: 4 changes by Lone_Wolf
 2017-03-04 18:45:36 +00:00
Jonathan G Rennison
212f6ce6ef Chunnel: Add setting to enable construction, default off. 2017-03-04 13:23:52 +00:00
Jonathan G Rennison
3fde2cb5b1 Remove unused constant from newgrf_config.cpp 2017-03-04 13:20:21 +00:00
Jonathan G Rennison
02b33e7f64 Chunnel: Add error text for too many tunnels. 2017-03-04 13:06:43 +00:00
Jonathan G Rennison
ab38623ea6 Chunnel: Adjust documentation and whitespace in tunnel_map.h 2017-03-04 12:43:48 +00:00
Jonathan G Rennison
75410ddae4 Chunnel: Save/load changes 2017-03-04 12:39:32 +00:00
Jonathan G Rennison
aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 2017-03-04 12:36:01 +00:00
Jonathan G Rennison
ee0d6e2fe6 Chunnel: Remove debug prints from afterload code. 2017-03-04 12:24:00 +00:00
Jonathan G Rennison
04244e7215 Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld 2017-03-04 12:23:56 +00:00
Jonathan G Rennison
21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 2017-03-04 12:23:52 +00:00
Jonathan G Rennison
13a716980a Chunnel: String text adjustments. 2017-03-04 12:10:54 +00:00
HackaLittleBit
7e6215f271 Chunnel patch 28401: Add: Tile description chunnel. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 2017-03-04 11:59:36 +00:00
HackaLittleBit
15c8e67655 Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 2017-03-04 11:59:33 +00:00
HackaLittleBit
7808370f86 Chunnel patch 28399: debug [modified] 
Don't remove other debug outputs

https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:53:51 +00:00
HackaLittleBit
f173b74e81 Chunnel patch 28398: Codechange: Save Tunnel Pool. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:53:48 +00:00
HackaLittleBit
1ac8f66de1 Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:50:52 +00:00
HackaLittleBit
dfce9cc4c0 Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:12 +00:00
HackaLittleBit
dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:07 +00:00
HackaLittleBit
f7ced74c22 Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:48:00 +00:00
HackaLittleBit
67e7d12eb7 Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:44:25 +00:00
HackaLittleBit
ad070b91ea Chunnel patch 28392: Add: Basic tunnel pool. (no save) 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 2017-03-04 11:43:53 +00:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
Jonathan G Rennison
9c74da46b1 Change send money to company messages to be broadcasts. 
Adjust text formatting depending on whether current client is
the source, destination or neither.
 2017-03-03 22:37:43 +00:00