| 
								
								
									 cc9cii | 66877cbfe7 | Merge branch 'master' into autocalc Conflicts:
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/util.cpp | 2015-06-25 13:39:59 +10:00 |  | 
				
					
						| 
								
								
									 cc9cii | 7af43a1155 | Address review feedback. | 2015-06-25 13:32:22 +10: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 |  | 
				
					
						| 
								
								
									 cc9cii | e5e4a04f8b | Remove more c++11 dependencies. | 2015-06-24 22:19:27 +10:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | d1339a643a | Fix for NestedTableProxyModel::forwardDataChanged() | 2015-06-24 15:07:09 +03:00 |  | 
				
					
						| 
								
								
									 cc9cii | 0cf9832017 | Add missing files for autocalc.  Remove c++11 dependency. | 2015-06-24 21:58:28 +10:00 |  | 
				
					
						| 
								
								
									 cc9cii | 18ec0d3e65 | Add missing files for autocalc. | 2015-06-24 21:21:35 +10:00 |  | 
				
					
						| 
								
								
									 cc9cii | 8af12788a4 | Merge branch 'master' into autocalc Conflicts:
	apps/opencs/view/world/util.cpp | 2015-06-24 21:16:48 +10:00 |  | 
				
					
						| 
								
								
									 cc9cii | 6b00d4ad91 | Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. - Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes | 2015-06-24 21:05:59 +10:00 |  | 
				
					
						| 
								
								
									 scrawl | 6f34a0501a | Attempting to make a potion with no effects removes the ingredients (Fixes #2722) | 2015-06-24 05:17:45 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 33a3dabc31 | An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722) | 2015-06-24 05:17:45 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 83961e9109 | Merge remote-tracking branch 'dteviot/FixRunningInCircles' | 2015-06-22 15:20:58 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 3f54f77647 | essimporter build fix | 2015-06-21 22:17:06 +02:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | d606b62688 | Nested tables accept drops | 2015-06-21 21:35:00 +03:00 |  | 
				
					
						| 
								
								
									 scrawl | 2ce269c0fc | Werewolf stats compatibility with old save files | 2015-06-21 18:45:49 +02:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | b9882eb59a | DragRecordTable checks drag type before accepting it | 2015-06-21 18:40:13 +03:00 |  | 
				
					
						| 
								
								
									 scrawl | d6a7255391 | Loading/saving for player's original skills/attributes (prior to becoming a werewolf) | 2015-06-21 17:36:49 +02:00 |  | 
				
					
						| 
								
								
									 scrawl | 44582fe3b3 | Don't use separate werewolf skills/attributes for non-player werewolves Still need to deal with save files. | 2015-06-21 17:28:18 +02: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 |  | 
				
					
						| 
								
								
									 dteviot | c65e7a31e7 | Aquatic creatures no longer try to get onto land. AiWander for aquatic creatures no longer uses path grid points as they're usually on land. | 2015-06-21 16:23:40 +12: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 |  | 
				
					
						| 
								
								
									 Stanislav Bas | 27ece7f36a | Rework DropLineEdit. Make it type-sensitive | 2015-06-20 17:33:36 +03:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 9a102f81c8 | added setting for controlling script compiler warnings | 2015-06-20 16:21:04 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 1ee1934053 | framework for accessing user settings in operation stages | 2015-06-20 16:20:31 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 8aba52170f | fixed a build error | 2015-06-20 11:34:32 +02:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | e212414bc7 | Use an ID parent type as the collection ID in GenericCreator. Fix impossibility of creation/cloning records from Dialogue subviews in Info tables | 2015-06-19 13:49:48 +03:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | 581ba55db9 | Add Topic/Journal Id completion to InfoCreator | 2015-06-19 12:51:50 +03:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | a6734a0ea4 | Add Cell Id completion to ReferenceCreator | 2015-06-19 11:50:02 +03:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | 36271f25ec | Rework creator factories to accept Document as a parameter | 2015-06-18 22:59:40 +03:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | d5bc561d17 | Merge remote-tracking branch 'smbas/feature-color-picking' | 2015-06-18 16:37:49 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 88d1f158d0 | made double click behaviour in report tables configurable (Fixes #2622) | 2015-06-18 16:36:27 +02:00 |  | 
				
					
						| 
								
								
									 cc9cii | ccf840da2b | Merge branch 'master' into autocalc Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp | 2015-06-18 22:08:27 +10:00 |  | 
				
					
						| 
								
								
									 cc9cii | ad04046243 | Mimic vanilla CS behaviour with NPC stats auto calculations.  Should resolve Bug #2663. - Currently does not auto-update when race, class or skills tables change. | 2015-06-18 22:02:08 +10:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | cf487581f7 | Show the pop-up of ColorEditor immediately after the editor creation in tables | 2015-06-18 12:50:46 +03:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 12e0873446 | Merge remote-tracking branch 'smbas/feature-info-tables-sorting' | 2015-06-18 10:31:44 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 63d46f7e66 | removed an unused variable | 2015-06-18 10:26:35 +02:00 |  | 
				
					
						| 
								
								
									 Marc Zinnschlag | 0b32b24d60 | Merge remote-tracking branch 'smbas/fix-enumdelegates' | 2015-06-18 10:21:27 +02:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | c60fed89ac | Enable sorting for Info tables | 2015-06-17 23:50:18 +03:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | a6624ca576 | Cache topic/journal first rows in InfoTableProxyModel | 2015-06-17 23:46:51 +03:00 |  | 
				
					
						| 
								
								
									 Stanislav Bas | 2e40b68862 | Add a custom proxy model for Info tables | 2015-06-17 22:47:39 +03:00 |  |