Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
2021-01-31 01:08:35 +00:00 |
|
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
2020-12-27 10:55:42 +00: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
|
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
|
2fdcc52321
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
|
2019-02-13 19:09:06 +00:00 |
|
Peter Nelson
|
64878320cc
|
Fix #6803: CargoMonitorID bit packing updated to handle 64 cargo types.
This requires a saveload bump to change the bitpacking on loading older saves.
|
2019-02-04 20:43:14 +00: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 |
|
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 |
|
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 |
|