dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,796 Commits 1 Branch 0 Tags
76f68c48f566eacb4582f7055303e52df080c9a4
Commit Graph

722 Commits

Author SHA1 Message Date
Jonathan G Rennison
b3ebb1f729 Infrastructure sharing patch: save/load changes. 2015-08-06 23:02:47 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +01:00
Jonathan G Rennison
a8c2c394a5 Merge branch 'improved_breakdowns-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
 2015-08-02 23:43:19 +01:00
Jonathan G Rennison
e91d0e49dc Improved breakdowns: Update save/load code 2015-08-02 23:16:33 +01:00
Jonathan G Rennison
d023d0863f Merge branch 'save_ext' into improved_breakdowns-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-02 23:01:56 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +01:00
Jonathan G Rennison
6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
 2015-08-02 18:23:25 +01:00
Jonathan G Rennison
6c81f8f35b Add departure boards and timetable tick status to SLXI info. 
Implementing converting timetable start date to/from ticks/days in
afterload code.
 2015-08-01 21:07:14 +01:00
Jonathan G Rennison
5f1b148cf9 Initial minimal working tracerestrict implementation. 
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
 2015-07-28 01:36:52 +01:00
frosch
c5a4b89915 (svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying. 2015-06-27 11:46:41 +00:00
frosch
613212c486 (svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying. 2015-06-27 11:46:41 +00:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
ab3660278a (svn r26880) -Add: stub settings for limiting bridge and map height 2014-09-21 11:27:34 +00:00
rubidium
f41b55f0ff (svn r26880) -Add: stub settings for limiting bridge and map height 2014-09-21 11:27:34 +00:00
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
173a234951 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 2014-09-21 11:20:11 +00:00
rubidium
0ac2d3b324 (svn r26876) -Codechange: move 'has bride above' data from m6 to type 2014-09-21 11:20:11 +00:00
rubidium
f82c07b582 (svn r26875) -Codechange: move TropicZone information from m6 to type 2014-09-21 11:18:10 +00:00
rubidium
47852f119e (svn r26875) -Codechange: move TropicZone information from m6 to type 2014-09-21 11:18:10 +00:00
rubidium
337af973b0 (svn r26873) -Change: split type_height into a type and height array (ic111) 2014-09-21 11:14:58 +00:00
rubidium
04e2324b8f (svn r26873) -Change: split type_height into a type and height array (ic111) 2014-09-21 11:14:58 +00:00
rubidium
39ded38c01 (svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111) 2014-09-21 06:35:34 +00:00
rubidium
c0771b1657 (svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111) 2014-09-21 06:35:34 +00:00
rubidium
8ab4f746f2 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
9e0f4b3847 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
c225276a7a (svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP) 2014-09-14 15:11:33 +00:00
rubidium
32c56b5f84 (svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP) 2014-09-14 15:11:33 +00:00
rubidium
fb9dbf30fa (svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore) 2014-05-11 18:02:11 +00:00
rubidium
89c25b955e (svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore) 2014-05-11 18:02:11 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
eb6974179d (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 2014-02-07 23:48:56 +00:00
frosch
41b7a04a68 (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 2014-02-07 23:48:56 +00:00
frosch
74916a103e (svn r26175) -Add: Log in desync output when persistent storage is discarded. 2013-12-23 18:09:29 +00:00
frosch
49852e3dac (svn r26175) -Add: Log in desync output when persistent storage is discarded. 2013-12-23 18:09:29 +00:00
frosch
7fcae50579 (svn r26169) -Fix-ish [FS#5831-ish]: Unify the time a RV needs to travel through a curve. 2013-12-22 11:55:07 +00:00
frosch
b02179bd8e (svn r26169) -Fix-ish [FS#5831-ish]: Unify the time a RV needs to travel through a curve. 2013-12-22 11:55:07 +00:00
rubidium
8a419c7f46 (svn r25954) -Fix [FS#5731]: All semaphores got converted to electric signals when loading savegames from v15 to v20 (adf88) 2013-11-08 21:27:56 +00:00
rubidium
1ffcdbd515 (svn r25954) -Fix [FS#5731]: All semaphores got converted to electric signals when loading savegames from v15 to v20 (adf88) 2013-11-08 21:27:56 +00:00
rubidium
7b8ad4dc3b (svn r25953) -Fix [FS#5732]: Wrong bits used when converting signal types/variants while loading savegames older than v64 (adf88) 2013-11-08 21:25:35 +00:00
rubidium
a7fd0f8f5d (svn r25953) -Fix [FS#5732]: Wrong bits used when converting signal types/variants while loading savegames older than v64 (adf88) 2013-11-08 21:25:35 +00:00
frosch
336dc88c19 (svn r25855) -Fix [FS#5788] (r25833): Obiwan messed up savegame conversion. 2013-10-13 10:51:58 +00:00
frosch
871519f75a (svn r25855) -Fix [FS#5788] (r25833): Obiwan messed up savegame conversion. 2013-10-13 10:51:58 +00:00
zuu
27b153d16a (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 2013-10-12 22:23:43 +00:00
zuu
fb5dc7762b (svn r25852) -Codechange: Merge GetFenceXX/SetFenceXX into one common GetFonce/SetFence for all directions that take an extra direction parameter (cirdan, LordAro) 2013-10-12 22:23:43 +00:00