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

16674 Commits

Author SHA1 Message Date
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
Jonathan G Rennison
6ebea4b49c Merge v4 of house picking/placing patch. 2016-04-08 19:51:37 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
faf8dab12a Bump tracerestrict version due to group conditional. 2016-04-05 19:45:01 +01:00
Jonathan G Rennison
9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 2016-04-05 19:43:41 +01:00
Jonathan G Rennison
213b0e7e3a Tracerestrict: Add a group membership conditional. 2016-04-05 18:40:16 +01:00
translators
692458d8f5 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators
927d1a9490 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
Jonathan G Rennison
ec62878758 Merge branch 'crashlog_improvements' into jgrpp 2016-03-23 18:22:14 +00:00
Jonathan G Rennison
2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 2016-03-23 18:21:54 +00:00
Jonathan G Rennison
636ecc9f23 Merge branch 'master' into jgrpp 2016-03-23 18:05:28 +00:00
Jonathan G Rennison
0ea1d69ac0 Workaround console command to fix blocked heliports. 
This is for savegames affected by the improved breakdowns bug.
 2016-03-22 23:17:45 +00:00
Jonathan G Rennison
fa232ddaed Merge branch 'improved_breakdowns-sx' into jgrpp 2016-03-22 22:10:47 +00:00
Jonathan G Rennison
b59f1be235 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2016-03-22 22:10:19 +00:00
Jonathan G Rennison
7caebc2a77 Avoid aircraft leaving the state machine in the event of a breakdown. 
This can result in airport state machine blocks being left
erroneously occupied, blocking the airport.
 2016-03-22 22:08:26 +00:00
Jonathan G Rennison
196af4116e Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-03-21 21:44:22 +00:00
Jonathan G Rennison
bc48c6a219 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-03-21 21:44:12 +00:00
Jonathan G Rennison
a57c41b2c4 Fix height colour table not being checked/inited in viewport map mode. 2016-03-21 21:44:00 +00:00
Jonathan G Rennison
13c88dcef2 Merge branch 'template_train_replacement-sx' into jgrpp 2016-03-21 21:19:46 +00:00
Jonathan G Rennison
df421a55bb Fix air cache being leaked in CheckCaches. 2016-03-21 21:19:40 +00:00
Jonathan G Rennison
5519bf33b3 Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-03-21 21:18:56 +00:00
Jonathan G Rennison
31136bac50 Fix AfterLoadTemplateVehiclesUpdateImage clobbering the random seeds. 
This broke MP games with template replacement trains.
 2016-03-21 21:18:22 +00:00
Jonathan G Rennison
bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 2016-03-21 20:47:16 +00:00
Jonathan G Rennison
5359c43ec1 Add scope logging for Vehicle::PreDestructor. 2016-03-21 20:33:55 +00:00
Jonathan G Rennison
330a7327d6 Minor changes to avoid undefined behaviour warnings. 
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
 2016-03-21 20:22:01 +00:00
Jonathan G Rennison
a70b1e5e9e Avoid downcasting station/vehicle subtypes before checking the type field. 
This is because it generates a lot of spam warnings when running with
UndefinedBehaviourSantizer et al.
 2016-03-21 20:22:01 +00:00
Jonathan G Rennison
6ed6eeb478 Include _current_company in crashlog AI config. 2016-03-21 20:21:32 +00:00
translators
518eeac55f (svn r27525) -Update from Eints: 
latin: 18 changes by Supercheese
 2016-03-21 18:45:36 +00:00
Jonathan G Rennison
a703e2ff58 Increase verbosity of Pool assertion failure messages. 2016-03-21 18:22:52 +00:00
Jonathan G Rennison
6741c98f6b TBTR: Fix virtual trains being created at load using wrong company. 
Fix virtual trains showing up in company engine counts.
 2016-03-21 18:22:29 +00:00
translators
177c61477a (svn r27524) -Update from Eints: 
esperanto: 3 changes by LaPingvino
 2016-03-20 18:45:37 +00:00
Jonathan G Rennison
9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 2016-03-20 11:54:57 +00:00
translators
fe4d076dd8 (svn r27523) -Update from Eints: 
latvian: 1 change by Jancs
 2016-03-13 18:45:37 +00:00
Heiko August
aee3b77d99 translate-de: translation for lifetime profit strings 2016-03-13 12:36:36 +00:00
Heiko August
af036f3c52 translate-de: translation for ship collision avoidance patch 2016-03-13 12:36:32 +00:00
Heiko August
aabecf3998 translate-de: add translation for repair cost patch 2016-03-13 12:36:27 +00:00
Heiko August
40985ccb44 translate-de: add first strings of restricted signals patch 2016-03-13 12:36:05 +00:00
Jonathan G Rennison
c949ab72e4 Close read end of pipe after reading in gdb stack trace mode. 2016-03-10 19:40:20 +00:00
Jonathan G Rennison
def24030a4 Merge branch 'crashlog_improvements' into jgrpp 2016-03-10 00:17:43 +00:00
Jonathan G Rennison
320233fc9b Fix VehiclePositionIsAllowed triggering assertions on virtual trains. 
This fixes the bug where a bankruptcy/company reset when another
company owned a virtual train caused an assertion failure.
 2016-03-10 00:15:52 +00:00
Jonathan G Rennison
910edffee0 Add scope info logging for HandleSharingCompanyDeletion. 2016-03-10 00:15:52 +00:00
Jonathan G Rennison
a609439d98 Add support for enhanced crash log stacktraces using gdb on Linux. 
This attempts to use gdb to attach to the current process and print
a full backtrace.
 2016-03-10 00:14:26 +00:00
Jonathan G Rennison
f82002cda2 Use likely/__builtin_expect for assertion macros. 2016-03-10 00:13:58 +00:00
Jonathan G Rennison
4e020d4aa2 Increase verbosity of tile_map.h assertions. 2016-03-10 00:10:34 +00:00
Jonathan G Rennison
49988b37b8 Merge branches 'tracerestrict-sx' and 'template_train_replacement-sx' into jgrpp 2016-03-08 19:33:00 +00:00
Jonathan G Rennison
ca9f6411cc Implement adding a vehicle list to a new group. 2016-03-08 19:27:03 +00:00
Jonathan G Rennison
ec65659baf Merge branch 'tracerestrict' into tracerestrict-sx 2016-03-08 19:22:51 +00:00
Jonathan G Rennison
1f7232631f Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-03-08 19:22:17 +00:00
Jonathan G Rennison
cf638e836a TBTR: Clip drawing of template vehicles. 
This fixes long templates running off the side of the window and/or
obscuring the train length text.
 2016-03-08 19:22:00 +00:00