Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								54f56b0515
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'graffy76/usersettings'
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp 
							
						 | 
						
							2013-05-16 18:04:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6203cac2a
								
							
						 | 
						
							
							
								
								update for master
							
							
							
							
							
						 | 
						
							2013-05-07 20:33:42 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea3b14f2d2
								
							
						 | 
						
							
							
								
								added skill columns to class
							
							
							
							
							
						 | 
						
							2013-03-26 09:43:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								f39f694638
								
							
						 | 
						
							
							
								
								various global variable fixes in editor
							
							
							
							
							
						 | 
						
							2013-03-25 11:59:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								114f99ddbf
								
							
						 | 
						
							
							
								
								add skill records when creating a new base file
							
							
							
							
							
						 | 
						
							2013-03-24 15:10:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								cafbabde45
								
							
						 | 
						
							
							
								
								fixed broken loading of single files into the editor
							
							
							
							
							
						 | 
						
							2013-03-21 12:13:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebb1dab8e1
								
							
						 | 
						
							
							
								
								removed debugging leftovers
							
							
							
							
							
						 | 
						
							2013-03-21 10:19:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								10fad47a81
								
							
						 | 
						
							
							
								
								some cleanup
							
							
							
							
							
						 | 
						
							2013-03-12 14:51:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								50abb22162
								
							
						 | 
						
							
							
								
								Fix to allow application closing from multiple views and a single view.
							
							
							
							
							
						 | 
						
							2013-03-12 06:28:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								c17821e6c8
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose
							
							
							
							
							
						 | 
						
							2013-03-08 20:08:56 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								03c7f18112
								
							
						 | 
						
							
							
								
								Fixes for save-on-close message boxes
							
							
							
							
							
						 | 
						
							2013-03-07 17:48:05 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a994a23f4e
								
							
						 | 
						
							
							
								
								file loading fixes
							
							
							
							
							
						 | 
						
							2013-03-07 07:56:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								46de45b9a2
								
							
						 | 
						
							
							
								
								added var type column to globals
							
							
							
							
							
						 | 
						
							2013-03-05 11:37:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba4907fbaf
								
							
						 | 
						
							
							
								
								use new Variant type for GMSTs
							
							
							
							
							
						 | 
						
							2013-03-05 08:02:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1ac20c6f3
								
							
						 | 
						
							
							
								
								changed global variable records to new variant type
							
							
							
							
							
						 | 
						
							2013-03-04 14:32:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								868916a9a2
								
							
						 | 
						
							
							
								
								added add-on global variables in the same way add-on GMSTs were added
							
							
							
							
							
						 | 
						
							2013-02-23 12:51:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f89d453a5
								
							
						 | 
						
							
							
								
								Operations widget height fix and abort button feature.  Successfully
							
							
							
							
							
							
							
							tested resizing of Operations QDockWidget for multiple concurrent
operations. 
							
						 | 
						
							2013-02-22 21:53:32 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a50ff34774
								
							
						 | 
						
							
							
								
								better default value for string GMSTs
							
							
							
							
							
						 | 
						
							2013-02-18 09:23:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								475f4f9311
								
							
						 | 
						
							
							
								
								implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified
							
							
							
							
							
						 | 
						
							2013-02-17 20:03:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d112e4d5c
								
							
						 | 
						
							
							
								
								rewrote logic of content file loading
							
							
							
							
							
						 | 
						
							2013-02-07 11:33:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba0d13fc12
								
							
						 | 
						
							
							
								
								moved code for creating new base content records into the Document class
							
							
							
							
							
						 | 
						
							2013-02-04 13:50:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c973a0f67
								
							
						 | 
						
							
							
								
								constructing documents from a file list instead of a single name
							
							
							
							
							
						 | 
						
							2013-02-04 13:46:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c75563c184
								
							
						 | 
						
							
							
								
								report model and view
							
							
							
							
							
						 | 
						
							2012-12-11 15:35:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9fe7ff9690
								
							
						 | 
						
							
							
								
								added mandatory ID check stage
							
							
							
							
							
						 | 
						
							2012-12-08 23:27:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b7f342641
								
							
						 | 
						
							
							
								
								removed last remains of old verify implementation
							
							
							
							
							
						 | 
						
							2012-12-08 17:00:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2b4f43176
								
							
						 | 
						
							
							
								
								moved document state enum to a separate file
							
							
							
							
							
						 | 
						
							2012-12-08 14:44:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdc7e93835
								
							
						 | 
						
							
							
								
								preliminary multi-threaded verify implementation (does not actually perfom any document verification yet)
							
							
							
							
							
						 | 
						
							2012-12-08 11:59:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef9575498f
								
							
						 | 
						
							
							
								
								basic (non-editable) subview for global variables
							
							
							
							
							
						 | 
						
							2012-11-26 12:29:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								303506d24b
								
							
						 | 
						
							
							
								
								added new document function
							
							
							
							
							
						 | 
						
							2012-11-23 14:08:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								997386d873
								
							
						 | 
						
							
							
								
								implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface)
							
							
							
							
							
						 | 
						
							2012-11-23 13:15:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fc183d595
								
							
						 | 
						
							
							
								
								added operations progress bar
							
							
							
							
							
						 | 
						
							2012-11-23 12:20:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								eaa58e0530
								
							
						 | 
						
							
							
								
								preparations for multiple parallel progress-type operations
							
							
							
							
							
						 | 
						
							2012-11-23 10:52:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								03aacd3263
								
							
						 | 
						
							
							
								
								added progress tracking
							
							
							
							
							
						 | 
						
							2012-11-23 10:25:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								931eb08114
								
							
						 | 
						
							
							
								
								implemented edit locking (used during saves)
							
							
							
							
							
						 | 
						
							2012-11-23 00:51:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								5838929371
								
							
						 | 
						
							
							
								
								implemented a dummy save function (does not actually save anything)
							
							
							
							
							
						 | 
						
							2012-11-23 00:36:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7c63d4c74
								
							
						 | 
						
							
							
								
								track document modification state and display it in the top level window title bar
							
							
							
							
							
						 | 
						
							2012-11-22 23:42:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed3d8b8ca2
								
							
						 | 
						
							
							
								
								added undo stack and undo/redo actions
							
							
							
							
							
						 | 
						
							2012-11-22 15:54:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3cd6e8a8a
								
							
						 | 
						
							
							
								
								new attempt at the editor
							
							
							
							
							
						 | 
						
							2012-11-21 17:31:18 +01:00 | 
						
						
							
							
							
								
							
							
						 |