fc4ea241b0
Merge branch 'master' into jgrpp
2 weeks ago
18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2 weeks ago
0a0b42a931
Bump OpenTTD content version to 14.1
2 weeks ago
f08da1d373
Codechange: the "no revision detected" string is with four zeros (norev0000) ( #12328 )
2 months ago
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
c29a7128c6
Bump upstream content version to 14.0
3 months ago
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
4 months ago
3683fdce6a
Bump OpenTTD content version to 13.4
5 months ago
eaae0bb5e7
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
...
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
10 months ago
e01101a334
Update vanilla content version sent to bananas
11 months ago
3b72241280
Bump OpenTTD content server vanilla compatibility version to 13.0
1 year ago
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
3 years ago
a8641ea44a
Add: support filtering content entries for patchpacks ( #9541 )
...
This changes nothing for us, but allows patchpacks to add the
right pieces of code to start filtering content entries on patchpack
only entries.
3 years ago
84cba1b842
Add: support filtering content entries for patchpacks
...
This changes nothing for us, but allows patchpacks to add the
right pieces of code to start filtering content entries on patchpack
only entries.
(cherry picked from commit 77860bb61e61307e4d9cf869ba62be8ca4d9d9b3)
3 years ago
a0cb27b73c
Add a release version string to rev.cpp
3 years ago
eca73a810c
Change: rebrand 1.12.0 to 12.0
...
One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.
We are following in the footstep of giants here.
3 years ago
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
3 years ago
d4f0b6f434
Fix: [CMake] Auto-fill version details in rev.cpp and ottres.rc ( #9066 )
3 years ago
5e14b54a0c
Merge branch 'master' into jgrpp
3 years ago
9bfa7198fd
Change: Heading for 1.12 now ( #8862 )
3 years ago
5034421ee4
Never set stable tag bit in NewGRF version value
4 years ago
9470ad050b
CMake: Fix configure defines
4 years ago
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
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
07c9621fcf
Merge branch 'master' into jgrpp
4 years ago
e0d20a44d2
Codechange: Use a dynamic copyright year
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
2f264f2c92
Change: Heading for 1.11 now
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
641b008374
Build: Add configure defines to detailed version output
5 years ago
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
5 years ago
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
5 years ago
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
5 years ago
a67ee02529
Change: Heading for 1.10 now ( #7319 )
5 years ago
39cda89e85
Add: Detect stable tags automatically, and set the 'stable' flag in '_openttd_newgrf_version' accordingly. ( #7317 )
5 years ago
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
5 years ago
46d97239c4
Codechange: Include flag for whether a build is of a tagged revision
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
67c6f945fb
Change: Include the full raw git revision hash in rev.cpp
5 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
6cf4d7d3ef
Fix: Put last SVN revision back in NewGRF version number ( #6843 )
...
This is necessary to be compatible with some Game Scripts that might trigger compatibility modes if the SVN revision part is wrong. Potentially some NewGRFs might also be affected.
See for example [SuperLib's Helper class](https://dev.openttdcoop.org/projects/superlib/repository/entry/helper.nut#L280 ), containing this function:
function _SuperLib_Helper::HasWorldGenBug()
{
local version = _SuperLib_Helper.GetOpenTTDVersion();
if (version.Major == 0 || (version.Major == 1 && version.Minor <= 3)) {
return version.Revision < 25339;
} else {
return version.Revision < 25305;
}
}
If this function sees a Revision value of zero, it might trigger a workaround not required, causing a regression in scripts dependent on this. The MinimalGS example, for one, will trigger this.
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
192770e6da
Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.
6 years ago
e0a62a9e55
Remove: [NewGRF] OpenTTD version no longer contains a revision number.
6 years ago
09d4735679
(svn r27993) -Change: Heading for 1.9 now
6 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
afcef7faa6
(svn r27780) -Update: Numbers
7 years ago
ed63b48e76
(svn r27780) -Update: Numbers
7 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
Jonathan G Rennison
Patric Stout
Rubidium
Loïc Guilloux
TechGeekNZ
glx
S. D. Cloudt
frosch
Niels Martin Hansen
frosch