22c3a01069
Comment out additional includes of <cassert>
...
This overrode our own assert handler in stdafx.h
4 years ago
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
4 years ago
64b1c70fdd
Codechange: Add WARN_FORMAT to vseprintf and fix the cascade of warnings that followed
4 years ago
9895ced6af
Fix: Silence some warnings when building with clang-cl on VS 2019
...
Clang-cl presents as both _MSC_VER and __clang__ in the preprocessor which makes some things confusing.
4 years ago
56d54cf60e
Add: introduce CMake for project management
...
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc.
4 years ago
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
8aef14386f
Add: Optional implementation of std::optional for pre-C++17 compilers.
...
Sourced from https://github.com/akrzemi1/Optional , Boost Software License, Version 1.0.
4 years ago
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
4 years ago
196157b29e
Fix #7966 : SQInteger is 64-bit, print it as 64-bit
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
e81697c363
cpp-btree: Fix -Wdeprecated-copy warnings on GCC 9
5 years ago
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
5 years ago
6378a78817
Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)
5 years ago
71a3e83468
Fix: GCC9's warnings about deprecated implicit assignment operators
5 years ago
02bd91477d
Merge branch 'cpp-btree' into jgrpp
5 years ago
9176d9a284
cpp-btree: Update to match upstream
...
Add noexcept to swap-based move constructors and copy/move assignment operator
5 years ago
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
5 years ago
140a96b3a0
Change: Limit memory allocations for each Squirrel instance
...
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
5 years ago
f887b12be2
Add 3rd party mingw-std-threads headers to fix MinGW compilation
5 years ago
91e08c6cea
Merge branch 'cpp-btree' into jgrpp
6 years ago
7690fe8572
cpp-btree: Update to match upstream
...
minor optimization: minimize calls to end()
Minor optimization: increase the chances that the compiler will inline calls to end().
Has been observed to make a difference with gcc 4.9.3.
Fix build and warnings on MSVC (2017)
Uses static_assert, a C++11 feature. Also adds some explicit uses of
static_cast in order to suppress warnings about lossy type conversion.
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
5f86e1a390
Codechange: Silence -Wclass-memaccess warnings with GCC8
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
836d25e738
Codechange: Address some MSVC compiler warnings
6 years ago
8353a4d095
Merge branch 'cpp-btree' into jgrpp
6 years ago
133ccabf42
btree: Use static_assert instead of workaround macro
6 years ago
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
3bedb43de4
(svn r27896) -Fix: some warnings
7 years ago
062c736437
(svn r27896) -Fix: some warnings
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
344f39196f
cpp-btree: Remove remaining uses of ssize_t
...
This is due to issues building on Windows
7 years ago
418e9f4158
Remove assert.h include from btree.h, as this overrides OpenTTD's assert
7 years ago
b4cfb1adbc
Import cpp-btree library into 3rdparty section.
...
Repo: https://github.com/JGRennison/cpp-btree
Commmit: 6cabdb40fcbb7e12e6d499f92b898f6ec80ae0f1
Remove test program, build scripts, etc.
7 years ago
dd5e3d9f33
(svn r27605) -Fix: GCC 6 warning about misleading indentation
8 years ago
ac6312d33c
(svn r27605) -Fix: GCC 6 warning about misleading indentation
8 years ago
7e06cdb455
(svn r27561) -Fix [Squirrel]: Fix typos in error messages
8 years ago
576005b714
(svn r27561) -Fix [Squirrel]: Fix typos in error messages
8 years ago
809161ebf2
(svn r27289) -Fix: some uninitialised instance variables
9 years ago
d05ac99d52
(svn r27289) -Fix: some uninitialised instance variables
9 years ago
e700bc1e04
(svn r27233) -Fix [FS#6272]: crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer
9 years ago
5ed8ac8a81
(svn r27233) -Fix [FS#6272]: crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer
9 years ago
93fb724f87
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
10 years ago
396dde1636
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
10 years ago
660a95e5d2
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
10 years ago
771dcf3b7b
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
10 years ago
Jonathan G Rennison
TechGeekNZ
Charles Pigott
Niels Martin Hansen
Patric Stout
Michael Lutz
glx
S. D. Cloudt
frosch
rubidium
matthijs