43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
79240eab1e
Codechange: Make use of the improved C++17 emplace_back function.
4 years ago
e2de103d82
Skip GRF compatibility check when using -K/-q switches
4 years ago
eef6ad7b2a
Crash log: Save config file in new crash save chunk
4 years ago
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
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
6792495705
Add -K switch to write savegame debug data and exit
5 years ago
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
5b77102b63
Codechange: use std::sort() to sort file lists
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
5 years ago
aa7ca7fe64
Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
b1190b32b0
Merge branch 'master' into jgrpp
6 years ago
868c6f924a
Add: Filter box to the save and load windows ( #6974 )
...
Save and heightmap names can be filtered.
6 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
7 years ago
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
7 years ago
ec9a920aab
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
7 years ago
8bd3a8a991
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
7 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
df9a9f074a
(svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it.
8 years ago
c3bed437ee
(svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it.
8 years ago
88bdf482c0
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
8 years ago
3b84827773
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
8 years ago
75ad6d0100
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
ec2b2fad58
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
2d7201781b
(svn r27646) -Codechange: Move _fios_items variable into the SaveLoadWindow class.
8 years ago
ac72a6b1ed
(svn r27646) -Codechange: Move _fios_items variable into the SaveLoadWindow class.
8 years ago
d6cd3b1605
(svn r27644) -Codechange: Split GetFiosItem into BuildFileList and FindItem, and move both to FileList.
8 years ago
8a9e9f838b
(svn r27644) -Codechange: Split GetFiosItem into BuildFileList and FindItem, and move both to FileList.
8 years ago
caf3379746
(svn r27642) -Codechange: FiosGet* file query functions take a destination file list.
8 years ago
93baf192a0
(svn r27642) -Codechange: FiosGet* file query functions take a destination file list.
8 years ago
bc08fe7c5f
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
8 years ago
a38cdeccc0
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
8 years ago
2fa0fdb176
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
9135f7130e
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
d6812947f3
(svn r27634) -Codechange: Improve name of the SmallFiosItem struct.
8 years ago
Jonathan G Rennison
Michael Lutz
S. D. Cloudt
glx
Henry Wilson
glx22
damfr
frosch
alberth