Jonathan G Rennison
|
e5a421b65a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/economy.cpp
# src/linkgraph/refresh.cpp
# src/order_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_base.h
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
|
2022-03-04 18:17:44 +00:00 |
|
dP
|
36bee83864
|
Change: Deliver cargo to the closest industry first (#9536)
|
2022-02-19 19:08:23 +01:00 |
|
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
|
5e6d283463
|
Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
|
2019-03-13 03:38:26 +00:00 |
|
peter1138
|
94b40fd530
|
Codechange: Convert IndustryVector to a std::set.
|
2019-03-09 16:33:47 +00:00 |
|
Jonathan G Rennison
|
7ff252c58d
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
|
2019-03-04 01:18:25 +00:00 |
|
Samu
|
780593ae60
|
Fix #6633: Cargo monitor industry delivery now accounts for which IndustryID the cargo was delivered to
|
2019-03-02 18:14:45 +01:00 |
|
Jonathan G Rennison
|
9d5f34fea6
|
Replace various uses of std::set/map with btree containers.
|
2017-02-08 00:18:09 +00:00 |
|
alberth
|
ee7700ef78
|
(svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters.
|
2014-07-12 17:04:14 +00:00 |
|
alberth
|
8fe8765aaa
|
(svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters.
|
2014-07-12 17:04:14 +00:00 |
|
alberth
|
6fd3eaa287
|
(svn r26684) -Doc: Improve Doxygen markup with a few links to a constant and functions.
|
2014-07-12 12:21:40 +00:00 |
|
alberth
|
98194e7b6a
|
(svn r26684) -Doc: Improve Doxygen markup with a few links to a constant and functions.
|
2014-07-12 12:21:40 +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 |
|
zuu
|
86c9cb9b8a
|
(svn r24986) -Change: Cleanup goals and cargo monitors of companies when they go bankrupt or are taken over.
|
2013-02-10 19:49:04 +00:00 |
|
zuu
|
b1016f66ba
|
(svn r24986) -Change: Cleanup goals and cargo monitors of companies when they go bankrupt or are taken over.
|
2013-02-10 19:49:04 +00:00 |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
alberth
|
a7158589f3
|
(svn r24404) -Add: Data structures for cargo transport monitoring.
|
2012-07-15 17:05:17 +00:00 |
|
alberth
|
1d11291071
|
(svn r24404) -Add: Data structures for cargo transport monitoring.
|
2012-07-15 17:05:17 +00:00 |
|