Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								750133c0dd
								
							
						 | 
						
							
							
								
								one more fix to SavedGame record saving
							
							
							
							
							
						 | 
						
							2013-11-30 11:05:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								e432ab5e8a
								
							
						 | 
						
							
							
								
								fixed static problem in Land recrod save function
							
							
							
							
							
						 | 
						
							2013-11-28 11:51:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								b40c0f2a07
								
							
						 | 
						
							
							
								
								one more fix to SavedGame record saving
							
							
							
							
							
						 | 
						
							2013-11-26 09:56:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ecadccb28
								
							
						 | 
						
							
							
								
								fixed save function of SavedGame record
							
							
							
							
							
						 | 
						
							2013-11-25 12:59:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								67cd0887e6
								
							
						 | 
						
							
							
								
								added description field to saved game record; make use of description in GUI
							
							
							
							
							
						 | 
						
							2013-11-24 15:19:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc1501a510
								
							
						 | 
						
							
							
								
								store character profile information in saved game file
							
							
							
							
							
						 | 
						
							2013-11-21 10:53:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6e2701dd6
								
							
						 | 
						
							
							
								
								changed played time data type from float to double
							
							
							
							
							
						 | 
						
							2013-11-21 10:10:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9487bd33c3
								
							
						 | 
						
							
							
								
								removed broken save function from ESMWriter
							
							
							
							
							
						 | 
						
							2013-11-19 16:07:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c61deca8d
								
							
						 | 
						
							
							
								
								fixed save code for SavedGame record
							
							
							
							
							
						 | 
						
							2013-11-19 15:31:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								35bf98a940
								
							
						 | 
						
							
							
								
								modified esm reader/writer to use UTF8 when no encoder is given
							
							
							
							
							
						 | 
						
							2013-11-19 13:46:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								903e867c24
								
							
						 | 
						
							
							
								
								change to TES3 record (moved format field to the top)
							
							
							
							
							
						 | 
						
							2013-11-19 13:44:18 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc75627d53
								
							
						 | 
						
							
							
								
								added secondary saved game header record
							
							
							
							
							
						 | 
						
							2013-11-19 10:51:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								956d8adb99
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp 
							
						 | 
						
							2013-11-14 14:25:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d49b8e7443
								
							
						 | 
						
							
							
								
								Merge branch 'dialogue'
							
							
							
							
							
						 | 
						
							2013-11-14 11:40:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6e2f43b75
								
							
						 | 
						
							
							
								
								Stop continuous VFX when the effect is no longer active.
							
							
							
							
							
						 | 
						
							2013-11-13 15:44:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffdb91bb21
								
							
						 | 
						
							
							
								
								Add particles for Cast + Hit. Not looking quite right yet.
							
							
							
							
							
						 | 
						
							2013-11-11 23:43:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fff7fc843
								
							
						 | 
						
							
							
								
								save info records
							
							
							
							
							
						 | 
						
							2013-11-11 12:21:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								afafaf73e8
								
							
						 | 
						
							
							
								
								Fix a build error
							
							
							
							
							
						 | 
						
							2013-11-10 22:40:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c4303399f
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dialogue
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp 
							
						 | 
						
							2013-11-10 13:21:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								418ccf705d
								
							
						 | 
						
							
							
								
								Merge branch 'openmw-27'
							
							
							
							
							
							
							
							Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt 
							
						 | 
						
							2013-11-06 10:21:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d4a6c0edf
								
							
						 | 
						
							
							
								
								cleaned up ID handling in INFO record (including a ESMTool bug fix)
							
							
							
							
							
						 | 
						
							2013-11-05 12:56:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d7695ea88
								
							
						 | 
						
							
							
								
								added missing columns to topic info table
							
							
							
							
							
						 | 
						
							2013-11-05 11:41:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed913936f8
								
							
						 | 
						
							
							
								
								Eliminated game & addon keys from profile configuration
							
							
							
							
							
						 | 
						
							2013-11-03 21:36:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d4b5a2425
								
							
						 | 
						
							
							
								
								Fix broken launcher content file display / selection scheme
							
							
							
							
							
							
							
							Disable selection of content files with missing dependencies (grayed
out) 
							
						 | 
						
							2013-11-03 14:02:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								12c06a5615
								
							
						 | 
						
							
							
								
								Fixed broken dependency check
							
							
							
							
							
						 | 
						
							2013-11-03 06:21:28 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								973803eb2f
								
							
						 | 
						
							
							
								
								Fixed pathing issues in launcher
							
							
							
							
							
						 | 
						
							2013-11-03 00:02:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d12e2b99d
								
							
						 | 
						
							
							
								
								fixed merge conflicts
							
							
							
							
							
							
							
							Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp 
							
						 | 
						
							2013-11-02 09:31:23 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								cddece4f9e
								
							
						 | 
						
							
							
								
								Another stab at fixing the pathing problem...
							
							
							
							
							
						 | 
						
							2013-11-01 21:47:26 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								767cb54e7c
								
							
						 | 
						
							
							
								
								added missing columns to journal info table
							
							
							
							
							
						 | 
						
							2013-10-31 12:54:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								636d399c7f
								
							
						 | 
						
							
							
								
								Refactored Ogre initialisation into a component
							
							
							
							
							
						 | 
						
							2013-10-30 14:04:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba88c94d58
								
							
						 | 
						
							
							
								
								first attempt at an info record collection
							
							
							
							
							
						 | 
						
							2013-10-29 13:18:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								b51bef0d98
								
							
						 | 
						
							
							
								
								fixed missing adjuster widget in file dialog open view
							
							
							
							
							
						 | 
						
							2013-10-27 20:21:19 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukasz Gromanowski
								
							 
						 | 
						
							
							
							
							
								
							
							
								d51c9b64dd
								
							
						 | 
						
							
							
								
								Issue #913: Merge --master and --plugin switches
							
							
							
							
							
							
							
							Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com> 
							
						 | 
						
							2013-10-27 20:03:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ce4a04a2d
								
							
						 | 
						
							
							
								
								merge from saving
							
							
							
							
							
							
							
							Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp 
							
						 | 
						
							2013-10-25 14:44:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								16d87ea1d1
								
							
						 | 
						
							
							
								
								Merge branch 'master' into esxSelector
							
							
							
							
							
						 | 
						
							2013-10-25 08:11:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ca7f24731
								
							
						 | 
						
							
							
								
								Fixed filedialog new / edit content path issue
							
							
							
							
							
						 | 
						
							2013-10-24 17:33:28 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								b48f066f33
								
							
						 | 
						
							
							
								
								Reimplemented content selector for filedialog and datafilespage classes
							
							
							
							
							
						 | 
						
							2013-10-23 17:39:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba3589bc76
								
							
						 | 
						
							
							
								
								Revert "Implemented ContentSelector as a singleton "charm" modifier for"
							
							
							
							
							
							
							
							This reverts commit 24b167b755.
Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp 
							
						 | 
						
							2013-10-22 22:20:21 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9591ddda6
								
							
						 | 
						
							
							
								
								Reimplemented constentselector view class
							
							
							
							
							
						 | 
						
							2013-10-22 21:52:35 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c995533e07
								
							
						 | 
						
							
							
								
								Merge branch 'dialogue' into saving
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp 
							
						 | 
						
							2013-10-21 16:45:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								adf3a41a83
								
							
						 | 
						
							
							
								
								added topic and journal tables
							
							
							
							
							
						 | 
						
							2013-10-20 17:15:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c580fbc59
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
							
							
							
							
							
						 | 
						
							2013-10-12 13:40:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jordan Ayers
								
							 
						 | 
						
							
							
							
							
								
							
							
								296b2ab870
								
							
						 | 
						
							
							
								
								Magic Effect:  Recognize other display types.
							
							
							
							
							
							
							
							Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels. 
							
						 | 
						
							2013-10-08 23:55:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jordan Ayers
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ab7002908
								
							
						 | 
						
							
							
								
								MagicEffect:  Put magnitude type into ESM::MagicEffect helper.
							
							
							
							
							
						 | 
						
							2013-10-07 22:28:55 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c72a9ffdf
								
							
						 | 
						
							
							
								
								Fixed non-loading files
							
							
							
							
							
						 | 
						
							2013-10-06 22:10:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								217a4d75b4
								
							
						 | 
						
							
							
								
								Implemented profile function in launcher datafiles page
							
							
							
							
							
							
							
							Implemented dependency sorting to ensure dependent files appear latest
in the list. 
							
						 | 
						
							2013-10-06 21:13:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Emanuel Guevel
								
							 
						 | 
						
							
							
							
							
								
							
							
								496f786c2a
								
							
						 | 
						
							
							
								
								Implement Disable/EnableLevitation script functions
							
							
							
							
							
							
							
							Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat! 
							
						 | 
						
							2013-10-02 15:33:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5a0f61533
								
							
						 | 
						
							
							
								
								Fixed missing profiles combobox
							
							
							
							
							
						 | 
						
							2013-10-01 22:36:49 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								00c78a4aa1
								
							
						 | 
						
							
							
								
								Implementing ContentSelector class in DataFilesPage
							
							
							
							
							
							
							
							Moved AdjusterWidget / FileWidget to ContentSelectorView 
							
						 | 
						
							2013-10-01 21:29:45 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								24b167b755
								
							
						 | 
						
							
							
								
								Implemented ContentSelector as a singleton "charm" modifier for
							
							
							
							
							
							
							
							FileDialog... 
							
						 | 
						
							2013-09-29 12:19:07 -05:00 | 
						
						
							
							
							
								
							
							
						 |