Commit Graph

23092 Commits (5cc56d6ad989c4a78cd174d84249ba16b3c51cfe)
 

Author SHA1 Message Date
keldorkatarn 5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
8 years ago
Jonathan G Rennison 59677d5c6f Merge branch 'signal_tunnels_bridges-sx' into jgrpp 8 years ago
Jonathan G Rennison a974db6ade Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 8 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
Jonathan G Rennison 6ebea4b49c Merge v4 of house picking/placing patch. 8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
keldorkatarn 095229128d Fix crash when dragging two-directional block signals onto a bridge or tunnel
(cherry picked from commit 4199ba5981b2761d5226ebc89b315f00e62e1a3a)
8 years ago
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
8 years ago
Jonathan G Rennison faf8dab12a Bump tracerestrict version due to group conditional. 8 years ago
Jonathan G Rennison 9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 213b0e7e3a Tracerestrict: Add a group membership conditional. 8 years ago
translators 692458d8f5 (svn r27527) -Update from Eints:
tamil: 13 changes by aswn
8 years ago
translators 927d1a9490 (svn r27526) -Update from Eints:
malay: 2 changes by rionix88
8 years ago
Jonathan G Rennison 0cca19da9f Version: Committing version data for tag: jgrpp-0.12.1 8 years ago
Jonathan G Rennison ec62878758 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison 2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 8 years ago
Jonathan G Rennison 636ecc9f23 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 0ea1d69ac0 Workaround console command to fix blocked heliports.
This is for savegames affected by the improved breakdowns bug.
8 years ago
Jonathan G Rennison fa232ddaed Merge branch 'improved_breakdowns-sx' into jgrpp 8 years ago
Jonathan G Rennison b59f1be235 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 8 years ago
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.
8 years ago
Jonathan G Rennison 196af4116e Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 8 years ago
Jonathan G Rennison bc48c6a219 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 8 years ago
Jonathan G Rennison a57c41b2c4 Fix height colour table not being checked/inited in viewport map mode. 8 years ago
Jonathan G Rennison 13c88dcef2 Merge branch 'template_train_replacement-sx' into jgrpp 8 years ago
Jonathan G Rennison df421a55bb Fix air cache being leaked in CheckCaches. 8 years ago
Jonathan G Rennison 5519bf33b3 Merge branch 'template_train_replacement' into template_train_replacement-sx 8 years ago
Jonathan G Rennison 31136bac50 Fix AfterLoadTemplateVehiclesUpdateImage clobbering the random seeds.
This broke MP games with template replacement trains.
8 years ago
Jonathan G Rennison bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison 5359c43ec1 Add scope logging for Vehicle::PreDestructor. 8 years ago
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.
8 years ago
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.
8 years ago
Jonathan G Rennison 6ed6eeb478 Include _current_company in crashlog AI config. 8 years ago
translators 518eeac55f (svn r27525) -Update from Eints:
latin: 18 changes by Supercheese
8 years ago
Jonathan G Rennison a703e2ff58 Increase verbosity of Pool assertion failure messages. 8 years ago
Jonathan G Rennison 6741c98f6b TBTR: Fix virtual trains being created at load using wrong company.
Fix virtual trains showing up in company engine counts.
8 years ago
translators 177c61477a (svn r27524) -Update from Eints:
esperanto: 3 changes by LaPingvino
8 years ago
Jonathan G Rennison 9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 8 years ago
translators fe4d076dd8 (svn r27523) -Update from Eints:
latvian: 1 change by Jancs
8 years ago
Heiko August aee3b77d99 translate-de: translation for lifetime profit strings 8 years ago
Heiko August af036f3c52 translate-de: translation for ship collision avoidance patch 8 years ago
Heiko August aabecf3998 translate-de: add translation for repair cost patch 8 years ago
Heiko August 40985ccb44 translate-de: add first strings of restricted signals patch 8 years ago
Jonathan G Rennison c949ab72e4 Close read end of pipe after reading in gdb stack trace mode. 8 years ago
Jonathan G Rennison def24030a4 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
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.
8 years ago
Jonathan G Rennison 910edffee0 Add scope info logging for HandleSharingCompanyDeletion. 8 years ago
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.
8 years ago
Jonathan G Rennison f82002cda2 Use likely/__builtin_expect for assertion macros. 8 years ago
Jonathan G Rennison 4e020d4aa2 Increase verbosity of tile_map.h assertions. 8 years ago