Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
2019-11-12 18:43:10 +00:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
2019-10-05 21:45:54 +01:00 |
|
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
2019-09-29 21:27:32 +01:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
1cc545c816
|
Fix iterator invalidation issues in CargoPacketList actions
See: #48
|
2018-04-30 16:55:07 +01: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
|
68fc5c5351
|
(svn r26330) -Fix: the theoretical case of rerouting cargo from one VehicleCargoList to another.
|
2014-02-10 18:55:03 +00:00 |
|
fonsinchen
|
82ece7db12
|
(svn r26330) -Fix: the theoretical case of rerouting cargo from one VehicleCargoList to another.
|
2014-02-10 18:55:03 +00:00 |
|
fonsinchen
|
6ce6fd05d8
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
2013-06-23 08:28:53 +00:00 |
|
fonsinchen
|
3dd811e179
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
2013-06-23 08:28:53 +00:00 |
|
fonsinchen
|
f022550df9
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
2013-06-09 13:03:48 +00:00 |
|
fonsinchen
|
04e3eb6fab
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
2013-06-09 13:03:48 +00:00 |
|
rubidium
|
f225f497d5
|
(svn r25053) -Fix [FS#5488, FS#5484] (r25010): transfer credits were not given
|
2013-02-27 22:12:53 +00:00 |
|
rubidium
|
c3b0bd7d58
|
(svn r25053) -Fix [FS#5488, FS#5484] (r25010): transfer credits were not given
|
2013-02-27 22:12:53 +00:00 |
|
rubidium
|
7dd2354a13
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
2013-02-17 14:54:50 +00:00 |
|
rubidium
|
cdb0a76958
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
2013-02-17 14:54:50 +00:00 |
|
rubidium
|
79b74a5925
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
2013-02-17 14:36:40 +00:00 |
|
rubidium
|
d6e2a8aa56
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
2013-02-17 14:36:40 +00:00 |
|