22608 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrei Kortunov	b2e12f0a73	Attempt to fix a regression - crash on ARM	2019-10-28 18:58:16 +04:00
Andrei Kortunov	0fa0e9571b	Merge pull request #2572 from Capostrophic/prevent ... Rework prevent merchant equipping setting again	2019-10-28 18:11:13 +04:00
Andrei Kortunov	177c742f97	Merge branch 'fix-ci' into 'master' ... Fix gitlab CI builds See merge request OpenMW/openmw!155	2019-10-28 07:43:55 +00:00
Icecream95	acbdd0391c	Install Debian packages again in CI ... The gcc docker image was updated to a newer version of Debian, so downloading packages from Ubuntu is no longer required.	2019-10-28 05:28:12 +00:00
Capostrophic	ee4fa93bd4	Rework prevent merchant equipping setting again	2019-10-28 01:58:23 +03:00
Bret Curtis	e65c7d8ccc	Merge pull request #2543 from Capostrophic/hashsign ... Revert to 0.45.0 comments-in-the-middle settings parsing behavior	2019-10-27 23:14:31 +01:00
Alexei Dobrohotov	b948101a73	Merge pull request #2571 from akortunov/animfix ... Reset idle animation only when play movement animation	2019-10-27 13:06:26 +03:00
Andrei Kortunov	15cd305253	Reset idle animation only when play movement animation (bug #5196)	2019-10-27 12:33:28 +04:00
Alexei Dobrohotov	1f616c5613	Merge pull request #2569 from akortunov/holstered_shield ... Ignore shields sheathing for creatures without sheathing bone	2019-10-26 12:00:07 +03:00
Andrei Kortunov	b27089f7be	Merge pull request #2560 from Capostrophic/geteffect ... Fix GetEffect result when running on dead actors	2019-10-26 12:47:58 +04:00
Andrei Kortunov	7cd4fa4706	Ignore shields sheathing for creatures without sheathing bone	2019-10-26 12:41:16 +04:00
Capostrophic	f7d2cdb782	Revert to 0.45.0 comments-in-the-middle settings behavior	2019-10-26 10:55:10 +03:00
Bret Curtis	9f039fac87	Merge pull request #2520 from unelsson/transientlandshapeedit ... [Review phase] Editor: Transient land shape editing	2019-10-25 00:26:43 +02:00
Roman Siromakha	4e5aec5c30	Merge pull request #2539 from Capostrophic/scripting ... Try to parse strings as number literals (bug #5097)	2019-10-24 22:12:50 +02:00
Bret Curtis	2040ca5637	Merge pull request #2555 from akortunov/encoding ... Encode ID's in all places to UTF-8	2019-10-24 00:48:12 +02:00
Bret Curtis	afb218fe29	Merge pull request #2564 from Capostrophic/enchant ... Remove on-strike enchantment support for ranged weapon types (bug #5190)	2019-10-23 15:11:36 +02:00
Bret Curtis	39fd12c065	Merge pull request #2568 from elsid/settings_parser_tests ... Settings parser tests	2019-10-23 00:30:16 +02:00
Nelsson Huotari	c957f0544c	Remove unneeded brackets	2019-10-23 00:34:54 +03:00
Nelsson Huotari	fdc73b87ba	Remove includes that aren't needed any more	2019-10-23 00:07:41 +03:00
Nelsson Huotari	9e5db10288	const ref float -> float	2019-10-23 00:02:24 +03:00
Nelsson Huotari	ac5b356e8d	Always initialize landShapeNew	2019-10-23 00:01:23 +03:00
Nelsson Huotari	6f9f59dd58	declare cellId and cellCoords in smallest possible scope	2019-10-22 21:26:55 +03:00
Nelsson Huotari	fdcc7fa1d7	0 to nullptr	2019-10-22 21:26:55 +03:00
Nelsson Huotari	a13edbdb42	Bump shape calculation to function	2019-10-22 21:26:55 +03:00
Nelsson Huotari	8d3e7f2815	fix normals at cell edges, better coding standards	2019-10-22 21:26:55 +03:00
Nelsson Huotari	0f6ddfe8e6	change include, cleanup	2019-10-22 21:26:55 +03:00
Nelsson Huotari	12349f4e48	cleanup	2019-10-22 21:26:55 +03:00
Nelsson Huotari	c556885d71	remove unused Qt signal	2019-10-22 21:26:55 +03:00
Nelsson Huotari	deb122ffdb	Add optional post-processing (smooth/rough), add/fix tooltips.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	2d34b63b0b	Fix logic of land loading when no cell, land or landdata. Fix also draw.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	71eff60d22	Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize	2019-10-22 21:26:55 +03:00
Nelsson Huotari	a1348d94f9	add missing final specifiers	2019-10-22 21:26:55 +03:00
Nelsson Huotari	16ba32ffd5	assignments to member initialization list	2019-10-22 21:26:55 +03:00
Nelsson Huotari	c2de645c8c	override, virtual -> final, remove unused variables, public to private.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	6a3070e680	Fix shape brush setting description	2019-10-22 21:26:55 +03:00
Nelsson Huotari	8a9ca0b3ec	Generate new WNAM record based on new land heights, add comments	2019-10-22 21:26:55 +03:00
Nelsson Huotari	96be82a047	Remove terrain vertex selection and brush button when exiting editMode	2019-10-22 21:26:55 +03:00
Nelsson Huotari	8acfa2600f	Terrain shape editing related fixes	2019-10-22 21:26:55 +03:00
Nelsson Huotari	5b9debc554	use enum for mbrushshape initialization	2019-10-22 21:26:55 +03:00
Nelsson Huotari	4f9ec24e41	use enum for brushshape at scenetoolshapebrush	2019-10-22 21:26:55 +03:00
Nelsson Huotari	bae8636ec0	Fix brusshape enum values	2019-10-22 21:26:55 +03:00
Nelsson Huotari	c031543420	use enum for brush shapes	2019-10-22 21:26:55 +03:00
Nelsson Huotari	388edfd8cc	change manual memory management to std::unique_ptr	2019-10-22 21:26:55 +03:00
Nelsson Huotari	da4abcd7c1	std::set to std::unique and erase.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	6a44cae572	white iterator loop to C++11 range-based for loop.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	bccf36fdbc	Convert normals calculations mostly to osg::Vec3f	2019-10-22 21:26:55 +03:00
Nelsson Huotari	45b0f034c3	Split complex if-logic into multiple reasonably named functions	2019-10-22 21:26:55 +03:00
Nelsson Huotari	0ce971c1bb	Revert back to less aggressive component-level changes.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	69083369f8	use std::fill instead of for	2019-10-22 21:26:55 +03:00
Nelsson Huotari	3599e804e1	Fix the default value of mBrushSize	2019-10-22 21:26:55 +03:00