18006 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Allofich	4f08084e79	Make stationary actors return to position on load ... Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends. (Fixes #3656)	2017-06-15 18:33:50 +09:00
scrawl	3356fb81ce	Merge pull request #1280 from Allofich/guard ... Make guards that are attacked try to arrest player	2017-06-15 00:39:57 +02:00
Allofich	028762a7dc	Make guards that are attacked try to arrest player ... (Fixes #3706)	2017-06-15 01:47:10 +09:00
Nikolay Kasyanov	160a67afe1	Merge pull request #1319 from OpenMW/ci-reenable-macos-packaging ... [macOS, CI] reenable packaging & fix nightlies	2017-06-13 21:24:58 +02:00
scrawl	cd1821c464	Merge pull request #1322 from Siimacore/wizardthreadfix ... Stopping the thread in the wizard that prevented it to stop correctly	2017-06-13 19:48:06 +02:00
scrawl	53264f34b3	Merge pull request #1321 from akortunov/spellpriority ... Use mRange to check spell range instead of mArea.	2017-06-13 17:06:47 +02:00
Bret Curtis	dfed710e5e	Merge pull request #1323 from Allofich/compile ... Fixes for building in MSVC	2017-06-13 15:28:32 +02:00
Allofich	42402976e3	Fixes for building in MSVC	2017-06-13 19:38:12 +09:00
Siimacore	6af470ff03	Stopping the thread in the wizard that prevented it to stop correctly	2017-06-13 12:00:55 +02:00
Nikolay Kasyanov	97c3c45ba8	[macOS, CI] Use Qt 5.7	2017-06-13 09:18:02 +02:00
Andrei Kortunov	87939bf3b1	Use mRange to check spell range instead of mArea.	2017-06-13 11:02:40 +04:00
Nikolay Kasyanov	016da1f10c	[macOS, CI] Use most recent dependencies	2017-06-13 08:44:55 +02:00
scrawl	63f101e0cd	Update AUTHORS.md	2017-06-12 23:48:06 +02:00
scrawl	f7969fb178	Merge pull request #1317 from Siimacore/master ... Correcting https://bugs.openmw.org/issues/3906	2017-06-12 23:47:07 +02:00
scrawl	dd3f612e88	Merge pull request #1316 from akortunov/doorfix ... Doors usage improvements	2017-06-12 23:34:40 +02:00
scrawl	80eb2ea35d	Merge pull request #1313 from akortunov/spellpriority ... Make combat AI to do not cast target spells under water	2017-06-12 23:32:35 +02:00
scrawl	6d90f5a9a5	Merge pull request #1312 from akortunov/guifixes ... Split greeting from topic response	2017-06-12 23:19:45 +02:00
Bret Curtis	830ecbe101	Merge pull request #1318 from psi29a/fix_deboosting ... Fix deboosting	2017-06-12 07:25:11 +02:00
Bret Curtis	c6805314c2	be explicit about what we are trying to catch instead of catching everything and fixed up formatting ... use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love revert allman formatting changes	2017-06-12 00:32:29 +02:00
Bret Curtis	7c758a6293	std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast	2017-06-12 00:32:28 +02:00
Bret Curtis	f0b21cca22	use own inline hash_combine function	2017-06-12 00:32:28 +02:00
scrawl	fb7479c194	Update CONTRIBUTING.md	2017-06-11 23:52:01 +02:00
Andrei Kortunov	e9d0bf7c12	Added missed return statement	2017-06-11 15:06:44 +04:00
Nikolay Kasyanov	913601facc	[macOS, CI] reenable packaging to make nightlies work	2017-06-11 11:18:39 +02:00
Andrei Kortunov	9fdfb2a83f	Spell priority: make AI do not cast target spells when enemy is under water	2017-06-11 10:13:00 +04:00
Siimacore	b0abed00e5	Correcting https://bugs.openmw.org/issues/3906	2017-06-10 21:36:35 +02:00
Andrei Kortunov	cab51d26cc	Doors: small key search optimizations	2017-06-10 22:33:14 +04:00
Andrei Kortunov	188424d5d3	Allow AI to use keys to open doors	2017-06-10 22:31:17 +04:00
Bret Curtis	266ffc84ff	Merge pull request #1315 from devnexen/getuid_build_fix ... needs this head for getuid	2017-06-10 16:25:37 +02:00
David Carlier	8a5c62de97	needs this head for getuid	2017-06-10 14:50:43 +01:00
Bret Curtis	11c4aed4e5	algo needed for std::min/max in msvc2013	2017-06-10 09:09:30 +02:00
Bret Curtis	dbf149f9b2	gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now	2017-06-10 00:51:19 +02:00
Andrei Kortunov	4600f24e27	Playing sound when AI is opening a door	2017-06-09 22:52:40 +04:00
Bret Curtis	c781d1f8ed	purge unnecessary imports ... add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back	2017-06-09 19:08:53 +02:00
Bret Curtis	d799954ca0	replace and purge boost::math::gcd and other non-used headers	2017-06-09 19:08:53 +02:00
Bret Curtis	154d7cffa2	replace and purge boost::function	2017-06-09 19:08:53 +02:00
Bret Curtis	d48b829b45	replace and purge boost::lexical_cast	2017-06-09 19:08:53 +02:00
Bret Curtis	98752a9702	replace boost::bind	2017-06-09 19:08:53 +02:00
Bret Curtis	b7c27e5e96	remove boost/tuple	2017-06-09 19:08:53 +02:00
Bret Curtis	d97aa9152b	remove more unused imports, including boost headers	2017-06-09 19:08:53 +02:00
Bret Curtis	39185e6f8c	purge the rest of boost::shared and any other boost related things that no longer are required ... put boost system back in, clean others up revert Qt add back boost fstream	2017-06-09 19:08:53 +02:00
Bret Curtis	d785344fad	purge all instances of <boost/shared_ptr.hpp>, clean up unused headers	2017-06-09 19:08:53 +02:00
Bret Curtis	07f75e1104	replace boost::shared_ptr in extern and components	2017-06-09 19:08:53 +02:00
Nikolay Kasyanov	dd882b69c6	[macOS, CI] Use Release configuration	2017-06-09 16:49:25 +02:00
Nikolay Kasyanov	071419db4a	[macOS, CI] Enable OpenCS build and see what happens	2017-06-09 16:49:25 +02:00
Nikolay Kasyanov	bf630b99fa	Use most recent Xcode	2017-06-09 16:49:25 +02:00
Bret Curtis	c8b67221d7	use nullptr instead of NULL	2017-06-09 16:49:25 +02:00
Ewan Higgs	38a2de3c51	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
Nikolay Kasyanov	27a5c06f04	[OS X, CI] Disable packaging	2017-06-09 16:49:25 +02:00
Nikolay Kasyanov	c16506d07c	[OS X, CI] Use Xcode 8/macOS 10.12 SDK	2017-06-09 16:49:25 +02:00