3277 commits

Author	SHA1	Message	Date
David Cernat	60b6f92fa3	Add OpenMW commits up to 13 Jan 2020 ... # Conflicts: # apps/openmw/mwmechanics/actors.cpp	2020-01-15 07:49:26 +02:00
Capostrophic	7659370992	Editor: Add a reset to defaults button to keybindings (feature #4068)	2020-01-13 02:26:01 +03:00
capostrophic	89055f1c6c	Generate WNAM upon saving terrain	2020-01-11 02:42:04 +03:00
Andrei Kortunov	3704acf857	Unify streams usage to support non-ASCII paths (bug #5239)	2020-01-03 07:10:17 +04:00
David Cernat	a58f09fd6c	Add OpenMW commits up to 2 Jan 2020 ... # Conflicts: # apps/openmw/mwmechanics/enchanting.cpp # apps/openmw/mwworld/scene.cpp	2020-01-02 22:09:54 +02:00
Andrei Kortunov	089548cdc4	Fix build on Qt4	2019-12-22 10:31:32 +04:00
David Cernat	ca9cd90a4d	Add OpenMW commits up to 20 Dec 2019 ... # Conflicts: # apps/openmw/mwworld/scene.cpp	2019-12-20 15:43:50 +02:00
Andrei Kortunov	78450312bf	Fix the last warning about deprecated Qt functions	2019-12-20 13:36:32 +04:00
Andrei Kortunov	e44021b369	Fix most of deprecated API usage in the editor	2019-12-20 12:59:56 +04:00
Assumeru	737aa1e4e8	Remove FactionID editing from OpenCS (#2636) ... * Remove FactionID editing * remove useless comments * rename FactionID to Unknown	2019-12-18 20:42:54 +03:00
Andrei Kortunov	ab4b3677e3	Merge branch '16' into 'master' ... perf regression fix See merge request OpenMW/openmw!157	2019-12-02 05:35:19 +00:00
David Cernat	9d6f3fdd09	Add OpenMW commits up to 1 Dec 2019 ... # Conflicts: # CMakeLists.txt # apps/openmw/mwscript/aiextensions.cpp # apps/openmw/mwscript/statsextensions.cpp	2019-12-01 23:52:42 +02:00
Nikolay Kasyanov	6ef94c20b3	Fix macOS packaging on CMake 3.15 ... It looks like component names have become case sensitive.	2019-11-30 10:37:05 +01:00
bzzt	f09125fc93	perf regression fix	2019-11-20 13:37:00 +00:00
David Cernat	0c98c5d09e	Add OpenMW commits up to 19 Nov 2019 ... # Conflicts: # apps/openmw/mwmechanics/aipursue.cpp # apps/openmw/mwmechanics/summoning.cpp	2019-11-19 17:16:48 +02:00
Bret Curtis	454b9f1964	Merge pull request #2597 from akortunov/coverity ... CoverityScan fixes, part 2	2019-11-14 21:08:03 +01:00
Alexei Dobrohotov	b5992b380e	Merge pull request #2586 from unelsson/allowselectionalledges ... Allow selecting cell edges everywhere	2019-11-14 17:25:48 +03:00
Andrei Kortunov	b210e99abc	Avoid divizion by zero	2019-11-14 17:43:21 +04:00
Nelsson Huotari	120583f443	optimize isInCellSelection calls	2019-11-14 11:28:49 +02:00
Andrei Kortunov	238dcdbbd4	Fix copy-paste error	2019-11-13 15:14:30 +04:00
Andrei Kortunov	079c77ff22	Avoid zero division	2019-11-13 14:57:22 +04:00
David Cernat	5762a36fc2	Add OpenMW commits up to 7 Nov 2019 ... # Conflicts: # apps/openmw/mwmechanics/aifollow.hpp	2019-11-08 06:20:41 +02:00
Nelsson Huotari	45d43045eb	Remove unused std::string	2019-11-04 12:29:37 +02:00
Nelsson Huotari	aeb0ccff90	Allow selecting cell edges everywhere	2019-11-04 12:16:08 +02:00
Nelsson Huotari	8f6dc78217	Get vertex height from data, if not available in visible cells.	2019-11-04 00:09:23 +02:00
Nelsson Huotari	9677203215	Don't allow vertex selection outside visible cells	2019-11-04 00:09:23 +02:00
Nelsson Huotari	d186bcb46f	Update selection during transient edit, clear to a single function.	2019-11-03 13:27:27 +02:00
Alexei Dobrohotov	7328db4d6b	Fix small typo in body part record verifier	2019-10-30 17:51:36 +03:00
Andrei Kortunov	45ab6e1430	Implement UTF-8 support for script parser (bug #4598)	2019-10-30 14:59:47 +04:00
David Cernat	54301f5f89	Add OpenMW commits up to 29 Oct 2019 ... # Conflicts: # apps/openmw/mwmechanics/combat.cpp # apps/openmw/mwworld/inventorystore.cpp	2019-10-29 23:49:31 +02:00
David Cernat	bde9f7b817	Add OpenMW commits up to 20 Oct 2019 ... # Conflicts: # apps/openmw/mwgui/recharge.cpp # apps/openmw/mwrender/globalmap.cpp # apps/openmw/mwrender/globalmap.hpp # apps/openmw/mwworld/inventorystore.cpp	2019-10-29 22:26:35 +02:00
Andrei Kortunov	d278e5d4af	Fix warnings about variable re-declaration	2019-10-29 13:48:08 +04: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
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
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
Nelsson Huotari	dc7dc93320	Remove unused functions, improve formatting, handle terrain edit click	2019-10-22 21:26:55 +03:00
Nelsson Huotari	1046d57190	Remove unneeded forward declarations.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	55b3fd4418	Use float calculations for circle brush, keep tool options in memory.	2019-10-22 21:26:55 +03:00
Nelsson Huotari	23e7c71a5a	Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	8f3c22ccc3	Remove TerrainShapeMode::fixEdges	2019-10-22 21:25:10 +03:00
Nelsson Huotari	1a3fc435b9	Fix alterHeight bugs, don't let broken land edit pass.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	ff18595a86	Reduce code duplification, add bool value to limiting	2019-10-22 21:25:10 +03:00
Nelsson Huotari	60c0a25004	Fix smooth tool and flatten tool. Default tool strength to 8.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	54e13954e8	Improve land steepness limiting code	2019-10-22 21:25:10 +03:00
Nelsson Huotari	4a2d8aaf97	Handle mBrushSize 1.	2019-10-22 21:25:10 +03:00
Nelsson Huotari	16138fc896	Transient land shape editing	2019-10-22 21:25:10 +03:00
elsid	045ceeac11	Replace foreach macro by for-loop	2019-10-20 20:08:16 +02:00
Andrei Kortunov	2fc819cdae	Encode ID's in all places to UTF-8 (bug #3977)	2019-10-10 20:52:32 +04:00
Nelsson Huotari	78f2a5181d	Default brush size to 1	2019-10-10 14:27:22 +03:00
Nelsson Huotari	fbb9800e89	Better terrain texture ID handling	2019-10-10 14:27:22 +03:00
Nelsson Huotari	301c05662b	assignment to memb. init. list, publics to private, virtual -> final	2019-10-10 14:27:22 +03:00
David Cernat	cc25612b8d	Add OpenMW commits up to 18 Sep 2019 ... # Conflicts: # apps/openmw/mwclass/container.cpp # apps/openmw/mwclass/door.cpp # apps/openmw/mwmechanics/security.cpp # apps/openmw/mwmechanics/spellcasting.cpp # apps/openmw/mwscript/miscextensions.cpp	2019-09-18 23:46:08 +03:00
Nelsson Huotari	4ccb951126	move check to outermost scope	2019-09-10 12:15:19 +03:00
Nelsson Huotari	0880923189	Consistency for variable and header argument names.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	6dc3d8b44b	More readable code	2019-09-10 12:15:19 +03:00
Nelsson Huotari	780055899d	Don't add empty primitive sets to geometry.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	3becacf6d1	Remove globals, const int& -> int, values to const ref.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	1dcee833a1	Less verbose syntax	2019-09-10 12:15:19 +03:00
Nelsson Huotari	5a143fe99d	Remove extra include	2019-09-10 12:15:19 +03:00
Nelsson Huotari	39ab449431	Only allow selection of cells in view	2019-09-10 12:15:19 +03:00
Nelsson Huotari	dc8de6c6e6	Make less copies	2019-09-10 12:15:19 +03:00
Nelsson Huotari	001ca68cc7	Remove empty lines	2019-09-10 12:15:19 +03:00
Nelsson Huotari	46ee639892	pass by const ref and other fixes	2019-09-10 12:15:19 +03:00
Nelsson Huotari	20ab7df19f	Fixes, cleanup.	2019-09-10 12:15:19 +03:00
Nelsson Huotari	1a08944a8b	Remove unused code, clarifications, optimizations	2019-09-10 12:15:19 +03:00
Nelsson Huotari	d6722c7492	Terrain texture selection, support for vertex selection	2019-09-10 12:15:19 +03:00
David Cernat	ed05125f6a	Add OpenMW commits up to 2 Aug 2019 ... # Conflicts: # apps/openmw/mwmechanics/combat.cpp	2019-08-22 15:38:15 +03:00
David Cernat	b57c0bcafe	Add OpenMW commits up to 6 June 2019 ... # Conflicts: # apps/openmw/mwgui/hud.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwgui/waitdialog.cpp # apps/openmw/mwinput/inputmanagerimp.cpp # apps/openmw/mwworld/worldimp.hpp	2019-08-22 11:42:02 +03:00