2170 commits

Author	SHA1	Message	Date
cc9cii	4f24c6a7c8	more const-ness fixes	2015-11-01 17:07:40 +11:00
Marc Zinnschlag	44020df65f	made return type of ESMTerrain::Storage::getLand const ... (cherry picked from commit febf611c82)	2015-11-01 13:40:56 +11:00
Marc Zinnschlag	8cb1f4ffe9	additional safety check for land texture listing merge stage ... (cherry picked from commit 69045d7ec9)	2015-11-01 13:40:45 +11:00
Marc Zinnschlag	a2d4957d2a	merge land texture tables ... (cherry picked from commit 890bbb6b11)	2015-11-01 13:40:21 +11:00
Marc Zinnschlag	e5038cbece	fixed merge stage order; added proper initialisation ... (cherry picked from commit b7983d08ba)	2015-11-01 13:40:07 +11:00
Marc Zinnschlag	73ab89bf70	merge references tables ... (cherry picked from commit a97a632aa7)	2015-11-01 13:39:56 +11:00
Marc Zinnschlag	62daecadf5	fixed record state issues after merge ... (cherry picked from commit 845cafd61c)	2015-11-01 13:39:44 +11:00
Marc Zinnschlag	9230c62884	merge referenceables table ... (cherry picked from commit f95950e8d8)	2015-11-01 13:39:30 +11:00
Marc Zinnschlag	81188a3456	silenced a warning ... (cherry picked from commit 9cf793c0b5) Conflicts: apps/opencs/model/doc/document.cpp	2015-11-01 13:39:18 +11:00
Marc Zinnschlag	72aa998261	simplifying merge stage ... (cherry picked from commit 40753aa9a3)	2015-11-01 13:37:41 +11:00
Marc Zinnschlag	e33314ad81	made merge operation more fluent ... (cherry picked from commit 16dda281ce)	2015-11-01 13:37:26 +11:00
Marc Zinnschlag	98cac624a9	added info tables and pathgrid table to merge operation ... (cherry picked from commit 103073150e)	2015-11-01 13:37:14 +11:00
Marc Zinnschlag	024a5405e0	flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) ... (cherry picked from commit c92898a5bc) Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/model/doc/document.hpp	2015-11-01 13:37:01 +11:00
Marc Zinnschlag	973c65bc82	merge id collections ... (cherry picked from commit 3902513e65)	2015-11-01 13:35:15 +11:00
Marc Zinnschlag	55dfe48ef7	copy meta data from game file when merging ... (cherry picked from commit 47dd9505a9) Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/model/world/data.cpp	2015-11-01 13:34:41 +11:00
Marc Zinnschlag	3eef192e4d	create merged document and open a view for it (document is still empty at this point) ... (cherry picked from commit 1b663f01af) Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/documentmanager.cpp	2015-11-01 13:31:28 +11:00
Marc Zinnschlag	0b8e04d6a8	forgot to connect merge operation signals ... (cherry picked from commit d8655f2ff8)	2015-11-01 13:25:59 +11:00
Marc Zinnschlag	9423603e94	inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) ... (cherry picked from commit e2377396a7)	2015-11-01 13:25:46 +11:00
Marc Zinnschlag	e4381c3ec8	added merge operation (doesn't do anything yet) ... (cherry picked from commit 904ad94952) Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/tools/tools.cpp	2015-11-01 13:25:34 +11:00
Marc Zinnschlag	c2ed475950	disable merge menu item when a merge is already in progress ... (cherry picked from commit 708cacdec4)	2015-11-01 13:23:09 +11:00
Marc Zinnschlag	a5a0990d3c	improved adjuster widget problem reporting ... (cherry picked from commit 4fd3097c1c)	2015-11-01 13:22:54 +11:00
Marc Zinnschlag	ef1e01639e	added UI for merge tool (merge tool itself is still missing) ... (cherry picked from commit b83f9445a9) Conflicts: apps/opencs/editor.cpp apps/opencs/editor.hpp	2015-11-01 13:22:42 +11:00
Marc Zinnschlag	6fb658daa4	replaced State_Compiling (not requried anymore) with State_Merging ... (cherry picked from commit 6a9218ee07)	2015-11-01 13:19:56 +11:00
Stanislav Bas	ca14d6a8a8	Add missing includes to columnimp.hpp	2015-09-08 06:48:04 +10:00
Stanislav Bas	859ba93739	Inform about State change (not a whole row) when modifying a table value	2015-09-08 06:47:50 +10:00
Stanislav Bas	b53a77389b	Show race only when mesh type is Skin (in BodyParts table)	2015-09-08 06:47:34 +10:00
Stanislav Bas	3a41fe5024	Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()	2015-09-08 06:46:32 +10:00
Stanislav Bas	68013bd324	Columns with Display_Boolean use Combobox editor even for non-boolean values	2015-09-08 06:46:21 +10:00
Stanislav Bas	8c07d7f252	Remove enum names for AiWanderRepeat column	2015-09-08 06:46:10 +10:00
Stanislav Bas	214f3e5b9b	ModifyCommand uses a proper name of a modified nested value	2015-09-08 06:45:58 +10:00
Stanislav Bas	29536751f5	Sort tables by ID in the ascending order initially	2015-09-08 06:45:45 +10:00
scrawl	402f1ff5d8	Fix the ESM::LandTexture NAME being discarded on loading	2015-09-08 06:42:45 +10:00
scrawl	d1601feb39	Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records	2015-09-08 06:42:34 +10:00
scrawl	f8f66bffb0	Remove empty line at the beginning of files ... git ls-files -z | xargs -0 sed -i '1{/^$/d}'	2015-09-08 06:40:06 +10:00
scrawl	dae2588c88	Editor: fix a typo in ESM::Light flag mappings	2015-09-08 06:37:31 +10:00
scrawl	1d2f4c8cfe	Editor: remove creature flag of unknown purpose from the UI	2015-09-08 06:35:58 +10:00
scrawl	34561379bc	Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range ... Conflicts: apps/opencs/model/world/columns.hpp	2015-09-08 06:34:56 +10:00
cc9cii	2f372a79b9	Remove additional instance of Display_YesNo (in cc9cii branch but not in master)	2015-09-08 06:31:38 +10:00
taras.kudryavtsev	0f2ea57648	#2730 and #2725 ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp	2015-09-08 06:29:25 +10:00
Stanislav Bas	f0982c87ba	Remove check for an empty Particle from Magic effects verifier	2015-09-08 06:20:59 +10:00
Stanislav Bas	11f5a928db	Don't allow empty value of School field in Magic Effects table	2015-09-08 06:20:41 +10:00
Stanislav Bas	ef02bc657f	Add magic effect verifier	2015-09-08 06:20:25 +10:00
Marc Zinnschlag	c3a31d13b1	make non-editable fields in dialogue sub view selectable (Fixes #2818)	2015-09-08 06:16:22 +10:00
Stanislav Bas	bc48ed94bc	Correct comparison of enum values in IdTableProxyModel	2015-09-08 05:56:37 +10:00
Stanislav Bas	c0d714adb6	Activate editing of nested table cells by a double click ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp	2015-09-08 05:49:39 +10:00
Stanislav Bas	7a927eec79	Close EditWidget when a proper row removed	2015-09-08 05:45:33 +10:00
Stanislav Bas	bba3d6bec5	Restore Modified status of a record when adding/removing nested rows	2015-09-08 05:45:17 +10:00
Stanislav Bas	4366bdb4a8	Inform about Modified status change when modifying a value of a model	2015-09-08 05:44:58 +10:00
Stanislav Bas	ec98a1220f	Proper index for Modified column in ModifyCommand	2015-09-08 05:44:35 +10:00
cc9cii	b920e1bde7	Support MSVC 2015. Tested(*) with updated dependencies: ... - Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL - Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828 - SDL2 default branch, Changeset: 9834 (d3fa6d0d3793) - Ogre default branch, Changeset: 8048 (19479be2c7c5) - Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa - OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763 (*) only tested compilation and startup of the each app	2015-08-12 06:50:22 +10:00