23950 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrei Kortunov	d0fe15b095	Use meaningful names instead of mSkill1 and mSkill2	2020-06-26 11:47:59 +04:00
Andrei Kortunov	fde0f20a6f	Fix faction requirement calculations (bug #5499)	2020-06-26 11:14:38 +04:00
Andrei Kortunov	3dc3fe06e2	Merge pull request #2934 from akortunov/master ... Fix MSVC warning about variable re-declaration	2020-06-26 09:55:30 +04:00
Andrei Kortunov	30b63270ce	Fix MSVC warning about variable re-declaration	2020-06-26 09:49:26 +04:00
Bret Curtis	edbc1898fb	Merge pull request #2933 from elsid/update_changelog ... Add bug #5479 to changelog	2020-06-25 22:53:20 +02:00
elsid	30c928fc09	Add bug #5479 to changelog	2020-06-25 22:43:21 +02:00
elsid	40ad87bc4d	Replace OpenThreads by std types	2020-06-25 22:16:09 +02:00
Capostrophic	b592fa826c	Increase disposition on marginal Intimidate wins (#5485)	2020-06-25 20:28:55 +03:00
Bret Curtis	999325ab44	Merge pull request #2930 from Capostrophic/shieldlocation ... Redistribute hits to carried left slot when possible (#5490)	2020-06-25 19:16:29 +02:00
Bret Curtis	585755a502	Merge branch 'master' into shieldlocation	2020-06-25 14:58:45 +02:00
Bret Curtis	e0fb9c2390	Merge pull request #2929 from Capostrophic/barterprice ... Don't offer a minimum price of 1 gold for zero value items/services (#5484)	2020-06-25 14:55:52 +02:00
Capostrophic	2b2f9a8714	Redistribute hits to carried left slot when possible (#5490)	2020-06-25 15:44:40 +03:00
Bret Curtis	bb27fc5cb2	Merge pull request #2927 from elsid/work_queue ... Use std types for WorkQueue	2020-06-25 14:03:09 +02:00
Capostrophic	c7aea20657	Don't offer a price of 1 gold for zero value items (#5484)	2020-06-25 14:56:20 +03:00
psi29a	227ca123a6	Merge branch 'shoulder_vertical_offset' into 'master' ... Make vertical offset of "view over shoulder" configurable See merge request OpenMW/openmw!243	2020-06-25 08:14:20 +00:00
elsid	3251687a3d	Use std types for WorkQueue	2020-06-24 21:23:31 +02:00
Petr Mikheev	63137a3b5a	Make vertical offset of "view over shoulder" configurable	2020-06-24 20:07:41 +02:00
Bret Curtis	da65a3b8d4	Thanks to https://gitlab.com/OpenMW/openmw/-/merge_requests/209, OpenMW now has Object Paging that includes distant statics.	2020-06-24 15:02:58 +02:00
psi29a	abc77075b9	Merge branch 'doc-formattopics' into 'master' ... Follow up to MR 126 - make it more obvious for end users how to set colors See merge request OpenMW/openmw!234	2020-06-24 11:26:22 +00:00
Andrei Kortunov	487bfed672	Use QMultiMap instead of QMap	2020-06-24 15:13:56 +04:00
psi29a	662725069e	Merge branch 'qt-tidying' into 'master' ... Make Qt work on my machine See merge request OpenMW/openmw!240	2020-06-23 15:09:47 +00:00
AnyOldName3	35d920569c	Tweak error message ... As we have `set -e`, the error message would never be printed if we genuinely failed to create the virtualenv, just if we succeeded and the expected directories didn't exist.	2020-06-23 15:26:24 +01:00
AnyOldName3	657306c293	Make Qt work on my machine ... Switches `eval stuff $STRIP` to `run_cmd` as it'll log errors on failure and eval was breaking commands that ran just fine otherwise. Don't download aqt wheel from pip and install it in two separate steps. Upgrade aqt from 0.8 to 0.9.2 as there are bugs with 0.8 that stop Qt 5.15.0 from working for some people. Fall back to Qt 5.14.2 for 64-bit on MSVC 2017 as the package list is broken and that specific combination doesn't work right now.	2020-06-23 15:22:59 +01:00
Bret Curtis	f8e3e57755	Merge pull request #2924 from akortunov/warnfix ... Avoid more deprecated Qt stuff	2020-06-23 13:38:39 +02:00
Bret Curtis	4b212954fb	Merge pull request #2925 from OpenMW/psi29a-debug ... change build type to debug for ci/cd	2020-06-23 13:34:18 +02:00
Bret Curtis	ae49549f03	change build type to debug for ci/cd ... it should set -O0 which should prioritise fast compilation for gcc	2020-06-23 12:19:38 +02:00
Andrei Kortunov	19e95afc42	Avoid reverse iteration on QHash	2020-06-23 13:33:38 +04:00
Bret Curtis	27285b9e85	Merge pull request #2923 from OpenMW/uncomplicate_things_in_travis ... removed need for split compilation for static analysis, we've gone fr…	2020-06-23 09:10:09 +02:00
Andrei Kortunov	0bb9322a69	Use default constructor for ItemFlags	2020-06-23 10:01:36 +04:00
Bret Curtis	ad25b22db7	removed need for split compilation for static analysis, we've gone from openmw taking 30 minutes to taking 3. Merging them also makes our before_script.linux.sh less complicated; removed redundant CMAKE flag; set build type to RelWithDebInfo as None has no meaning (even if it still builds).	2020-06-23 07:59:05 +02:00
Bret Curtis	8b02263341	Merge pull request #2919 from akortunov/warnfix ... Avoid to use some deprecated Qt API	2020-06-23 07:42:11 +02:00
Bret Curtis	602f1166a1	Merge pull request #2922 from OpenMW/no_sudo_required ... Removing deprecated sudo: required	2020-06-23 07:40:59 +02:00
psi29a	b70bedacdb	Merge branch 'debugger-working-directory-workaround' into 'master' ... Use a generator expression to specify the debugger working directory See merge request OpenMW/openmw!239	2020-06-23 05:20:30 +00:00
fredzio	6d4d53fc7c	Add a setting to the launcher to enable/disable the dialogue topic ... formatting stuff.	2020-06-22 23:21:03 +02:00
AnyOldName3	2f8c5ef09d	Use a generator expression to specify the debugger working directory	2020-06-22 21:38:40 +01:00
Bret Curtis	16ca9e2fbd	put back INSTALL platforms	2020-06-22 21:16:23 +02:00
psi29a	421ad91a08	Merge branch 'improved_third_person' into 'master' ... Improved third person experience Closes #5457 and #390 See merge request OpenMW/openmw!219	2020-06-22 15:15:33 +00:00
Bret Curtis	508b329bd3	Removeing deprecated sudo: required	2020-06-22 16:52:41 +02:00
Andrei Kortunov	c8d5d421d9	Do not use deprecated mouse wheel movement angle	2020-06-22 18:46:45 +04:00
Andrei Kortunov	98bb73ffb7	Do not use deprecated QTextStream::endl	2020-06-22 18:46:45 +04:00
Andrei Kortunov	2b4274bca8	Use modern Qt flag declarations	2020-06-22 18:46:45 +04:00
Bret Curtis	573c630d34	Merge pull request #2921 from OpenMW/travis_focal ... Get OpenMW ready for Focal update on GH	2020-06-22 16:45:30 +02:00
Bret Curtis	ccedde3e0a	Get OpenMW ready for Focal update on GH	2020-06-22 15:51:56 +02:00
Petr Mikheev	e3bae58cb1	Update docs, AUTHORS.md, CHANGELOG.md	2020-06-22 15:24:10 +02:00
Petr Mikheev	b4c699348f	Improved strafe movement	2020-06-22 15:22:34 +02:00
Petr Mikheev	d3bd67d747	Advanced third person camera.	2020-06-22 15:22:34 +02:00
psi29a	2fb7c27976	Resolved by !235 when dropping Qt4 in Task #5480	2020-06-22 13:20:31 +00:00
psi29a	a1e6f062cd	Merge branch 'drop_qt4' into 'master' ... #5480: Drop Qt4 support and require Qt 5.12 or later. See merge request OpenMW/openmw!235	2020-06-22 13:16:33 +00:00
Bret Curtis	8f9c3e28d9	Handle typo	2020-06-22 13:48:35 +02:00
Bret Curtis	8d3b1b90b1	do not assume gcc is available; added build-essential	2020-06-22 12:49:59 +02:00