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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cc9cii
								
							 
						 | 
						
							
							
							
							
								
							
							
								71f3b7ed4f
								
							
						 | 
						
							
							
								
								Fix crash when user preference is missing.
							
							
							
							
							
						 | 
						
							2015-06-25 20:21:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fbdbb11d5
								
							
						 | 
						
							
							
								
								added refrash menu item to report table (Fixes #2620)
							
							
							
							
							
						 | 
						
							2015-06-25 12:03:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								d282bead23
								
							
						 | 
						
							
							
								
								InfoCreator accepts drops of Topic/Journal ID
							
							
							
							
							
						 | 
						
							2015-06-25 11:24:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b82b9d9d0
								
							
						 | 
						
							
							
								
								ReferenceCreator accepts drops of Cell ID
							
							
							
							
							
						 | 
						
							2015-06-25 11:20:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								21f0b586ec
								
							
						 | 
						
							
							
								
								Rows with the same topic but in different letter case can be reordered
							
							
							
							
							
						 | 
						
							2015-06-24 20:01:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								e29d9bcc8e
								
							
						 | 
						
							
							
								
								use a namespace instead of a class with only static functions
							
							
							
							
							
						 | 
						
							2015-06-24 17:29:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0aad9c8cb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
							
							
							
							
							
						 | 
						
							2015-06-24 17:20:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								270c17faa7
								
							
						 | 
						
							
							
								
								Prevent drops on non-editable table cells
							
							
							
							
							
						 | 
						
							2015-06-24 16:36:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1339a643a
								
							
						 | 
						
							
							
								
								Fix for NestedTableProxyModel::forwardDataChanged()
							
							
							
							
							
						 | 
						
							2015-06-24 15:07:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5670b5133
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/OpenMW/openmw into osg
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp 
							
						 | 
						
							2015-06-22 20:09:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								d606b62688
								
							
						 | 
						
							
							
								
								Nested tables accept drops
							
							
							
							
							
						 | 
						
							2015-06-21 21:35:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9882eb59a
								
							
						 | 
						
							
							
								
								DragRecordTable checks drag type before accepting it
							
							
							
							
							
						 | 
						
							2015-06-21 18:40:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								a23de394f8
								
							
						 | 
						
							
							
								
								Refine DropLineEdit code
							
							
							
							
							
						 | 
						
							2015-06-21 17:16:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								2565452052
								
							
						 | 
						
							
							
								
								Add some drag'n'drop utils to work with TableMimeData
							
							
							
							
							
						 | 
						
							2015-06-21 17:08:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc37aea8eb
								
							
						 | 
						
							
							
								
								Add missing mappings to TableMimeData
							
							
							
							
							
						 | 
						
							2015-06-20 21:00:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								7dcdd130bb
								
							
						 | 
						
							
							
								
								Rework Dialogue subview code according to DropLineEdit changes
							
							
							
							
							
						 | 
						
							2015-06-20 20:52:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c644f15167
								
							
						 | 
						
							
							
								
								calm down travis
							
							
							
							
							
						 | 
						
							2015-06-20 19:46:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9f6baf317
								
							
						 | 
						
							
							
								
								add normal script warnings mode (Fixes #2642)
							
							
							
							
							
						 | 
						
							2015-06-20 19:16:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								197b8ec731
								
							
						 | 
						
							
							
								
								added severity attribute for operation messages (Fixes #2717)
							
							
							
							
							
						 | 
						
							2015-06-20 19:08:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								8791832c86
								
							
						 | 
						
							
							
								
								standarised on the use of the Message struct when passing operations messages around
							
							
							
							
							
						 | 
						
							2015-06-20 17:56:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stanislav Bas
								
							 
						 | 
						
							
							
							
							
								
							
							
								64701b273d
								
							
						 | 
						
							
							
								
								LineEdits for ID values accept drops with a proper type
							
							
							
							
							
						 | 
						
							2015-06-20 18:29:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e21c61297
								
							
						 | 
						
							
							
								
								replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
							
							
							
							
							
						 | 
						
							2015-06-20 16:55:34 +02:00 | 
						
						
							
							
							
								
							
							
						 |