14353 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	1956e2c988	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt	2015-06-28 00:38:39 +02:00
Stanislav Bas	e4d52ff9b0	Deleted records can be cloned	2015-06-28 00:31:41 +03:00
Stanislav Bas	9d274ee156	Merge branch 'master' into feature-cloning-enhancements	2015-06-27 22:02:31 +03:00
Stanislav Bas	7182d564d7	Merge remote-tracking branch 'upstream/master'	2015-06-27 22:02:12 +03:00
Stanislav Bas	81c7ce5b06	Add the proper getErrors() method to CellCreator. ... Fix the impossibility of the Exterior Cell creation.	2015-06-27 21:59:16 +03:00
Marc Zinnschlag	15bb2855a9	disable prev/next buttons if there is no previous/next record	2015-06-27 16:57:45 +02:00
Marc Zinnschlag	e27a75bd10	added user setting for cyclic prev/next	2015-06-27 15:56:41 +02:00
Marc Zinnschlag	95522fcad2	more general cleanup	2015-06-27 15:29:54 +02:00
Marc Zinnschlag	9aa153984a	fixed inconsistent handling of deleted records in dialogue; general cleanup	2015-06-27 15:02:50 +02:00
Marc Zinnschlag	a8c26ec0c1	moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar	2015-06-27 14:42:22 +02:00
Marc Zinnschlag	d5e6d8a58b	disable dialogue subview buttons while document is locked	2015-06-27 14:25:48 +02:00
Marc Zinnschlag	6769479358	moved code for initiating record cloning from DialogueSubView to RecordButtonBar	2015-06-27 13:47:07 +02:00
Marc Zinnschlag	7f1129df3b	cleaned up DialogueSubView constructor; moved bottom box below button bar	2015-06-27 12:53:46 +02:00
Marc Zinnschlag	49dc30683f	refactored dialogue subview button bar into a new class	2015-06-27 12:49:56 +02:00
Stanislav Bas	cbb124ab4f	Close the creator when the original record is removed (in clone mode)	2015-06-27 12:26:19 +03:00
Stanislav Bas	cad4ce4e0f	Cell type can be changed when cloning a cell	2015-06-27 11:47:59 +03:00
Stanislav Bas	5761ec428d	Creating/cloning Cell sets the proper Interior flag	2015-06-26 23:38:20 +03:00
Stanislav Bas	f3bb00e3d9	Add the ability to add nested values to the Create command	2015-06-26 22:16:12 +03:00
Stanislav Bas	a7f31988d1	Add the ability to search a nested column index	2015-06-26 22:14:11 +03:00
scrawl	502cc852da	Handle encoding conversions when saving TES3 header (Fixes #2727)	2015-06-26 20:16:32 +02:00
Stanislav Bas	f99eed2e81	Merge remote-tracking branch 'upstream/master'	2015-06-26 20:35:09 +03:00
Marc Zinnschlag	6d5823e8aa	killed some tabs	2015-06-26 18:54:49 +02:00
Marc Zinnschlag	fdf6645dbc	Merge remote-tracking branch 'smbas/fix-info-tables'	2015-06-26 18:47:16 +02:00
Marc Zinnschlag	654e7428aa	Merge remote-tracking branch 'smbas/master'	2015-06-26 18:39:40 +02:00
Marc Zinnschlag	2dada1a162	Merge branch 'meta'	2015-06-26 18:37:39 +02:00
Marc Zinnschlag	4487bda702	size limits for meta data strings	2015-06-26 18:19:00 +02:00
scrawl	59db9664ba	Pass the CharacterController to AiPackage::execute	2015-06-26 17:47:04 +02:00
Marc Zinnschlag	a4c2c75d1f	fixed overwriting of meta data when loading project file	2015-06-26 16:22:06 +02:00
Marc Zinnschlag	1e033fa8fe	added meta data dialogue sub view	2015-06-26 16:11:00 +02:00
Marc Zinnschlag	57015f3666	fixed handling of numeric read-only fields in dialogue sub views	2015-06-26 15:50:36 +02:00
Marc Zinnschlag	10fbe6aada	split DialogueSubView in SimpleDialogueSubView and DialogueSubView	2015-06-26 15:17:47 +02:00
Marc Zinnschlag	5a37530c1c	added missing MetaData table UniversalId type	2015-06-26 15:17:18 +02:00
Marc Zinnschlag	1870b087e7	ported setting of meta data for saving to the new mechanism	2015-06-26 13:13:22 +02:00
Marc Zinnschlag	f3ff90e1fd	moved meta data into a new single-row table	2015-06-26 13:01:25 +02:00
Stanislav Bas	feeb9ea8b0	Merge remote-tracking branch 'upstream/master'	2015-06-26 12:10:51 +03:00
scrawl	a44be148d8	Fix door collisions	2015-06-26 06:40:28 +02:00
scrawl	882e359008	Move attackStrength to the CharacterController, where it should have been to begin with ... Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.	2015-06-26 05:15:07 +02:00
scrawl	beb1086260	Fix attackStrength being unset for creatures with no weapons	2015-06-26 04:21:10 +02:00
scrawl	5bc6513e2d	Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime	2015-06-26 02:32:41 +02:00
scrawl	4ef6aa6b7f	Fix weather particles disappearing	2015-06-26 02:30:39 +02:00
scrawl	1d76607005	Add ORI (ObjectReferenceInfo) alias for BetaComment (Fixes #2723)	2015-06-25 21:48:47 +02:00
scrawl	ea0339d471	Make the string argument to BetaComment optional	2015-06-25 21:45:59 +02:00
Stanislav Bas	ea97b0a20c	Refine InfoTableProxyModel::getFirstInfoRow() code	2015-06-25 20:08:42 +03:00
Stanislav Bas	844e5c504d	Fix conversion to QString	2015-06-25 19:41:26 +03:00
Stanislav Bas	867ce686ae	Proper conversion to QString for DropLineEdit::dropEvent()	2015-06-25 19:30:53 +03:00
scrawl	8a3889a81e	Rain fading	2015-06-25 17:38:12 +02:00
scrawl	3a21f05f6e	Rain effect	2015-06-25 17:23:01 +02:00
Marc Zinnschlag	8fbc799655	Merge remote-tracking branch 'cc9cii/master'	2015-06-25 14:06:22 +02:00
Marc Zinnschlag	69db0179ca	update refresh menu item on stateChanged signal instead of when opening the menu	2015-06-25 13:05:57 +02:00
cc9cii	c0f3d70f06	Use the new severity message attribute.	2015-06-25 20:23:43 +10:00