2179 commits

Author	SHA1	Message	Date
Marc Zinnschlag	09ec60fe2a	handle missing land texture records properly during merge	2015-09-08 16:01:34 +02:00
Marc Zinnschlag	73f6efddcc	fixed a texture indexing bug (only affects the editor)	2015-09-08 15:33:15 +02:00
Marc Zinnschlag	a8dc1c1198	merge land tables	2015-09-03 16:15:00 +02:00
Marc Zinnschlag	85f6bb892b	removed indirection in OpenMW-CS land record	2015-08-31 18:13:27 +02:00
Marc Zinnschlag	69b9eadb52	refactored loading of land data	2015-08-31 16:13:26 +02:00
Marc Zinnschlag	febf611c82	made return type of ESMTerrain::Storage::getLand const	2015-08-31 14:17:11 +02:00
Marc Zinnschlag	69045d7ec9	additional safety check for land texture listing merge stage	2015-08-31 11:10:58 +02:00
Marc Zinnschlag	890bbb6b11	merge land texture tables	2015-08-30 14:27:22 +02:00
Marc Zinnschlag	b7983d08ba	fixed merge stage order; added proper initialisation	2015-08-30 11:08:56 +02:00
Marc Zinnschlag	a97a632aa7	merge references tables	2015-08-26 17:21:24 +02:00
Marc Zinnschlag	845cafd61c	fixed record state issues after merge	2015-08-25 12:40:40 +02:00
Marc Zinnschlag	f95950e8d8	merge referenceables table	2015-08-25 11:54:16 +02:00
Marc Zinnschlag	9cf793c0b5	silenced a warning	2015-08-25 11:39:43 +02:00
Marc Zinnschlag	40753aa9a3	simplifying merge stage	2015-08-25 08:43:03 +02:00
Marc Zinnschlag	16dda281ce	made merge operation more fluent	2015-08-23 13:04:42 +02:00
Marc Zinnschlag	103073150e	added info tables and pathgrid table to merge operation	2015-08-23 12:58:49 +02:00
Marc Zinnschlag	c92898a5bc	flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)	2015-08-23 12:37:45 +02:00
Marc Zinnschlag	3902513e65	merge id collections	2015-08-21 14:02:32 +02:00
Marc Zinnschlag	47dd9505a9	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00
Marc Zinnschlag	1b663f01af	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
Marc Zinnschlag	d8655f2ff8	forgot to connect merge operation signals	2015-08-13 14:49:32 +02:00
Marc Zinnschlag	e2377396a7	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)	2015-08-13 12:53:00 +02:00
Marc Zinnschlag	904ad94952	added merge operation (doesn't do anything yet)	2015-08-13 12:03:20 +02:00
Marc Zinnschlag	708cacdec4	disable merge menu item when a merge is already in progress	2015-08-08 16:47:58 +02:00
Marc Zinnschlag	4fd3097c1c	improved adjuster widget problem reporting	2015-08-06 12:58:52 +02:00
Marc Zinnschlag	b83f9445a9	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
Marc Zinnschlag	6a9218ee07	replaced State_Compiling (not requried anymore) with State_Merging	2015-07-30 11:49:24 +02:00
Marc Zinnschlag	2c1cee38b4	Merge remote-tracking branch 'smbas/feature-extended-configurator'	2015-07-28 07:56:12 +02:00
Stanislav Bas	03c2e11961	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
Marc Zinnschlag	420503d5fc	Merge remote-tracking branch 'smbas/fix-bug-2728'	2015-07-27 11:23:49 +02:00
Marc Zinnschlag	bafa86d3e9	Merge remote-tracking branch 'scrawl/master'	2015-07-27 11:10:16 +02:00
Stanislav Bas	812fffbadc	Don't inform about a nested row addition in proxy models for top-level tables	2015-07-26 20:25:46 +03:00
Stanislav Bas	2471e4d67a	Rework Table to use rowAdded() signal of a proxy model	2015-07-26 20:09:31 +03:00
Stanislav Bas	86b7d2a43d	Inform about a row addition after re-sorting in InfoTableProxyModel	2015-07-26 20:07:36 +03:00
Stanislav Bas	37fd733deb	Create a custom signal to inform about a row addition in IdTableProxyModel	2015-07-26 20:06:30 +03:00
Stanislav Bas	c088cd4fa9	Proper index creation for nested data	2015-07-25 18:32:13 +03:00
scrawl	b3f5ac5dbb	Include cleanup	2015-07-25 02:11:49 +02:00
Marc Zinnschlag	fcf9ae42f4	Merge remote-tracking branch 'smbas/fix-table-proxy-bugs'	2015-07-24 10:29:08 +02:00
Rohit Nirmal	6d2d32485f	Fix building OpenCS with Qt 5.	2015-07-23 22:22:22 -05:00
Stanislav Bas	f5b1447c92	IdTableProxyModel refreshes the filter when the source model data or rows changed	2015-07-23 21:05:00 +03:00
Stanislav Bas	a7b3248ee7	Proper sorting of columns with enum values	2015-07-23 20:35:16 +03:00
Marc Zinnschlag	cdfa3006a3	incorrect sBribe GMSTs for new omwgame files (Fixes #2785)	2015-07-18 17:47:50 +02:00
Marc Zinnschlag	b2ab0122ab	Merge branch 'scriptbuttons'	2015-07-18 17:37:43 +02:00
Marc Zinnschlag	f1ac440b78	do not allow editing of deleted scripts	2015-07-18 17:00:00 +02:00
Marc Zinnschlag	8763a3b3c3	make compilation delay configurable via a user setting	2015-07-18 15:32:38 +02:00
Marc Zinnschlag	73b6df8280	put script compilation in script subview behind a timer	2015-07-18 13:09:17 +02:00
scrawl	58720e6a28	Fix the OpenCS rendering crash on exit (Fixes #2735)	2015-07-18 03:52:48 +02:00
Marc Zinnschlag	5febb96012	do not try to jump to source location for errors that do not have a source location	2015-07-17 13:59:50 +02:00
Marc Zinnschlag	f665919046	consider column when jumping to error in source text	2015-07-17 13:53:22 +02:00
Marc Zinnschlag	0abd29a3b4	jump to line in source text when clicking on an error in error table	2015-07-17 13:42:25 +02:00