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
Patric Stout
1c5ea33099
Fix: warnings when compiling for a recent version of Haiku
...
This might break older Haiku versions, but it is hard to tell.
2019-03-05 22:22:00 +01:00
Patric Stout
f58db44ff2
Remove: BeOS support (deprecated by Haiku)
...
In 10 years there is no commit to change how BeOS 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), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
2019-03-05 22:03:00 +01:00
Patric Stout
ad30d04b5e
Codechange: removed some left-behind __NDS__ references
2019-03-05 22:03:00 +01:00
Patric Stout
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 :(
2019-03-05 22:03:00 +01:00
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
2019-01-02 16:09:44 +00:00
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
2018-12-27 18:09:16 +01:00
glx
3be6ab555c
Change: use vcpkg integration in Visual Studio
...
Removes the need for us to provide OpenTTD-useful package
2018-12-26 17:29:11 +01:00
Jonathan G Rennison
5661763d6a
Merge branch 'crashlog_improvements' into jgrpp
2018-07-26 19:04:34 +01:00
Jonathan G Rennison
7f027f8dca
Add tile info dump function and assert variants
2018-07-26 18:48:53 +01:00
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
2018-07-24 18:30:42 +01:00
Charles Pigott
63898f61b0
Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style
2018-07-19 20:24:17 +02:00
Jonathan G Rennison
fd4d9591c1
Merge branch 'save_ext' into jgrpp
2018-06-06 01:56:07 +01:00
Jonathan G Rennison
f05ca1ba91
Merge branch 'cpp-11' into save_ext
2018-06-06 01:55:09 +01:00
Jonathan G Rennison
183a5cb114
Add unaligned uint 16, 32, 64 typedefs
2018-06-06 01:54:37 +01:00
Jonathan G Rennison
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
2018-05-25 19:09:20 +01:00
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
2018-05-03 23:54:51 +01:00
Patric Stout
aef69443e7
Remove: WinCE support
2018-04-29 15:32:16 +02:00
Patric Stout
85adde7485
Remove: PSP support
2018-04-29 15:32:16 +02:00
Jonathan G Rennison
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
2018-04-27 00:33:44 +01:00
Charles Pigott
dd6b82d6b2
Codechange: Simplify C++11 check for assert_compile
2018-04-11 18:24:19 +02:00
Jonathan G Rennison
a93cc441a9
Merge branch 'cpp-11' into jgrpp
2017-10-05 18:20:54 +01:00
Jonathan G Rennison
2b38268e2f
Add printf format codes for 64-bit unsigned integers
2017-10-05 18:20:29 +01:00
frosch
24a1b82840
(svn r27916) -Codechange: Enable usage of static_assert for MSVC
2017-09-24 13:35:27 +00:00
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
2017-09-04 01:22:54 +01:00
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
2017-08-15 18:44:17 +01:00
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
Jonathan G Rennison
a8e0862500
Enable prefetch and bswap buitins for clang.
2016-09-08 20:00:56 +01:00
Jonathan G Rennison
34040b694c
Make use of override unconditional.
2016-09-08 19:47:59 +01:00
Jonathan G Rennison
8ad53acfef
Merge branch 'crashlog_improvements' into jgrpp
2016-09-08 19:41:53 +01:00
Jonathan G Rennison
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
2016-09-08 19:36:00 +01:00
Jonathan G Rennison
390a22f864
Enable FINAL, (un)linkely, __attribute__ for clang.
2016-09-08 18:38:53 +01:00
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
Jonathan G Rennison
bb6ea150a3
Use likely/__builtin_expect for assertion macros.
...
(cherry picked from commit f82002cda2
)
2016-09-05 22:46:01 +01:00
Jonathan G Rennison
0b7d68a6d1
Add support for verbose asserts.
...
(cherry picked from commit 48e4c35fdc
)
2016-09-05 22:46:01 +01:00
Jonathan G Rennison
51099c3572
Unconditionally use static_assert.
2016-09-05 22:46:01 +01:00
Jonathan G Rennison
def24030a4
Merge branch 'crashlog_improvements' into jgrpp
2016-03-10 00:17:43 +00:00
Jonathan G Rennison
f82002cda2
Use likely/__builtin_expect for assertion macros.
2016-03-10 00:13:58 +00:00
Jonathan G Rennison
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
2016-02-17 22:56:15 +00:00
Jonathan G Rennison
5cf2b04f6a
Initial implementation of scope guard logging for including in crash logs.
...
This adds a mechanism to create scope guards with an associated std::function
which is called to output diagnostic info in the event of a crash.
Add a macro to make it easy to efficiently capture variables on the stack
and output a formatted message.
Requires C++11, #ifdefed out for legacy compilers.
2016-02-17 22:41:07 +00:00
Jonathan G Rennison
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
2016-02-17 22:41:07 +00:00
Jonathan G Rennison
155987a4aa
Fix override being used on gcc 4.3 to 4.6.
2016-01-08 17:01:37 +00:00
Jonathan G Rennison
d00fa4d25b
Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.
...
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter mode.
Fix memory leak in current 32bpp animated blitters.
2015-12-17 20:45:33 +00:00
Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-08-11 21:41:58 +01:00
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
michi_cc
35b77450f8
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
2015-08-05 21:54:11 +01:00