miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,288 Commits 14 Branches 28 Tags
39ba220eca315ad0b9fae6833fdaaefa2d814d74
Commit Graph

898 Commits

Author SHA1 Message Date
Sergii Pylypenko
66e3334f0e Merge upstream branch 1.8 2018-05-31 22:59:50 +03:00
frosch
2b933a1b3b (svn r27862) [1.7] -Backport from trunk: 
- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793)
- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790)
- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788)
- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786)
- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785)
- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784)
 2018-05-31 22:05:28 +03:00
frosch
db54db00df (svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu) 2018-03-11 12:46:05 +00:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Sergii Pylypenko
b4cc822085 Merge svn r27779 
Conflicts:
	src/autoreplace_gui.cpp
	src/economy.cpp
	src/fios_gui.cpp
	src/lang/spanish_MX.txt
	src/network/network_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/toolbar_gui.cpp
	src/window.cpp
 2017-03-17 23:14:41 +02:00
peter1138
d31f9a83e7 (svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger. 2017-03-13 07:37:05 +00:00
frosch
0b2f8c13a2 (svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations. 2016-05-29 13:35:17 +00:00
frosch
b0c56f3432 (svn r27585) -Fix [FS#6437]: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations. 2016-05-29 13:35:17 +00:00
frosch
a66e0ff1f4 (svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment. 2016-05-29 13:33:20 +00:00
frosch
dac94c7cbc (svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment. 2016-05-29 13:33:20 +00:00
Sergii Pylypenko
595727c438 Fix for vehicles unable to fully load 2016-04-08 21:45:29 +03:00
pelya
dbdf6273a3 Lazy fix for crash https://bugs.openttd.org/task/6437 2016-04-08 21:45:28 +03:00
frosch
a7849377dd (svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei) 2015-05-11 16:58:09 +00:00
frosch
32cb62a242 (svn r27282) -Fix [FS#6254]: Enforce the company's default service intervals when purchasing another company. (Johnnei) 2015-05-11 16:58:09 +00:00
frosch
eccbe842b3 (svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes. 2015-05-11 16:53:05 +00:00
frosch
e686add63a (svn r27281) -Codechange: Do not shadow local variables with other local variables in sub-scopes. 2015-05-11 16:53:05 +00:00
fonsinchen
1b8186ea8e (svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already 2014-09-24 20:56:52 +00:00
fonsinchen
75cb16a7d7 (svn r26918) -Fix [FS#6110]: Reserve cargo only after unloading finished or if the vehicle has the desired cargo already 2014-09-24 20:56:52 +00:00
fonsinchen
7306fe015d (svn r26917) -Revert (r26857): It broke improved loading. 2014-09-24 20:55:47 +00:00
fonsinchen
d6fc217136 (svn r26917) -Revert (r26857): It broke improved loading. 2014-09-24 20:55:47 +00:00
fonsinchen
e353f22dc1 (svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary. 2014-09-20 09:41:25 +00:00
fonsinchen
c4902c4150 (svn r26857) -Fix [FS#6110]: Reserve cargo after refitting and only if necessary. 2014-09-20 09:41:25 +00:00
fonsinchen
672b14a7c6 (svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo 2014-09-18 17:49:19 +00:00
fonsinchen
dfbcd8869d (svn r26847) -Fix [FS#6110]: Don't assign a next hop when returning cargo 2014-09-18 17:49:19 +00:00
fonsinchen
b2e322a3fc (svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit) 2014-05-13 19:16:04 +00:00
fonsinchen
3648e95265 (svn r26586) -Fix [FS#5995]: Consider multiheaded trains in station refits (and clean up a bit) 2014-05-13 19:16:04 +00:00
rubidium
81c2d75048 (svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens 
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
 2014-05-11 18:31:38 +00:00
rubidium
b590a64718 (svn r26581) -Fix [FS#5989]: transfering cargo to a station doesn't give that station a rating and thus the cargo does not decay... until the first pickup happens 
For cargo drops from industries/houses, the station gets a rating too so why not when cargo is dropped at the station from a train?
 2014-05-11 18:31:38 +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
fonsinchen
b8381b6b25 (svn r26549) -Change: better estimation for link capacities during full load 2014-05-01 14:50:52 +00:00
fonsinchen
11d98f043e (svn r26549) -Change: better estimation for link capacities during full load 2014-05-01 14:50:52 +00:00
fonsinchen
d5bd72296b (svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle 2014-05-01 14:49:44 +00:00
fonsinchen
b5566ae6ec (svn r26548) -Codechange: move updating of load_unload_ticks out of LoadUnloadVehicle 2014-05-01 14:49:44 +00:00
fonsinchen
c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
fonsinchen
c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
fonsinchen
ba66343558 (svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way. 2014-04-23 20:22:27 +00:00
fonsinchen
49f27eb247 (svn r26483) -Fix: Allow single-vehicle consists to station-refit in a meaningful way. 2014-04-23 20:22:27 +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
fonsinchen
fbd6707afc (svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER. 2014-02-09 21:10:25 +00:00
fonsinchen
88787412b6 (svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER. 2014-02-09 21:10:25 +00:00
fonsinchen
06548d7b05 (svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft 2014-01-12 17:44:55 +00:00
fonsinchen
9ad173c9cc (svn r26236) -Fix: Don't overreserve after autorefit, but do reserve mail for aircraft 2014-01-12 17:44:55 +00:00
fonsinchen
feaeb497e7 (svn r26188) -Codechange: Move station refitting to a separate function. 2013-12-30 14:50:45 +00:00
fonsinchen
ecdd796a86 (svn r26188) -Codechange: Move station refitting to a separate function. 2013-12-30 14:50:45 +00:00
fonsinchen
7d5640166f (svn r26187) -Fix: allow refitting at station if cargo has already been reserved. 2013-12-30 14:50:09 +00:00
fonsinchen
63b43ed914 (svn r26187) -Fix: allow refitting at station if cargo has already been reserved. 2013-12-30 14:50:09 +00:00