Commit Graph

290 Commits (016f0bdfaf1e551b60c1656df00bfc6ccd5bebc5)

Author SHA1 Message Date
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
6 years ago
Patric Stout aef69443e7 Remove: WinCE support 6 years ago
Patric Stout 85adde7485 Remove: PSP support 6 years ago
Charles Pigott dd6b82d6b2 Codechange: Simplify C++11 check for assert_compile 6 years ago
Jonathan G Rennison a93cc441a9 Merge branch 'cpp-11' into jgrpp 7 years ago
Jonathan G Rennison 2b38268e2f Add printf format codes for 64-bit unsigned integers 7 years ago
frosch 24a1b82840 (svn r27916) -Codechange: Enable usage of static_assert for MSVC 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
Jonathan G Rennison f3a0aace0c Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison a8e0862500 Enable prefetch and bswap buitins for clang. 8 years ago
Jonathan G Rennison 34040b694c Make use of override unconditional. 8 years ago
Jonathan G Rennison 8ad53acfef Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison f7774415f2 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	src/stdafx.h
8 years ago
Jonathan G Rennison 390a22f864 Enable FINAL, (un)linkely, __attribute__ for clang. 8 years ago
Jonathan G Rennison 5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison bb6ea150a3 Use likely/__builtin_expect for assertion macros.
(cherry picked from commit f82002cda2)
8 years ago
Jonathan G Rennison 0b7d68a6d1 Add support for verbose asserts.
(cherry picked from commit 48e4c35fdc)
8 years ago
Jonathan G Rennison 51099c3572 Unconditionally use static_assert. 8 years ago
Jonathan G Rennison def24030a4 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison f82002cda2 Use likely/__builtin_expect for assertion macros. 8 years ago
Jonathan G Rennison 5dba89c783 Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	source.list
#	src/openttd.cpp
#	src/stdafx.h
#	src/vehicle.cpp
8 years ago
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.
8 years ago
Jonathan G Rennison 48e4c35fdc Add support for verbose asserts.
Use for test/exec DoCommand mismatches.
8 years ago
Jonathan G Rennison 155987a4aa Fix override being used on gcc 4.3 to 4.6. 9 years ago
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.
9 years ago
Jonathan G Rennison 19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
michi_cc 35b77450f8 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 9 years ago
michi_cc 0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 9 years ago
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
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison 0b09a7ac61 Add a conditional define for the override keyword.
Use of the override keyword can prevent various types of problems when
the base method signature is changed, but derived overriding methods are
not. This is conditional to maintain compatibility with legacy compilers.
9 years ago
rubidium f0924bb910 (svn r27109) -Fix (r27102): MinGW compilation 10 years ago
rubidium 889780adce (svn r27109) -Fix (r27102): MinGW compilation 10 years ago
rubidium 978d4e4eaa (svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer 10 years ago
rubidium 730773f5f1 (svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer 10 years ago
fonsinchen 0affe0e119 (svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported 10 years ago
fonsinchen 28bd8a3d83 (svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported 10 years ago
frosch 049c7dba29 (svn r26922) -Fix: Include strings.h on HAIKU for strcasecmp. Some platforms do not have a strings.h at all, most define the functions in string.h as well. 10 years ago
frosch 9d209829eb (svn r26922) -Fix: Include strings.h on HAIKU for strcasecmp. Some platforms do not have a strings.h at all, most define the functions in string.h as well. 10 years ago
rubidium 95549e6da5 (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 10 years ago
rubidium 7c4e9dd71d (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 10 years ago
rubidium e874be7691 (svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD 10 years ago
rubidium 7a00d2e849 (svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium baa9dd4b5d (svn r26500) -Cleanup: remove unused snprintf implementation 10 years ago
rubidium 99452c51ce (svn r26500) -Cleanup: remove unused snprintf implementation 10 years ago