11048 commits

Author	SHA1	Message	Date
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	9ee3f1bfe7	Merge remote-tracking branch 'slothlife/moon-settings' into mergetool	2015-08-02 13:42:39 +02:00
slothlife	0244a9b329	Correct moon texture with respect to trajectory	2015-08-01 07:57:05 -05:00
Marc Zinnschlag	9392e426c0	Merge remote-tracking branch 'origin/master' into mergetool	2015-08-01 10:16:20 +02:00
Marc Zinnschlag	15e8275443	Merge remote-tracking branch 'slothlife/moon-settings' into mergetool	2015-08-01 10:14:28 +02:00
scrawl	7644a46ded	Creatures with no movement should not attempt to start combat (Fixes #2786)	2015-07-31 01:26:26 +02:00
scrawl	f326b8e5d2	Fix weapon animations playing on the lowerbody when swimming	2015-07-31 00:52:34 +02:00
scrawl	e8cbdcfb1e	Play swimming animation fallback on the upper body when possible	2015-07-31 00:35:41 +02:00
scrawl	1f755a2bc0	Don't use a shared Material in AlphaFader	2015-07-31 00:03:01 +02:00
slothlife	67a63cc662	Add some const correctness to MoonModel	2015-07-30 14:00:08 -05:00
Marc Zinnschlag	6a9218ee07	replaced State_Compiling (not requried anymore) with State_Merging	2015-07-30 11:49:24 +02:00
Marc Zinnschlag	26ea3aa1ad	Merge remote-tracking branch 'dteviot/refactoringAiWander'	2015-07-30 10:26:40 +02:00
slothlife	a4e1630ec2	Remove unreferenced member in MoonModel	2015-07-30 00:41:30 -05:00
slothlife	8dc7e158c6	Fix forward declaration of MoonState	2015-07-30 00:18:56 -05:00
slothlife	24ba54f4fe	Implement accurate moon settings (fixes #672)	2015-07-29 23:57:45 -05:00
Arthur Moore	2a653e45fd	(Re) Wrote a tool to test NIF files in BSAs and on the filesystem. ... Just give it a set of files, one file per argument, and it will make sure openmw can read them.	2015-07-28 06:51:47 -04:00
Marc Zinnschlag	2c1cee38b4	Merge remote-tracking branch 'smbas/feature-extended-configurator'	2015-07-28 07:56:12 +02:00
scrawl	7ba399fc92	Change a message to upper case spelling ... More consistent with other loading messages	2015-07-28 03:21:44 +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
Marc Zinnschlag	b2fdfbcfe4	Merge remote-tracking branch 'pkubik/distance-setting'	2015-07-26 11:01:12 +02:00
dteviot	04aee1fe20	extracted function reactionTimeActions().	2015-07-26 17:32:29 +12:00
dteviot	c7aacaee70	extracted function returnToStartLocation().	2015-07-26 17:29:32 +12:00
dteviot	5e519ef550	extract function isPackageFinished().	2015-07-26 17:29:01 +12:00
dteviot	ad0d807103	extracted function reactionTimeActions().	2015-07-26 17:28:32 +12:00
dteviot	9c0e3d6c28	extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions().	2015-07-26 17:25:44 +12:00
dteviot	76f95eafe7	extract function onWalkingStatePerFrameActions().	2015-07-26 17:25:00 +12:00
dteviot	5ec310dfba	extract function onIdleStatePerFrameActions().	2015-07-26 17:24:33 +12:00
dteviot	b3d5b47fea	extracted function UpdateActorsMovement().	2015-07-26 17:23:45 +12:00
scrawl	dff84adf7e	Fix weapon animation priority	2015-07-26 01:35:36 +02:00
dteviot	aba7225817	Removed some duplicated operations.	2015-07-26 11:15:21 +12:00