5089 commits

Author	SHA1	Message	Date
Chris Robinson	bea460955d	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 16:03:39 -08:00
Marc Zinnschlag	1343c2c22b	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:29:45 +01:00
scrawl	b52df83d84	Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again	2013-02-17 20:23:22 +01:00
Marc Zinnschlag	e5149e57ac	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:04:18 +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
scrawl	52d0f0b750	Fixed OpAddItem, OpRemoveItem	2013-02-17 19:44:00 +01:00
Marc Zinnschlag	abd307d70e	Issue #567: workaround for crash with non-English ESX files	2013-02-17 19:26:01 +01:00
scrawl	e1ca0a15ae	Add message box when item is added to player's inventory	2013-02-17 18:58:54 +01:00
scrawl	170a9762ac	Fix travel services not actually costing gold.	2013-02-17 18:30:21 +01:00
scrawl	791d16bbdb	Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes	2013-02-17 18:12:38 +01:00
Marc Zinnschlag	31bfe62bbc	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 17:41:19 +01:00
Marc Zinnschlag	9221c861c5	Merge remote-tracking branch 'graffy76/next' into next ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-17 17:38:33 +01:00
Marc Zinnschlag	bb990b96bf	Merge branch 'globaltype' into next	2013-02-17 17:27:41 +01:00
Marc Zinnschlag	50d61a5b6e	proper implementation of gmst type column	2013-02-17 17:27:25 +01:00
scrawl	7ffcfa3622	Water and clouds no longer depend on timescale.	2013-02-17 16:23:55 +01:00
scrawl	5a11ddc485	Pressing F1 again hides the quick keys menu.	2013-02-17 16:01:36 +01:00
scrawl	d899f33444	Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.	2013-02-17 16:00:31 +01:00
scrawl	00db13be32	Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.	2013-02-17 15:56:22 +01:00
graffy76	ceefae81e8	fix for the opencs icon	2013-02-17 07:46:50 -06:00
Chris Robinson	e2d7cc49e3	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 03:42:37 -08:00
Marc Zinnschlag	44d66cbf5a	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 09:09:31 +01:00
Marc Zinnschlag	448293f270	Merge remote-tracking branch 'scrawl/bug_559' into next	2013-02-17 09:09:06 +01:00
Marc Zinnschlag	b8c0c94d5f	Merge remote-tracking branch 'wareya/master' into next	2013-02-17 08:58:41 +01:00
scrawl	c4f17f5596	playercontrols switch now disables activation in general (Chris' suggestion)	2013-02-17 03:03:41 +01:00
scrawl	373de19aee	Removed dialogue fix again, now on separate branch	2013-02-17 03:02:47 +01:00
scrawl	df8e502f8c	Ouch, I used && instead of &, this broke actions without a sound	2013-02-17 02:52:49 +01:00
Wareya	c98a815581	Remove debug printing from previous commit	2013-02-16 13:37:25 -05:00
Wareya	f0220fb06b	Implement "Rest Until Healed" ... Fixes: https://bugs.openmw.org/issues/563	2013-02-16 13:35:03 -05:00
scrawl	a5c8d5748f	fix FailedAction.	2013-02-16 18:05:25 +01:00
scrawl	0bc34c1c0d	Action::executeImp returns a bool value to indicate if the sound should be played.	2013-02-16 16:40:44 +01:00
scrawl	7d918caa93	Don't allow dialogue if player controls are disabled.	2013-02-16 16:26:40 +01:00
Marc Zinnschlag	910858c300	Merge remote-tracking branch 'sergeyshambir/guiconvience' into next	2013-02-16 14:50:42 +01:00
Douglas Mencken	eb09662f1d	Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. ... It is boost headers' job to deal with their internals.	2013-02-16 14:49:11 +01:00
Douglas Mencken	a3e421167b	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel ... Signed chars, unsigned chars... Just use int for index everywhere.	2013-02-16 14:48:44 +01:00
Chris Robinson	158e18b98d	Remove an unused method	2013-02-16 00:30:07 -08:00
Chris Robinson	c965bd8e18	Increase step size to 30	2013-02-15 17:22:55 -08:00
Douglas Mencken	df5919f2c5	Use `signed char' explicitly where needed. It is important because: ... - It is implementation-dependent if plain `char' signed or not. - C standard defines three *distinct* types: char, signed char, and unsigned char. - Assuming that char is always unsigned or signed can lead to compile-time and run-time errors. You can also use int8_t, but then it would be less obvious for developers to never assume that char is always unsigned (or always signed). Conflicts: components/esm/loadcell.hpp	2013-02-15 20:28:14 +01:00
scrawl	4da11a96a5	Fixed gold ref count always becoming 1 when dropped on the ground	2013-02-15 17:34:55 +01:00
Pieter van der Kloet	fd430dc5a9	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget ... Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp	2013-02-15 15:38:30 +01:00
Pieter van der Kloet	ee27e3bb58	Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp	2013-02-15 15:21:14 +01:00
Pieter van der Kloet	0e143b1926	Merge remote-tracking branch 'upstream/master' into settingsparser	2013-02-15 14:45:19 +01:00
Pieter van der Kloet	43e9ad8733	The text color of the profiles dialog now turns red on invalid names	2013-02-15 14:26:09 +01:00
Pieter van der Kloet	990895fd2b	Mainwindow size and position now gets saved/restored	2013-02-15 14:12:25 +01:00
Chris Robinson	c57001e3bd	Remove an unused field	2013-02-15 05:11:06 -08:00
Chris Robinson	e4341525c8	Add a jump state ... Currently unused	2013-02-15 04:45:28 -08:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed ... This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
Chris Robinson	e1a1530774	Better implement Npc::getSpeed	2013-02-15 01:27:57 -08:00
Chris Robinson	3348e8a436	Clarify a comment	2013-02-14 22:41:14 -08:00
Chris Robinson	ac717373b1	Add a method to check if an object is on the ground	2013-02-14 22:35:15 -08:00
Chris Robinson	18b606fddf	Use the PhysicActor's set/getOnGround method	2013-02-14 20:10:04 -08:00
Chris Robinson	15dc82f454	Increase step size to 15	2013-02-14 18:59:05 -08:00
Chris Robinson	a729b1b12a	Snap to the ground after moving ... Depends on two factors: * End up close enough above to a walkable plane (it's within sMaxStep units down and is angled sMaxSlope or less) * Started out on the ground without any upward movement This also reduces the distance needed to be to the ground to 4 (from 10), and ensures the actor is 2 units above the ground when on it. Downward force is also removed when starting on the ground.	2013-02-14 18:34:51 -08:00
Pieter van der Kloet	1b9cf8c23f	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
scrawl	7604fb51b6	CG no longer listed in the settings if the plugin isn't loaded.	2013-02-14 23:17:21 +01:00
Pieter van der Kloet	5d1bede9e5	Forgot to add two files	2013-02-14 11:20:47 +01:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Chris Robinson	6a9755778e	Merge remote-tracking branch 'zini/next' into animation2	2013-02-12 18:14:46 -08:00
scrawl	de90b911c9	Near clip plane corrections	2013-02-12 20:56:00 +01:00
scrawl	d213ff680f	Disabled terrain LOD	2013-02-12 20:55:45 +01:00
Marc Zinnschlag	5e3529783d	Merge remote-tracking branch 'ace/win-fixes' into next	2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson	bbb845824d	Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__	2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson	0ae01794f1	Fixed build errors in OpenCS	2013-02-12 13:57:16 +01:00
Sergey Shambir	7d7a1119da	Fixed book text misalignment, at least in some cases ... https://bugs.openmw.org/issues/284	2013-02-12 11:49:20 +04:00
Sergey Shambir	03803f19b5	BookTextParser: moved to Ogre::UTFString ... Font height and unicode characters glyph width now accounted correctly.	2013-02-12 11:22:19 +04:00
Sergey Shambir	3b64389668	BookTextParser: fixed infinitive loop	2013-02-12 11:14:30 +04:00
Marc Zinnschlag	1a079ec8d3	Merge branch 'master' into next	2013-02-11 19:53:51 +01:00
Marc Zinnschlag	1fd7d8ed2a	Merge remote-tracking branch 'graffy76/master' into next	2013-02-11 15:35:59 +01:00
Pieter van der Kloet	aa25471517	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
graffy76	55dd17c27c	Added setBarColor() function to CSVDoc::Operation. Created four color ... types for existing operations (save, verify, compile and search), with a default for future / undefined ops.	2013-02-11 04:30:16 -06:00
Michal Sciubidlo	f4d60ae7b2	Files sorting (masters then plugins). ... Remove unneeded includes.	2013-02-10 19:59:25 +01:00
Marc Zinnschlag	64d9d9e2ce	Merge remote-tracking branch 'wheybags/master' into next	2013-02-10 17:29:28 +01:00
Marc Zinnschlag	eb6590f7d8	added delegate factory	2013-02-10 17:21:25 +01:00
Tom Mason	c32c31f6d6	break after activating button	2013-02-10 15:41:02 +00:00
Tom Mason	158c6fc9fa	pressing enter when a messagebox is prompting for "ok", will activate ok button	2013-02-10 14:58:46 +00:00
Sergey Shambir	59808c3e10	GUI: Birth and Class dialogs now both select 1st item in list at first ... time.	2013-02-10 08:59:38 +04:00
Sergey Shambir	725bfe6372	TradeWindow: balance now changes per time if user holds +/- button ... pressed	2013-02-10 08:50:36 +04:00
Sergey Shambir	bba024d6ad	Right mouse button click now stops Container GuiMode.	2013-02-10 08:37:45 +04:00
Chris Robinson	4ee5857bae	Filter accumulation axis for mLastPosition as needed	2013-02-09 19:09:56 -08:00
Chris Robinson	8d6f017f17	Remove an unneeded Animation field	2013-02-09 13:25:39 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Marc Zinnschlag	2d937cd9e2	Merge branch 'gmst' into next	2013-02-09 15:26:25 +01:00
Marc Zinnschlag	d40ee06897	fixed base/modified logic	2013-02-09 15:25:50 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. ... - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
scrawl	6805c7bab4	Merge branch 'master' into graphics	2013-02-08 18:35:41 +01:00
Marc Zinnschlag	828695f295	added value column to gmst table	2013-02-08 14:48:38 +01:00
Marc Zinnschlag	cce2d63433	added type column to gmst table	2013-02-08 12:20:03 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Chris Robinson	f5afa43db5	Remove an unneeded parameter	2013-02-07 17:45:41 -08:00
Chris Robinson	d47d2216f2	Use some const references where appropriate	2013-02-07 16:33:44 -08:00
Chris Robinson	cbdd459500	Remove unneeded playerMove from PhysicActor	2013-02-07 15:48:41 -08:00
Chris Robinson	ca6f8b6d88	Reorganize a bit of code in the movement solver	2013-02-07 13:18:16 -08:00
Chris Robinson	fe0e6c452d	Remove the unneeded playerMove object from PhysicsSystem	2013-02-07 12:11:10 -08:00
Nikolay Kasyanov	0d4b0bfd93	Trying to resolve sound issues on OS X with ffmpeg backend	2013-02-07 23:40:20 +04:00
Marc Zinnschlag	dd2b7d5c63	handle deleted records	2013-02-07 13:26:00 +01:00
Marc Zinnschlag	c1cd8305bc	a bit of cleanup for the previous commit	2013-02-07 13:13:06 +01:00
Marc Zinnschlag	21733e8181	hide startup dialogue when opening open dialogue	2013-02-07 13:11:41 +01:00
Marc Zinnschlag	adcaea464b	basic globals record loading	2013-02-07 12:52:01 +01:00
Marc Zinnschlag	7d112e4d5c	rewrote logic of content file loading	2013-02-07 11:33:08 +01:00
Chris Robinson	8de2d24d0e	Restore old ground check	2013-02-06 21:57:59 -08:00
Chris Robinson	923d0d6eb4	Fix up some header includes	2013-02-06 21:47:09 -08:00
Chris Robinson	e577ee2de8	Add a method to set/retrieve being on the ground	2013-02-06 21:44:58 -08:00
Chris Robinson	ebc7bc9427	Rename A_AlwaysRun to A_Run ... Note that there is an "always run" key, but its functionality is handled by A_ToggleWalk.	2013-02-06 18:22:16 -08:00
Chris Robinson	a8f0ce43a5	Add a run key	2013-02-06 17:51:47 -08:00
Chris Robinson	cbaf489eb6	Add running states	2013-02-06 16:53:52 -08:00
Chris Robinson	04524fbf92	Don't scale the movement vector up	2013-02-06 15:23:52 -08:00
Chris Robinson	bdda7278c4	Use 3/4ths of the physic actor's height to test if swimming	2013-02-06 12:56:30 -08:00
Chris Robinson	dfd16c4424	Fix movement rotations	2013-02-06 12:39:26 -08:00
Marc Zinnschlag	43912f927a	Merge remote-tracking branch 'potatoesmaster/importer' into next ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-06 10:12:40 +01:00
Chris Robinson	9cf30f39bd	Don't apply gravity when swimming	2013-02-05 19:45:51 -08:00
Chris Robinson	fc307e64b0	Add swimming states	2013-02-05 19:05:07 -08:00
Chris Robinson	18b7008409	Better fix some scaling issues	2013-02-05 18:25:09 -08:00
Chris Robinson	535cd8360f	Load extra animations for NPCs	2013-02-05 18:09:43 -08:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Chris Robinson	c839502743	Setup base_anim.nif as an initial skeleton source for biped creatures	2013-02-05 17:16:45 -08:00
Chris Robinson	054ef3113a	Check existing skeleton sources if the current one has no animation root	2013-02-05 17:15:40 -08:00
Chris Robinson	16933e3926	Scale the accumulation root translation	2013-02-05 16:59:20 -08:00
Chris Robinson	600fe06f00	Use a vector of skeletons to handle animation sources	2013-02-05 16:29:51 -08:00
Chris Robinson	e217a3d25c	Silence some console spam	2013-02-05 15:51:26 -08:00
Emanuel Guevel	a4f051e85a	Fix game files import	2013-02-06 00:51:05 +01:00
Emanuel Guevel	6e3c016351	Add archives to settings imported by mwiniimporter ... Add Morrowind.bsa by default.	2013-02-06 00:51:05 +01:00
Chris Robinson	ee3764e9b3	Increase max slope to 60. 45 is too low.	2013-02-05 15:07:48 -08:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
Chris Robinson	8c0bb1ff4d	Rotate movement in the movement solver	2013-02-05 14:02:14 -08:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. ... Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Chris Robinson	f7f1adfb9d	Don't accumulate animations with activators	2013-02-05 12:55:06 -08:00
Chris Robinson	2c39760bd5	Move the movement solver code to mwworld's physics system	2013-02-05 12:45:10 -08:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. ... Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
Chris Robinson	0a4568bd11	Move the PtrMovementList typedef to MWWorld ... Use it for the doPhysics parameter, too	2013-02-05 11:03:39 -08:00
Chris Robinson	2cdda96798	Clear out some unneeded doPhysics stuff	2013-02-05 10:23:26 -08:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
Chris Robinson	3251796ba0	Fix left/right movement	2013-02-05 09:57:08 -08:00
Chris Robinson	d50832081c	Remove the unneeded PhysicActor field from MovementSolver	2013-02-05 09:37:02 -08:00
Chris Robinson	a782a9109b	Store the vertical velocity in the physic actor	2013-02-05 09:24:22 -08:00
Chris Robinson	82e4da4e64	Get the half-extents from the physicactor	2013-02-05 07:41:57 -08:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
Chris Robinson	1c604445ba	Store movement vectors as they get returned	2013-02-05 06:59:01 -08:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Chris Robinson	4bd1e63ac1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-05 03:26:46 -08:00
Marc Zinnschlag	c409f1184e	cleaned up object movement and fixed a bug regarding local scripts	2013-02-05 12:19:06 +01:00
Chris Robinson	786cb6e928	Merge remote-tracking branch 'zini/master' into animation2	2013-02-05 02:57:02 -08:00
Marc Zinnschlag	86fb3574a0	Merge remote-tracking branch 'wheybags/master' into next	2013-02-05 11:55:47 +01:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
Chris Robinson	5ee298cdc1	Make sure the player updates last	2013-02-04 14:08:38 -08:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
Chris Robinson	2f8affc955	Make sure the player's controller is properly updated when they change	2013-02-04 12:58:06 -08:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
Chris Robinson	ee9b19d2ed	Make sure to remove a Ptr from the activators when requested	2013-02-04 12:04:06 -08:00
Chris Robinson	39cf7b0b42	Pass the Ptr of the object being moved to the move method ... This prevents having to store another copy of it, which risks getting out of sync.	2013-02-04 11:17:48 -08:00
Chris Robinson	1a5cb8760d	Rotate movement vector to world space before passing to the movement solver	2013-02-04 11:04:20 -08:00
Chris Robinson	6b32fa7999	Use the correct position for the actor	2013-02-04 09:48:21 -08:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
Chris Robinson	1747c1e01a	Integrate a new movement solver to handle object movement and collisions ... Temporary, and pretty breoken. Needs some serious integration fixes.	2013-02-04 07:10:14 -08: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	3f0a49a2f6	Merge branch 'master' into startup ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-04 10:22:37 +01:00
Chris Robinson	91513206a0	Don't use per-animation accumulation values ... This breaks walking diagonally and "jumping" (which technically wasn't jumping anyway).	2013-02-03 12:02:51 -08:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
Chris Robinson	51d5efeeb2	Work out the state in the character controller update method	2013-02-03 07:15:34 -08:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Tom Mason	ac112ef972	refactored special variable code	2013-02-03 13:27:27 +00:00
Marc Zinnschlag	c97553703a	fixes for static build without cg	2013-02-03 13:47:55 +01:00
Marc Zinnschlag	a4872e3217	rewrote the opencs cmake scripts (more compact and no more annoying warnings)	2013-02-03 13:30:40 +01:00
Chris Robinson	23acf4b130	Don't break right away when the animation time remaining is 0	2013-02-03 01:38:42 -08:00
Chris Robinson	60a75cb5ee	Make sure to keep the character preview animation updated	2013-02-03 00:54:50 -08:00
Chris Robinson	7fe877d8ea	Add a couple more character states	2013-02-03 00:19:22 -08:00
Chris Robinson	007a5963de	Handle most state changes in the character controller when setting the movement vector	2013-02-02 23:39:43 -08:00
Tom Mason	f785659297	Implemented OnPCAdd special variable ... Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised for items added through it. Does not get reset on drop, as per original morrowind.	2013-02-02 17:36:12 +00:00
Michal Sciubidlo	155cca0c9a	Upload missing files. ... Fix folder name. Keep Qt optional. Move open dialogue from doc to tools. Rename 'load' to 'open'. Deleted wrong comment.	2013-02-02 18:36:01 +01:00
Marc Zinnschlag	67a1ec5166	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
Chris Robinson	c23a96d606	Run an aniamtion update after "playing" the inventory idle ... This is so all the NPC parts get updated correctly.	2013-02-02 06:08:03 -08:00
Chris Robinson	fc7590694d	Revert "Revert "Use a child scene node for the accumulation root"" ... This reverts commit 376dfed15b. I was wrong. It's needed at least for NPCs since they're attaching multiple animated skeletons to an object, and they all need to be offset correctly. Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode, though.	2013-02-02 05:43:37 -08:00
Marc Zinnschlag	85697e4628	reverted to C++03	2013-02-02 13:24:28 +01:00
Chris Robinson	7f87c1873b	Use an array to store the entity parts	2013-02-02 02:53:22 -08:00
scrawl	a461b282c1	water ripples (experimental)	2013-02-01 23:43:23 +01:00
Chris Robinson	376dfed15b	Revert "Use a child scene node for the accumulation root" ... This reverts commit d6f923f274. We don't need it for any of the NIFs we're currently handling. As long as there's no NIF files that would break it, we should require a stationary root if an animation wants to accumulate. If we must, a better idea may be to inject an extra bone into the skeleton instance and make that the accumulation root.	2013-02-01 08:50:32 -08:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Michal Sciubidlo	492482de7f	Add "open" option in opencs.	2013-02-01 00:42:03 +01:00
Tom Mason	0f58e03343	Unequipping items will reset OnPCEquip variable	2013-01-31 19:04:39 +00:00
Tom Mason	9ad08520fd	Implemented OnPCDrop special variable ... Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.	2013-01-31 18:45:32 +00:00
Tom Mason	0fc5ee5149	allow OnPCEquip special variable to be of any type	2013-01-31 17:46:16 +00:00
Chris Robinson	d6f923f274	Use a child scene node for the accumulation root	2013-01-30 22:28:18 -08:00
Tom Mason	09f9557ecb	Implemented OnPCEquip special variable	2013-01-31 00:34:16 +00:00
Tom Mason	dc91211b12	Fixed Small bug where scripts were being removed when they shouldn't be. ... Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.	2013-01-31 00:21:04 +00:00
Michal Sciubidlo	ac62dd050d	Rename datafilespage to datafileslist	2013-01-30 21:08:27 +01:00
Michal Sciubidlo	f029a9011a	Move datafilespage to shared space.	2013-01-30 20:21:03 +01:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC ... However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	5c3a7f7d52	Avoid handling animation states ... We don't need them anymore	2013-01-30 07:34:07 -08:00
Chris Robinson	360f7bfac8	Apply animations to bones manually ... Couple reasons for this: * This paves the way for allowing animations specified in other skeletons to be applied to the character (NPCs and certain creatures can have multiple animation sources, but Ogre is incredibly strict when it comes to sharing animations between skeletons). * It will allow for entities to be animated based on the character's skeleton, without having to duplicate the mesh for each skeleton it can be used on. This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor does it get in the way of hardware skinning.	2013-01-30 07:04:18 -08:00
Chris Robinson	600d3bf9eb	Make sure the player node's visibility cascades	2013-01-30 02:38:50 -08:00
Chris Robinson	04d4c125ba	Print when an animation event is unhandled	2013-01-29 02:00:42 -08:00
Chris Robinson	d4ddaa3d95	Only register activators that have a MWRender::Animation object	2013-01-29 01:08:52 -08:00
Chris Robinson	99efe4e494	Remove an unnecessary class member	2013-01-29 01:02:55 -08:00
Chris Robinson	879359f39d	Set the animation state loop flag as appropriate	2013-01-29 00:50:52 -08:00
Chris Robinson	92d0c55f32	Add a flag to specify if an animation should be playing	2013-01-29 00:43:42 -08:00
Chris Robinson	fdabef65a1	Use a method to update an object's cell in the mechanics manager ... This prevents destroying and recreating the object's character controller (and messing up the current animation) when moving between cells.	2013-01-29 00:19:24 -08:00
Chris Robinson	8d98f3649c	Use a separate class to handle activator mechanics	2013-01-28 23:39:11 -08:00
Chris Robinson	7df4d0d19f	Remove an unnecessary cast	2013-01-28 21:41:51 -08:00
Pieter van der Kloet	25edba0887	Rewriting the config code of the pages to use the new settings classes	2013-01-27 16:39:51 +01:00
Chris Robinson	7b71b4eb31	Add a missing include	2013-01-27 03:03:48 -08:00
Pieter van der Kloet	5579df30ff	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
Chris Robinson	0cd3880b20	Merge remote-tracking branch 'zini/master' into animation2	2013-01-26 04:54:52 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances ... This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Pieter van der Kloet	6faf6f57e1	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
Emanuel Guevel	19dff822f4	Dialogue: do not filter on disposition for creatures	2013-01-24 19:43:21 +01:00
Emanuel Guevel	ed9a9904b4	Dialogue filter: search script variables case-insensitively	2013-01-24 19:39:31 +01:00
Marc Zinnschlag	90d05858ef	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
Marc Zinnschlag	cd662af634	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
Chris Robinson	05f8b8c283	Specify the text key to reset animations to	2013-01-22 00:31:45 -08:00
Chris Robinson	37fe1bd3f0	Handle looping in the Animation object	2013-01-21 22:51:13 -08:00
Marc Zinnschlag	2756d3ee94	Merge remote-tracking branch 'wheybags/containerscripts'	2013-01-21 23:02:45 +01:00
Tom Mason	f5f3c2e62d	enabling / disabling should not affect scripts	2013-01-21 20:06:08 +00:00
Chris Robinson	e956a1cbc0	Merge SpecialIdle character state into Idle	2013-01-21 03:24:52 -08:00
Chris Robinson	6905bd18ba	Filter out the group name from the text keys ... It's already in the animation name, and the text keys are animation-specific anyway.	2013-01-21 02:59:12 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Chris Robinson	e1e76bde76	Combine a loop into another where it's used	2013-01-20 15:39:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Tom Mason	31c71c029d	objects with scripts attached, that are inside containers will behave correctly when the container is moved	2013-01-20 17:01:30 +00:00
Emanuel Guevel	736e471613	Print a fallback text when no topic response is found	2013-01-20 17:44:09 +01:00
Emanuel Guevel	43e85ea0c6	Disallow redirection to info refusal for greetings	2013-01-20 17:44:09 +01:00
Emanuel Guevel	05796d85a4	NPC: take stats from NPDT12 into account ... Some available stats (level, reputation and disposition) were not used for NPC with auto-calculated stats.	2013-01-20 17:44:08 +01:00
Emanuel Guevel	951eb1b236	Dialogue: return a response from "Info Refusal" when disposition is not satisfied	2013-01-20 17:44:08 +01:00
Tom Mason	23dada0ee4	moved script handling on enable / disable into their own functions	2013-01-20 16:38:56 +00:00
Tom Mason	28c580d280	disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly	2013-01-20 15:43:52 +00:00
Tom Mason	abe25c5f66	removed use of c++11 auto	2013-01-20 14:24:55 +00:00
Tom Mason	665a530e10	renamed realAdd to addImp	2013-01-20 14:14:34 +00:00
Tom Mason	3c6ddd7fa7	fixed isInCell method	2013-01-20 14:10:04 +00:00
Chris Robinson	85ca1e993f	Properly check if an animation exists before playing it	2013-01-19 21:55:04 -08:00
Nathan Jeffords	f55da17933	made some journal accessor methods constant	2013-01-19 16:21:41 -08:00
Nathan Jeffords	4c7ae3d1ff	prevent duplicate journal entries from being recorded	2013-01-19 16:21:15 -08:00
Nathan Jeffords	528c3da6da	record heard topics in journal	2013-01-19 16:20:22 -08:00
Chris Robinson	68779375b2	Implement WalkLeft and WalkRight character states	2013-01-19 16:19:47 -08:00
Nathan Jeffords	d6b956cdcf	fixed swapped day & month fields when created a stamped journal entry	2013-01-19 16:19:03 -08:00
Chris Robinson	a7b07ee5cf	Don't reset the animation when setting the same state ... Unless looping is being toggled on.	2013-01-19 15:46:22 -08:00
Chris Robinson	e0541b52c4	Use a list to store and get state information	2013-01-19 14:56:24 -08:00
Mark Siewert	a8e02779b2	- Add support for multiple plugins trying to modify the same reference ... - Fix a small signed/unsigned warning	2013-01-19 23:33:18 +01:00
Chris Robinson	de2d084e61	Add a looping property to handle if an animation should loop	2013-01-19 14:22:15 -08:00
Marc Zinnschlag	2d96f52864	select correct record when opening a dialogue sub view	2013-01-19 14:29:14 +01:00
Chris Robinson	0b68953f0d	Scale animation speed using the direction length ... The direction length doesn't currently give a good speed, but it's something.	2013-01-18 21:40:47 -08:00
Chris Robinson	aecfc0829a	Implement WalkForward and WalkBack character states	2013-01-18 18:04:00 -08:00
Chris Robinson	e33f59e0fe	Ensure the direction vector is initialized and copied properly	2013-01-18 17:41:36 -08:00
Chris Robinson	1cdd64cd9b	Return the animation movement from the character controller. ... Consequently, dead actors don't move anymore. The doPhysics call apparently isn't moving them.	2013-01-18 17:05:58 -08:00
Chris Robinson	9123f4f2af	Return the movement vector from runAnimation	2013-01-18 16:21:29 -08:00
Chris Robinson	9235fba770	Store the movement vector in the character controller	2013-01-18 16:00:51 -08:00
Chris Robinson	40f8e75763	Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations ... Note that actors will *not* automatically resume a normal idle state afterward. Their AI will need to control what to do when the special idle is finished.	2013-01-18 15:39:28 -08:00
Chris Robinson	a527cb8349	Loop the current animation when not dead ... This should be better, but it's not perfect. It misses the case where start < loop start == loop stop <= stop	2013-01-18 15:22:14 -08:00
Chris Robinson	c7684cb979	Pass the key time to markerEvent	2013-01-18 14:50:55 -08:00
Chris Robinson	3e9b0a333c	Allow specifying the accumulation for animations ... Animations that move a character may do so either visually or physically. An axis' accumuluation value specifies whether the movement is visual (0) or physical (1). Idle animations, for instance, typically don't physically move a character, while death animations may physically move them along the X and Y planes, but not along Z (the vertical movement is purely visual).	2013-01-18 14:25:32 -08:00
Chris Robinson	5cafc24ee2	Rename CharState_Alive back to CharState_Idle	2013-01-18 13:43:45 -08:00
Chris Robinson	613529f1d6	Merge remote-tracking branch 'zini/master' into animation2	2013-01-18 01:02:53 -08:00
Chris Robinson	a94947029e	Check the marker name before deciding what to do with it ... Also, don't force 'idle' after a playgroup	2013-01-18 00:59:48 -08:00
Chris Robinson	9d7ccfda1f	Rename CharState_Idle to CharState_Alive	2013-01-17 21:07:36 -08:00
Chris Robinson	8720433fa9	Do not automatically loop animations ... There are 0 length idle animations that break this	2013-01-17 17:54:09 -08:00
Chris Robinson	8fa1b56efc	Loop the current animation if there's nothing more queued	2013-01-17 16:34:26 -08:00
Chris Robinson	00879ab20e	Fix player rendering	2013-01-17 15:48:09 -08:00
Chris Robinson	fef6284f15	Only reset the animation time if a new state was set	2013-01-17 15:47:25 -08:00
Chris Robinson	fc0f9e2159	The animation state tracks the animation time for us	2013-01-17 14:49:42 -08:00
Chris Robinson	7cce44290e	Handle the animation queue in mwmechanics	2013-01-17 13:18:40 -08:00
Chris Robinson	47c157303a	Filter events that do not belong to the current group	2013-01-17 11:03:58 -08:00
Chris Robinson	da4f17859e	Recognize soundgen animation markers	2013-01-17 10:16:36 -08:00
Marc Zinnschlag	82b790770d	Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'	2013-01-17 10:21:01 +01:00
Chris Robinson	82d549e22f	Don't update the animation if time is the same	2013-01-16 21:39:14 -08:00
Chris Robinson	7ee389f3b2	Handle animation skipping in the character controller	2013-01-16 21:25:50 -08:00
Chris Robinson	852aa214cc	Store the available animation names in the character controller	2013-01-16 21:16:22 -08:00
Chris Robinson	afbc9f3e41	Keep track of the animation group currently playing	2013-01-16 20:44:37 -08:00
Chris Robinson	4dd01b81c6	Update mTime when updating or reseting the animation, and refactor the animation loop	2013-01-16 20:14:49 -08:00
Chris Robinson	685f219560	Return a movement vector from the character controller update	2013-01-16 18:56:13 -08:00
Chris Robinson	daad8d9859	Don't update the character controller while paused	2013-01-16 18:03:39 -08:00
Chris Robinson	d2f5a886c7	Handle playgroup and skipanim through mwmechanics	2013-01-16 17:53:18 -08:00
Emanuel Guevel	4feaa66897	Do not open the dialogue window if no greeting is found	2013-01-17 01:58:44 +01:00
Chris Robinson	46fc61a4c1	Run animations from the character controller	2013-01-16 16:31:09 -08:00
Chris Robinson	46728ab27f	Handle "sound:" animation events	2013-01-16 15:52:03 -08:00
Chris Robinson	3c32385e17	Avoid trying to animate things that don't have animations	2013-01-16 15:00:06 -08:00
Chris Robinson	94b93227d3	Treat activators as actors for rendering and mechanics ... Kinda hacky, but it's the only way to get animated activators (flags, silt striders, etc) to work properly.	2013-01-16 14:37:32 -08:00
Chris Robinson	d2fc3c7b33	Add a method to tell the character controller of new text keys	2013-01-16 13:09:21 -08:00
Marc Zinnschlag	7b568cbb15	Merge remote-tracking branch 'potatoesmaster/dialogue'	2013-01-16 22:03:40 +01:00
Chris Robinson	0a2f92f679	Keep track of the current text key in the animation	2013-01-16 11:57:08 -08:00
Chris Robinson	f46587c383	Store an character controller in the animation	2013-01-16 11:01:08 -08:00
Chris Robinson	3c487e6019	Play an animation when changing states	2013-01-16 10:45:18 -08:00
Chris Robinson	b378bc92a0	Store an animation object in the character controller	2013-01-16 10:16:37 -08:00
Chris Robinson	63e685ea39	Add a method to get the Animation from a Ptr	2013-01-16 09:59:19 -08:00
Chris Robinson	c1b32d6006	Remove outdated comments	2013-01-16 08:24:20 -08:00
Chris Robinson	3c02e1ccc9	Run physics right after updating the actors	2013-01-16 08:22:38 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Marc Zinnschlag	312f68bf9c	Merge remote-tracking branch 'thoronador/fix-spelling'	2013-01-16 12:28:33 +01:00
scrawl	df602553d1	Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.	2013-01-16 09:13:36 +01:00
Thoronador	3220330ce0	fix spelling in comment	2013-01-16 04:19:16 +01:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Emanuel Guevel	9e00c6694f	Allow only ID filtered topics for dialogue with creatures	2013-01-15 21:40:44 +01:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Marc Zinnschlag	3053440462	Issue #539: fixed AiWander	2013-01-15 12:40:44 +01:00
Emanuel Guevel	82287445af	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
Emanuel Guevel	f1f9173f24	Prevent closing dialogue window when an answer is expected	2013-01-15 00:53:32 +01:00
Jordan Milne	10a3caa504	more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine	2013-01-13 23:38:46 -04:00
Jordan Milne	9b485a86ef	resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round	2013-01-13 22:38:22 -04:00
Jordan Milne	043e29c620	Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)	2013-01-13 21:32:45 -04:00
scrawl	6c6ce4a05c	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-14 00:10:57 +01:00
Jordan Milne	d26e33eb26	Merge branch 'master' into sdl_input	2013-01-13 17:06:39 -04:00
Tom Mason	6fc64e8a4e	scripts run for items added to containers, and scripted items in player inv handled correctly	2013-01-13 19:49:56 +00:00
Tom Mason	7c8b3f1239	Merge remote-tracking branch 'real/master'	2013-01-13 17:07:18 +00:00
Tom Mason	c138e00aa2	objects scripts are now stopped when they are removed from a container	2013-01-13 17:05:12 +00:00
Marc Zinnschlag	654cd3ab9b	Issue #479: Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
Jordan Milne	b6ec64485c	fix includes for Windows	2013-01-12 17:52:26 -04:00
Tom Mason	d4ca954d47	scripts on items in containers added to script list on cell change	2013-01-12 18:31:57 +00:00
Chris Robinson	94b24f07e1	Keep track of the state in the character controller, and don't remove dead actors from the map	2013-01-12 10:10:27 -08:00
Chris Robinson	4890d901a2	Store an MWWorld::Ptr in the character controller	2013-01-12 08:49:08 -08:00
Jordan Milne	5a6589af01	extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start	2013-01-12 11:57:29 -04:00
Chris Robinson	35d17fdaf6	Associate a character controller with each MWWorld::Ptr	2013-01-12 07:12:12 -08:00
Marc Zinnschlag	f4ee8e2642	Issue #479: Added additional magnitude parameter to known spells	2013-01-12 13:10:20 +01:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	2c3719a6f5	Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.	2013-01-12 07:02:12 +01:00
scrawl	30136eb449	Update settings UI	2013-01-12 06:36:48 +01:00
scrawl	52516ca4b4	Merge branch 'master' into graphics	2013-01-12 01:22:01 +01:00
scrawl	ed3c23ad9a	Fixed crash on changing cell due to Utf8Encoder going out of scope	2013-01-12 01:18:36 +01:00
Jordan Milne	eeacb04fe2	Fully working hardware cursors (if you compile SDL2 with XCursor support)	2013-01-11 09:32:29 -04:00
Jordan Milne	3fb920a66f	Merge branch 'master' into sdl_input	2013-01-11 08:29:01 -04:00
Jordan Milne	f9b064d1bc	add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully	2013-01-11 08:27:59 -04:00
Marc Zinnschlag	101810d1e8	Merge remote-tracking branch 'scrawl/ingredients'	2013-01-11 11:12:07 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads ... Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	d469415e59	factored out two function from OMW::Engine::go ... The initialization code inside Engine::go is now in two function it calls prior to running the main loop.	2013-01-10 21:32:24 -08:00
Jordan Milne	a030c03513	support the printscreen button properly	2013-01-10 23:53:19 -04:00
Jordan Milne	403b6756f5	remove dependency on boost::locale, use system mouse position in in-game menus	2013-01-10 23:29:51 -04:00
scrawl	c71656493d	Ingredient effects now correctly hide until the player has discovered them	2013-01-11 01:23:24 +01:00
Jordan Milne	eff26159d9	Merge branch 'master' into sdl_input	2013-01-10 18:03:35 -04:00
Jordan Milne	601d79ef3f	fix the mouse wheel in mygui	2013-01-10 17:59:49 -04:00
Jordan Milne	ed644259ce	Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling	2013-01-10 17:21:47 -04:00
Chris Robinson	97f8c73d91	Remove some useless parameters ... SceneNode::setVisibility merely passes the value to its attached object, of which there are none at the point it would be called. Additionally, the method is always called with enabled=true anyway.	2013-01-10 11:09:33 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	771a5f7316	Add the beginnings of a character controller	2013-01-10 08:35:24 -08:00
Chris Robinson	e8ac3976b5	Fix some subentity assumptions	2013-01-10 06:35:06 -08:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
Marc Zinnschlag	274ff530dc	Merge remote-tracking branch 'wheybags/master'	2013-01-10 11:53:42 +01:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	55769aaf91	Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled	2013-01-10 01:46:00 +01:00
Marc Zinnschlag	6e0b86c6f9	Merge remote-tracking branch 'potatoesmaster/getdisposition'	2013-01-10 01:29:02 +01:00
Tom Mason	8486a51535	fixed drop amounts thanks to zinnschlag	2013-01-09 22:55:28 +00:00
Tom Mason	3517635cfd	added Drop and DropSoulGem functions	2013-01-09 21:16:45 +00:00
Marc Zinnschlag	4defb1a476	Merge remote-tracking branch 'trombonecot/lowerstring' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2013-01-09 22:13:59 +01:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
scrawl	b8c6f6640b	Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)	2013-01-09 21:56:26 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
scrawl	bc73c5b1ec	enable directional lighting for character previews	2013-01-09 20:08:59 +01:00
Tom Mason	5bfdb2449d	allowed dropObjectOnGround to be used on npcs, not just player	2013-01-09 18:53:14 +00:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Nathan Jeffords	6ca87e108f	updated loading screen to use the resource managers pattern matching when finding files	2013-01-09 08:54:03 -08:00
Nathan Jeffords	44031ec3d7	fleshed out BSAArchive and DirArchive. ... Implemented both lists & finds, with pattern matching. Conflicts: components/bsa/bsa_archive.cpp	2013-01-09 08:53:27 -08:00
Chris Robinson	be74859f05	Avoid some unnecessary copying when calling addPartGroup	2013-01-09 08:03:28 -08:00
Marc Zinnschlag	6567bf38f8	Merge remote-tracking branch 'wheybags/master'	2013-01-09 17:01:47 +01:00
Chris Robinson	9fedaf18d6	Make some methods private	2013-01-09 07:55:55 -08:00
Chris Robinson	625a538f03	Combine part selection into a single loop	2013-01-09 07:43:10 -08:00
Jordan Milne	cb01df49c0	begin to support text input	2013-01-09 11:30:33 -04:00
Jordan Milne	5fa77da9d4	Merge branch 'master' into sdl_input	2013-01-09 10:56:15 -04:00
Emanuel Guevel	3e41a1118a	GetDisposition: return calculated disposition instead of base disposition	2013-01-09 15:14:17 +01:00
Tom Mason	375961fe5e	small fix	2013-01-09 13:27:12 +00:00
Tom Mason	b035a5aa4a	beast races cannot equip anything they oughtn't to be able to equip	2013-01-09 13:18:05 +00:00
Jordan Milne	53cff0ba68	use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu	2013-01-09 09:05:47 -04:00
Chris Robinson	1e38e381a4	Use text keys for each animation	2013-01-09 03:30:55 -08:00
Marc Zinnschlag	649ae645f3	Merge remote-tracking branch 'blunted2night/bug_495_v2'	2013-01-09 12:12:41 +01:00
Jordan Milne	02ccb75894	Wrap the mouse to the window (except in debug mode) ... Grab the mouse when not in the main menu (except in debug mode) Always hide the cursor when it's over the window Allow warping the mouse around Handle ^C properly	2013-01-09 06:10:05 -04:00
Jordan Milne	1bf36c686c	add ability to check if a window is on the stack (to see if we're in the main menu)	2013-01-09 06:09:47 -04:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them ... I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Jordan Milne	857bb42297	Create a separate scenemanager for each CharacterPreview instance	2013-01-09 01:44:15 -04:00
Jordan Milne	f85679db93	Merge branch 'master' into sdl_input	2013-01-09 00:04:55 -04:00
Nathan Jeffords	719663d86e	added option to override the activation distance ... The command line option '--activate-dist <int>' can be used to override the in game activation distance.	2013-01-08 20:00:06 -08:00
Tom Mason	62a2ba1cc6	beast races cannot equip shoes/boots	2013-01-09 03:03:14 +00:00
Tom Mason	135f0870f7	in actionequip, was ignoring actor param, and always using player	2013-01-09 02:16:17 +00:00
Jordan Milne	6b49b8ab47	MyGUI doesn't care for SDL's mouse button ordering, send it what it expects	2013-01-08 22:14:30 -04:00
Jordan Milne	3b1d285cf3	fix compile errors, work with unmodified SDL	2013-01-08 21:01:58 -04:00
Nathan Jeffords	39d27b87c9	fixed build error with Audiere coded enabled	2013-01-08 09:14:56 -08:00
Marc Zinnschlag	d4a9236ae5	hocking up dialogue sub view to a widget mapper	2013-01-08 14:59:40 +01:00
Marc Zinnschlag	c0fb46384c	Merge branch 'master' into globals	2013-01-08 11:32:53 +01:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Jordan Milne	6449f68d61	Merge branch 'master' into sdl_input	2013-01-08 06:24:31 -04:00
Jordan Milne	884d3ea4d8	Rip out OIS, fill the holes with SDL goodness. WIP.	2013-01-08 06:19:05 -04:00
Marc Zinnschlag	c6ff58d5b5	Merge remote-tracking branch 'scrawl/videoplayback' ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-08 11:17:19 +01:00
Nathan Jeffords	b3932e3dea	added a separate activation distance for NPCs	2013-01-07 23:40:17 -08:00
Nathan Jeffords	b9fbd6ae4b	Factored faced object lookups into MWRender::World ... * Renamed MWWorld::World::getFacedHandle to getFacedObject. * Changed it to return an object pointer * Updated clients to use return object directly.	2013-01-07 23:38:08 -08:00
Nathan Jeffords	05dad29005	update MWWord::World to track distances while performing occlusion queries. ... This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.	2013-01-07 23:11:15 -08:00
Nathan Jeffords	0108be2e4f	updated MWWorld::PhysicsSystem::getFacedXXX functions ... * changed the names and return values to be consistent * made the distance to search a parameter * change the distance returned to world units instead of percentage of query distance	2013-01-07 23:00:00 -08:00
Nathan Jeffords	86f691d3d5	split MWWord::World::update into multiple functions	2013-01-07 22:48:24 -08:00
Chris Robinson	2a9dc5ad94	Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist	2013-01-07 21:00:21 -08:00
Tom Mason	9ee823d8f8	fixed typo in vmformat.txt	2013-01-07 21:09:03 +00:00
Tom Mason	4c5ed43cc9	added removesoulgem, and fixed addsoulgem	2013-01-07 21:08:04 +00:00
Tom Mason	c2901fe6cc	added addsoulgem scripting function	2013-01-07 18:16:50 +00:00
Chris Robinson	d8dbd5e206	Store text key iterators for the start and stop times	2013-01-07 05:56:03 -08:00
Chris Robinson	d3e949f5c6	Make the animation text keys lower case to help lookup	2013-01-07 05:23:44 -08:00
Chris Robinson	05dfafa777	Avoid an unnecessary lookup when moving the scene node	2013-01-07 05:09:15 -08:00
Chris Robinson	5f668976a8	Improve resetting the animation position	2013-01-07 04:48:59 -08:00
scrawl	f1b138d0a8	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-07 13:25:15 +01:00
scrawl	c2b75e28e9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2013-01-07 13:20:50 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
scrawl	35f4d09288	swscale handled better (cmake)	2013-01-07 13:06:16 +01:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Marc Zinnschlag	41767f8dfa	Merge remote-tracking branch 'blunted2night/better_flicker'	2013-01-07 12:06:21 +01:00
Chris Robinson	648e3331f5	Don't try to move objects that aren't in a cell	2013-01-06 23:20:20 -08:00
Chris Robinson	921ae76ea9	Merge remote-tracking branch 'zini/master' into animation2	2013-01-06 21:20:49 -08:00
Chris Robinson	5b3a20ef69	Update the object position as the animation moves	2013-01-06 21:18:48 -08:00
Chris Robinson	910619eb21	Store the NonAccum animation root from the skeleton instance ... Currently this is assumed to be the node with the animation text keys.	2013-01-06 17:31:53 -08:00
Chris Robinson	b96a979719	Store an MWWorld::Ptr with the Animation	2013-01-06 17:05:48 -08:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	2b1fe7dc44	Add part info for weapons and shields	2013-01-06 05:39:39 -08:00
Marc Zinnschlag	25815ab8f7	Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'	2013-01-06 13:31:01 +01:00
Chris Robinson	976b042cca	Use a list to reduce some repeating code	2013-01-06 02:14:19 -08:00
Chris Robinson	99769879e3	Fix some createEntities calls	2013-01-06 00:32:38 -08:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
Emanuel Guevel	63f09462fd	to_utf8, Utf8Encoder: pass encoding as constructor parameter ... Edit other files accordingly.	2013-01-06 01:37:58 +01:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	818a24cdd6	Hold on to the AnimationState being used for animating	2013-01-05 00:03:14 -08:00
Chris Robinson	6e84d4bcdd	Add a helper method to load entity objects	2013-01-04 23:19:48 -08:00
Marc Zinnschlag	fbb59302d9	Merge remote-tracking branch 'blunted2night/loading_screen_fix'	2013-01-04 10:50:59 +01:00
Emanuel Guevel	67273fc177	mwiniimporter: use Utf8Encoder	2013-01-04 01:52:02 +01:00
Nathan Jeffords	9afe4467d8	cache results of query for spash screen names ... ResourceGroupManager::listResourceNames returns a list of all resource accessable which is expensive, this change caches the result of the processed query so additional splash screen changes are quicker.	2013-01-03 15:45:09 -08:00
Mark Siewert	d6377fb2e3	- Support deleting references from a plugin ... - Add preliminary support for loading some unique fields appearing only in savegames - Add a few lines required for supporting respawning references. Incomplete.	2013-01-03 18:51:04 +01:00
Marc Zinnschlag	b7b51f24d6	added new Role for table headers (Role_Display)	2013-01-03 11:20:25 +01:00
Marc Zinnschlag	0af7a2888a	Merge remote-tracking branch 'scrawl/ai_script'	2013-01-03 09:56:36 +01:00
Marc Zinnschlag	25d9918765	post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)	2013-01-03 09:55:48 +01:00
Marc Zinnschlag	c0260697c2	Merge remote-tracking branch 'scrawl/master'	2013-01-03 09:52:46 +01:00
Marc Zinnschlag	ce5d27b07b	Merge remote-tracking branch 'scrawl/button_fixes'	2013-01-03 09:50:24 +01:00
scrawl	42e0501c67	fix typo	2013-01-03 02:40:21 +01:00
scrawl	a5ef669eb6	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD ... Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-01-03 02:34:31 +01:00
scrawl	ba7086cadf	Use race/class names (instead of ID) in replaced escape sequences	2013-01-03 02:05:05 +01:00
scrawl	1718d735b5	Fix menu/journal/book/scroll buttons when using localised MW-installations ... This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.	2013-01-03 01:09:03 +01:00
scrawl	ddbe13e569	Workaround for http://bugs.openmw.org/issues/475	2013-01-03 01:07:17 +01:00
Marc Zinnschlag	ff74f687fb	Merge remote-tracking branch 'lazydev/master'	2013-01-02 16:04:44 +01:00
lazydev	04cca2a1ce	fix for http://bugs.openmw.org/issues/517	2013-01-02 18:58:52 +04:00
Marc Zinnschlag	83fe128e87	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2013-01-02 10:05:27 +01:00
scrawl	86f30992d7	fix message boxes not appearing properly when e.g. trading	2013-01-01 22:00:14 +01:00
Emanuel Guevel	2a7336c310	mwiniimporter: handle ini file encodings ... Use components/to_utf8 to handle encodings. Add an --encoding option for choosing between win1250, win1251 and win1252 encodings for the imported ini file.	2013-01-01 21:59:30 +01:00
Marc Zinnschlag	4a8bf40a83	Merge remote-tracking branch 'lazydev/master'	2013-01-01 20:45:09 +01:00
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	2013-01-01 22:18:21 +04:00
Emanuel Guevel	e9a464c9f7	mwiniimporter: remove fallback values for Cursors	2012-12-31 16:45:24 +01:00
Emanuel Guevel	e2b348de96	mwiniimporter: fix line ending problem	2012-12-31 16:44:22 +01:00
Marc Zinnschlag	65c7c7f60e	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2012-12-31 14:47:05 +01:00
greye	7e0713f6c4	fix string case update	2012-12-31 11:22:40 +04:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
Marc Zinnschlag	8b2785400b	Merge remote-tracking branch 'trombonecot/comparestring'	2012-12-30 20:11:18 +01:00
eduard	69d9d22579	comparestring	2012-12-30 19:56:38 +01:00
Marc Zinnschlag	e577731a06	Merge remote-tracking branch 'scrawl/master'	2012-12-30 18:31:35 +01:00
scrawl	f56182cac2	fix journal window not rendering any text	2012-12-30 17:06:17 +01:00
Emanuel Guevel	cb71efc427	mwiniimporter: clean up	2012-12-30 16:44:52 +01:00
Emanuel Guevel	38e7dbb970	mwininimporter: add more fallback values	2012-12-30 16:43:05 +01:00
Marc Zinnschlag	714b1924a5	partial dialogue subview implementation	2012-12-30 14:01:52 +01:00
eduard	98103e15eb	conflict resolution	2012-12-30 13:46:07 +01:00
eduard	fb25f407fb	dialoguemanager conflict	2012-12-30 13:37:19 +01:00
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	2012-12-30 13:09:37 +01:00
Emanuel Guevel	9d043d0193	mwiniimporter: fix string cutting	2012-12-29 18:16:03 +01:00
Emanuel Guevel	b2203d22fc	mwiniimporter: added fallback values ... Ugly comments included. I will merge it on another branch to clean this up later.	2012-12-29 18:15:32 +01:00
scrawl	1dcc0f10ee	Merge pull request #6 from ChrisKCat/videoplayback ... Videoplayback	2012-12-28 15:28:58 -08:00
Marc Zinnschlag	8d4afe3bf5	post merge fix	2012-12-28 23:45:13 +01:00
Marc Zinnschlag	e2a8e2107b	Merge branch 'globals'	2012-12-28 23:42:02 +01:00
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	2012-12-28 23:31:43 +01:00
Tom Mason	bed8fb69e6	added bounty related scripting functions	2012-12-28 22:26:21 +00:00
Chris Robinson	1dd9276ceb	Add missing decoder method declarations	2012-12-28 11:26:41 -08:00
scrawl	ade4ec0453	fix texture edge bleeding due to wrong addressing mode	2012-12-28 19:01:47 +01:00
eduard	c75a5ae212	string compare and tolower	2012-12-28 18:05:52 +01:00
eduard	8545667bbd	string compare and tolower	2012-12-28 17:54:56 +01:00
Tom Mason	ad9b86058b	replaced explicit text with GMST entries, thanks to zinnschlag	2012-12-27 15:28:13 +00:00
Tom Mason	ba2301a156	removed redundant code thanks to scrawl	2012-12-27 00:49:39 +00:00
Tom Mason	299a1f32ed	cleanup	2012-12-26 23:52:16 +00:00
Tom Mason	51fce62b69	Merge branch 'messageboxes'	2012-12-26 23:06:27 +00:00
Tom Mason	716fbbbd74	messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory	2012-12-26 22:57:53 +00:00
Tom Mason	a14b7e4a0f	small fixes on text defines	2012-12-26 18:07:56 +00:00
Marc Zinnschlag	afc2e840ae	renamed namespace TranslationData to Translation	2012-12-26 17:06:33 +01:00
Marc Zinnschlag	206c613b52	moved translation storage from GUI manager to engine	2012-12-26 17:03:37 +01:00
Marc Zinnschlag	2d468fec02	made previous commits naming standard compliant	2012-12-26 16:19:59 +01:00
Marc Zinnschlag	4c28f3211b	Merge remote-tracking branch 'lazydev/master'	2012-12-26 15:50:03 +01:00
Mark Siewert	8ccec17481	- Restore ability for plugins deleting records defined in parent files ... - Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)	2012-12-26 10:34:59 +01:00
Mark Siewert	049b0e66e0	- Restore ability to generate references in the same cell from multiple plugins ... - Disable some code related to deleting entries in the store so that it builds again	2012-12-25 20:27:30 +01:00
lazydev	1f71395660	renaming of translation component; removing of C++11 features	2012-12-25 23:20:39 +04:00
lazydev	74ae479780	Cell names localization fix	2012-12-23 23:23:24 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
Chris Robinson	85850c7440	Fix DEFAULT_OUTPUT declaration	2012-12-18 10:43:04 -08:00
scrawl	64210e6efa	Revert "New Game button" ... This reverts commit c5dd0e1968.	2012-12-18 19:09:27 +01:00
scrawl	1c73a3f2fb	Revert "remove commandline switch for new game" ... This reverts commit 86671096ec.	2012-12-18 19:09:08 +01:00
Chris Robinson	7b2c3e6cd3	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00
Chris Robinson	3b7edae7c3	Don't hold a list of all sound sources	2012-12-18 05:19:32 -08:00
Chris Robinson	fe36cc1de7	Don't try to resume sound types that aren't paused	2012-12-18 04:35:24 -08:00
Chris Robinson	2f8daec379	Allow pausing only certain types of sounds	2012-12-18 04:19:35 -08:00
Marc Zinnschlag	1cf019a007	post merge fix	2012-12-18 12:36:26 +01:00
Chris Robinson	b4e36d4f31	Add a method to get the volume from the sound type	2012-12-18 02:01:04 -08:00
Chris Robinson	a5356e194e	Allow specifying a type for the playTrack method	2012-12-18 01:35:20 -08:00
Chris Robinson	72ffceb206	Add type flags to the sound play mode	2012-12-18 00:57:57 -08:00
Chris Robinson	dd3e568a00	Set the sound properties at initialization	2012-12-17 23:35:20 -08:00
Chris Robinson	20321c4552	Keep track of the actual active sounds	2012-12-17 21:50:01 -08:00
Chris Robinson	d348435a1d	Improve audio open error message	2012-12-17 21:09:57 -08:00
Chris Robinson	67485d3454	Store the AVStream in the decoder for easy referencing	2012-12-17 07:15:53 -08:00
Chris Robinson	4373218746	Fix audio stream check	2012-12-17 06:56:30 -08:00
Chris Robinson	58ab3407b7	Constify a couple fields	2012-12-17 04:17:06 -08:00
Chris Robinson	9e842a0bbb	Fix for trying to play videos when not supported	2012-12-17 00:41:04 -08:00
Chris Robinson	26660110e5	Allow building the video player without ffmpeg (playVideo will always throw an exception)	2012-12-17 00:20:56 -08:00
Chris Robinson	06fd66e99d	Move some fields to the class they're used in	2012-12-16 11:49:46 -08:00
scrawl	f0f521a4e0	enableRestMenu -> enableRest	2012-12-16 16:55:59 +01:00
Chris Robinson	9c805483b0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-16 07:17:06 -08:00
scrawl	86671096ec	remove commandline switch for new game	2012-12-16 16:14:49 +01:00
scrawl	c5dd0e1968	New Game button	2012-12-16 16:05:31 +01:00
Chris Robinson	c92cde2be9	Properly flush packet queues when at EOF ... Note: the previous flush method was renamed to clear. Flushing a queue allows consumers to retrieve queued packets, but not expect any more to come in.	2012-12-16 05:50:20 -08:00
Chris Robinson	6bc526b74d	Avoid another loop for decoding audio	2012-12-16 05:30:38 -08:00
Marc Zinnschlag	77852439ce	moved ColumnBase and Column struct into a separate translation unit	2012-12-16 12:52:23 +01:00
Chris Robinson	254a623319	Remove a redundant check	2012-12-16 03:09:24 -08:00
Chris Robinson	dd20db5dc2	Remove the stream indices from the VideoState	2012-12-16 03:05:44 -08:00
Chris Robinson	3f6d36c712	Avoid double-setting the material texture	2012-12-16 02:19:19 -08:00
Chris Robinson	e9d833be03	Use the packet pts to calculate the decoder sample offset	2012-12-16 01:56:52 -08:00
Chris Robinson	0edc87825d	Move audio_clock to the decoder where it's used	2012-12-16 01:17:58 -08:00
Chris Robinson	4561c22e2b	More fixes for the audio clock ... The audio_clock for the decoder represents the end of the current packet, so it needs to be adjusted back to match the position that's actually going to be read next.	2012-12-16 00:07:56 -08:00
Chris Robinson	1a771ae671	Merge the stream struct into the parent decoder	2012-12-15 23:46:32 -08:00
Chris Robinson	5fff1c4e47	Update the ffmpeg decoder to use avcodec_decode_audio4	2012-12-15 23:22:37 -08:00
Chris Robinson	5f4c33f896	Only store one packet at a time	2012-12-15 22:54:54 -08:00
Chris Robinson	9d86890d9d	Only use one stream for the ffmpeg decoder	2012-12-15 22:13:19 -08:00
scrawl	a3bd3a40ca	fix 2 unrelated leaks	2012-12-16 00:47:29 +01:00
scrawl	18623a5efe	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback	2012-12-16 00:43:34 +01:00
scrawl	edf18a7d6e	change destruction order to fix crash on exit when a video is playing	2012-12-15 22:01:45 +01:00
Chris Robinson	c869444dcf	Don't leak the IO context if avformat_open_input fails	2012-12-15 11:31:50 -08:00
scrawl	63e86555b6	use sample_aspect_ratio if available	2012-12-15 19:40:59 +01:00
scrawl	5ed04ae53e	added black bars	2012-12-15 19:23:03 +01:00
Chris Robinson	e6d27cd6d0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-15 09:15:47 -08:00
Chris Robinson	9b3cf5c159	Use a looping thread to trigger refreshes	2012-12-15 09:14:58 -08:00
Chris Robinson	fa1ad381da	Make sure packets are cleaned up properly	2012-12-15 08:42:54 -08:00
scrawl	7477345481	fixed video material	2012-12-15 17:10:21 +01:00
Chris Robinson	db23c8152e	Only duplicate AVPackets as needed ... Packets that don't have a destruct method are using static memory, which will only be valid until the next av_read_frame call. Otherwise, it's already dynamically allocated and will remain valid.	2012-12-15 07:47:03 -08:00
Chris Robinson	6008cf0d15	Remove unneeded video_current_pts field	2012-12-15 05:02:01 -08:00
Chris Robinson	da44141b95	Avoid creating extra texture unit states on the video material	2012-12-15 04:17:28 -08:00
Chris Robinson	d50698d7d1	Clean up the rectangle and scene node used for displaying the video	2012-12-15 04:01:52 -08:00
Chris Robinson	eb0e8d9e37	Simplify PacketQueue::get	2012-12-15 02:50:59 -08:00
Chris Robinson	b41a77648e	Avoid re-reading the source sample to duplicate, to avoid pointer aliasing	2012-12-15 02:33:59 -08:00
Chris Robinson	62a995d492	Calculate audio sync once per read	2012-12-15 00:18:42 -08:00
Chris Robinson	32b0a5d96e	Update the queued sample count immediately	2012-12-14 23:42:49 -08:00
Chris Robinson	cbdf6ad595	Move more stuff to where it should be, and improve cleanup	2012-12-14 09:07:59 -08:00
Chris Robinson	71ff90aaee	Don't use sub-frame timing for the video clock	2012-12-14 08:42:37 -08:00
Chris Robinson	582efcdb9b	Always try to resync if the clock difference is large	2012-12-14 07:40:19 -08:00
Chris Robinson	f97eaec7ab	Consolidate some code	2012-12-14 07:29:58 -08:00
Chris Robinson	d66d8a3118	Don't assume we can write beyond the end of the sample buffer	2012-12-14 06:43:51 -08:00
Chris Robinson	7332ffb0f8	Let the wanted sample size go down to 0	2012-12-14 06:02:34 -08:00
Chris Robinson	05c6483257	Fix external clock	2012-12-14 04:35:57 -08:00
Chris Robinson	2f37d31108	Move some definitions into the source file they're used in	2012-12-14 04:12:34 -08:00
Chris Robinson	a6e627001a	Avoid a for(;;) construct	2012-12-14 03:23:04 -08:00
Chris Robinson	4d6c05f6cc	Tighten audio skew allowance	2012-12-14 03:19:32 -08:00
Chris Robinson	8db5d10f10	Avoid showing a video picture if we're late ... Ideally we should skip decoding, or at least YUV->RGB conversion, too.	2012-12-14 03:11:59 -08:00
Chris Robinson	157cb10f56	Fix a 16-bit audio assumption	2012-12-14 02:39:46 -08:00
Chris Robinson	c2b711d195	Move some more methods to the class they're part of	2012-12-14 02:36:29 -08:00
Chris Robinson	26a09ee7ba	Move some methods into their respective class	2012-12-14 01:38:00 -08:00
Chris Robinson	5221298a7f	Move a couple packet queue methods into the struct	2012-12-14 01:14:14 -08:00
Chris Robinson	90294c589b	Use a volatile bool for the refresh	2012-12-13 18:24:57 -08:00
Chris Robinson	f555dc60eb	Reduce some indentation	2012-12-13 18:12:17 -08:00
Chris Robinson	6cedd64509	Fix audio sync correction sizes	2012-12-13 18:05:27 -08:00
Chris Robinson	e291d0943d	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-13 17:53:50 -08:00
Chris Robinson	606fb982a8	Update to use avcodec_decode_audio4	2012-12-13 17:53:22 -08:00
scrawl	82564e07c7	fix crash when video file doesn't exist	2012-12-14 01:44:00 +01:00
scrawl	27cd9ff732	Revert "Use the decoded frame pts when available" ... This reverts commit cab68df257.	2012-12-14 01:03:49 +01:00
scrawl	9d6f656822	fixed ogre resource functions	2012-12-14 00:10:54 +01:00
Chris Robinson	43481ad117	Use the external clock by default	2012-12-13 06:11:32 -08:00
Marc Zinnschlag	f95e72166c	hide type column in non-mixed type tables	2012-12-13 15:03:35 +01:00
Marc Zinnschlag	faa5ef0874	rewrote column class	2012-12-13 14:53:16 +01:00
Chris Robinson	0a5ab977b7	Use the decoder's sample offset for calculating the stream offset	2012-12-13 05:04:53 -08:00
Marc Zinnschlag	640c218df3	made record state uneditable again	2012-12-13 13:52:26 +01:00
Marc Zinnschlag	3d4c8c5444	added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion	2012-12-13 13:35:08 +01:00
Chris Robinson	cab68df257	Use the decoded frame pts when available	2012-12-13 04:25:41 -08:00
Chris Robinson	1ea1407707	Support quad, 5.1, and 7.1 with OpenAL and ffmpeg ... The other decoders don't guarantee any channel ordering, which makes them useless.	2012-12-13 04:10:19 -08:00
Chris Robinson	600494eed8	More cleanup of unused code	2012-12-13 03:37:04 -08:00
Chris Robinson	f7ff8b3374	A bit more cleanup	2012-12-13 03:13:44 -08:00
Chris Robinson	7e8b844b2e	Clean up some unused code	2012-12-13 03:05:37 -08:00
Chris Robinson	d2fbae9760	Init and deinit the VideoState synchronously, and re-enable audio playback	2012-12-13 02:52:37 -08:00
Chris Robinson	f067b22b3f	Use a recursive mutex for the OpenAL stream thread	2012-12-13 02:33:35 -08:00
Chris Robinson	ba9c5f5b4e	Don't initially fill buffers in OpenAL_SoundStream::play	2012-12-13 02:32:21 -08:00
Marc Zinnschlag	02184526e6	moved two helper classes from view/world/table into a separate translation unit	2012-12-13 11:24:39 +01:00
Chris Robinson	1ffaf6625a	Remove SDL for playing movie audio and prepare for using an audio track ... This breaks audio playback on movies	2012-12-13 01:42:20 -08:00
Chris Robinson	779ced0889	Add a method to play an audio track with a custom decoder	2012-12-13 00:05:57 -08:00
Chris Robinson	1571243ef0	Implement getTimeOffset for OpenAL_SoundStream	2012-12-12 23:16:45 -08:00
Chris Robinson	86bf6388c6	Pass a decoder to the playStream sound output method	2012-12-12 22:32:02 -08:00
Chris Robinson	9c831d3039	Add a decoder method to get the "file" name	2012-12-12 22:19:44 -08:00
Chris Robinson	1fb9eef27b	Detach the thread used for frame timing	2012-12-12 22:02:33 -08:00
Chris Robinson	34e36fb852	Add a method to get the time offset from sounds	2012-12-12 16:50:35 -08:00
Marc Zinnschlag	cc18b30e17	open sub view on double click in report view	2012-12-12 22:36:20 +01:00
scrawl	7fd9e1d212	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/videoplayer.cpp	2012-12-12 22:24:38 +01:00
scrawl	18d8c767bd	fix a bunch of warnings, improved error handling, initialize texture to black	2012-12-12 15:15:55 +01:00
Chris Robinson	2c1eceb9f0	Add methods to pause and stop all playing sounds (and music)	2012-12-12 02:33:12 -08:00
Chris Robinson	973b5faf25	Keep track of all allocated sources	2012-12-12 01:32:16 -08:00
Chris Robinson	e82c4afd50	close SDL when closing the video, not after the video loop is finished	2012-12-12 00:36:52 -08:00
Chris Robinson	a62d5bbfe4	Sleep using the absolute time, so the thread creation doesn't add to the wait	2012-12-11 23:54:41 -08:00
Chris Robinson	c2e1595445	Treat paused sounds as still playing	2012-12-11 21:01:32 -08:00
Chris Robinson	2efdafecd9	Indentation fixes	2012-12-11 20:11:48 -08:00
Chris Robinson	277248cdcb	Fix some "comparison between signed and unsigned" warnings	2012-12-11 19:43:07 -08:00
Chris Robinson	3519934f27	Add a missing return value	2012-12-11 19:36:04 -08:00
Chris Robinson	9e2d4f8b7c	Avoid potential NULL dereference	2012-12-11 19:32:10 -08:00
scrawl	fe384a1600	pause 3d rendering while the video plays	2012-12-12 01:30:34 +01:00
scrawl	faad64b254	Esc cancels the video	2012-12-12 01:13:53 +01:00
scrawl	0ce5ade6d8	DataStreamPtr fix, indentation fixes	2012-12-11 23:06:06 +01:00
scrawl	c49966dd29	started over	2012-12-11 22:49:31 +01:00
scrawl	5f676f9c6b	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp	2012-12-11 22:28:23 +01:00
Marc Zinnschlag	c75563c184	report model and view	2012-12-11 15:35:47 +01:00
Marc Zinnschlag	2db930a5cf	rewrote subview factory system	2012-12-11 13:22:43 +01:00
Marc Zinnschlag	0ed378dfb2	changed sub view factory method signature	2012-12-11 11:24:30 +01:00
Marc Zinnschlag	de4a03081c	fixed skill level type in skill level up message	2012-12-10 11:04:21 +01:00
scrawl	e3dd3d565c	fix 2 leaks	2012-12-10 00:59:39 +01:00
Marc Zinnschlag	832fc56d34	changed UniversalId to string conversion	2012-12-09 11:10:35 +01:00
Marc Zinnschlag	5f5addf052	fixed an enum	2012-12-09 00:12:24 +01:00
Marc Zinnschlag	9fe7ff9690	added mandatory ID check stage	2012-12-08 23:27:59 +01:00
Marc Zinnschlag	72623652e4	addded messages interface for operations/stages	2012-12-08 18:38:36 +01:00
Marc Zinnschlag	89b4497331	added missing edit locks for create/revert/delete	2012-12-08 18:15:00 +01:00
Marc Zinnschlag	6c18be39f0	added stage class	2012-12-08 17:53:45 +01:00
Marc Zinnschlag	8b7f342641	removed last remains of old verify implementation	2012-12-08 17:00:58 +01:00
Marc Zinnschlag	af9b48f4d3	added operations base class	2012-12-08 15:25:50 +01:00
Marc Zinnschlag	a2b4f43176	moved document state enum to a separate file	2012-12-08 14:44:03 +01:00
Marc Zinnschlag	0e7ba008ad	another skill gain fix	2012-12-08 14:28:56 +01:00
Marc Zinnschlag	caaffd1ec2	handle persuasion records properly	2012-12-08 14:24:15 +01:00
Marc Zinnschlag	a70a5282f4	fixed an overzealous skill gain error check	2012-12-08 13:37:43 +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	386eec51c1	some skill usage fixes	2012-12-07 11:36:38 +01:00
eduard	e50b9aca86	tradding skill use, spechcraft use	2012-12-06 20:58:33 +01:00
eduard	2d62649dc9	tradding skill use, spechcraft use	2012-12-06 18:30:19 +01:00
eduard	b2a0e4b1fd	tradding skill use, spechcraft use	2012-12-06 18:19:35 +01:00
Marc Zinnschlag	1c80390bce	Merge branch 'master' into editor2	2012-12-06 15:26:03 +01:00
Marc Zinnschlag	2b53cf6547	do not list actions in the pop up menu that do not apply to any of the selected records	2012-12-06 15:25:31 +01:00
Marc Zinnschlag	c12ee129f7	added delete command	2012-12-06 15:18:41 +01:00
Marc Zinnschlag	b41cc5e9e9	added revert command	2012-12-06 14:56:04 +01:00
eduard	ea8ee11ff7	tradding skill use	2012-12-06 14:25:53 +01:00
eduard	5332546541	tradding skill use	2012-12-06 13:58:52 +01:00
Marc Zinnschlag	8bcd7d8fb1	fixed a type in a script instruction	2012-12-04 20:56:45 +01:00
Marc Zinnschlag	f07b7d17cd	improved exception handling	2012-12-04 20:43:47 +01:00
Marc Zinnschlag	8e1a2e3a13	Issue #474: adjust global variable pcrace	2012-12-04 10:58:43 +01:00
Marc Zinnschlag	5cd2fe00ab	initialise blank global records	2012-12-03 22:16:02 +01:00
Marc Zinnschlag	8e93bfa607	turned the global class into a general purpose table subview class	2012-12-03 22:03:02 +01:00
Marc Zinnschlag	0a8b7602d3	fixed edit lock	2012-12-03 21:51:42 +01:00
Marc Zinnschlag	49d6239004	added pop-up menu with create record action	2012-12-03 21:44:16 +01:00
scrawl	7cc28c3eb9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2012-12-03 17:43:00 +01:00
scrawl	3106db0379	commented out debug output	2012-12-03 17:41:38 +01:00
scrawl	bc90c75176	more clean up, video played with correct speed, videos without sound working too (mw_credits.bik)	2012-12-03 17:33:02 +01:00
scrawl	a77d910aaf	audio codec is opened, some cleanup	2012-12-03 16:44:41 +01:00
Marc Zinnschlag	db29e411c4	added merge functions; temporarily merge on document creation	2012-12-03 13:56:02 +01:00
scrawl	3db850a7d1	Don't crash if no loading screens are found	2012-12-03 05:45:04 +01:00
scrawl	ea2bbec76e	better fix for bed activation	2012-12-03 05:32:12 +01:00
Tom Mason	a6fd369e4e	Fixed wait window reappearing after sleeping	2012-12-02 22:10:47 +00:00
greye	682fd23aea	fix wrong increment	2012-12-02 21:18:59 +04:00
Marc Zinnschlag	b25f2e88ce	Issue #492: fixed double alchemy ingredients removal	2012-12-02 15:07:22 +01:00
Marc Zinnschlag	556d737f65	Merge remote-tracking branch 'trombonecot/windowformatting'	2012-12-02 14:36:36 +01:00
eduard	30d0e93cf4	Fix window formatting on tool tip with too log titles	2012-12-02 14:12:18 +01:00
eduard	7e7e6e2bcb	Fix window formatting on tool tip with too log titles	2012-12-02 14:08:22 +01:00
scrawl	d432420a32	fix FindFFmpeg.cmake	2012-12-01 20:53:28 +01:00
Marc Zinnschlag	bd5e364ac1	display record state in table	2012-12-01 13:42:12 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
Marc Zinnschlag	ec1f957e54	edit lock for sub views	2012-11-30 13:58:10 +01:00
rpopovici	7079b9062f	add AI script functions	2012-11-30 02:16:16 +02:00
Marc Zinnschlag	8dd76b49af	factored out table widget from globals sub view	2012-11-29 19:09:06 +01:00
Marc Zinnschlag	fd55c0cae2	record IDs are no longer handled as a special case	2012-11-29 18:56:28 +01:00
Marc Zinnschlag	4086b556d2	use commands for modifying globals	2012-11-29 16:05:28 +01:00
Marc Zinnschlag	8a09e03d5c	global variable editing (no undo support yet)	2012-11-29 14:45:34 +01:00
scrawl	398eecc35e	GetWeaponType fix	2012-11-28 02:51:46 +01:00
scrawl	00e46addc2	GetArmorType fix	2012-11-28 02:48:21 +01:00
scrawl	8e857587d7	fix a text coloring bug	2012-11-28 02:36:33 +01:00
scrawl	1def60dbe1	PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank	2012-11-28 02:15:34 +01:00
scrawl	9f720ccbc9	Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting	2012-11-28 02:14:37 +01:00
scrawl	644dacf603	suggestion by Zini for SetDelete	2012-11-28 01:30:18 +01:00
Marc Zinnschlag	5eb0f489e2	Issue 476: fixed auto-move bypassing disabled player controls	2012-11-27 18:39:12 +01:00
Greendogo	8b18d195bd	Update apps/openmw/main.cpp ... Edited the description for the --script-run switch.	2012-11-27 04:50:49 -06:00
Marc Zinnschlag	92f70635a2	improved selection behaviour	2012-11-27 10:42:46 +01:00
scrawl	d6dd212ce8	GetWerewolfKills, ModScale, SetDelete, GetSquareRoot	2012-11-27 06:54:13 +01:00
Marc Zinnschlag	ef9575498f	basic (non-editable) subview for global variables	2012-11-26 12:29:22 +01:00
Mark Siewert	b103426cf0	- Partially reimplement deleting objects defined in a parent esX file. ... - Try to reimplement multiple esX files dropping references in the same file. NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.	2012-11-25 19:07:16 +01:00
Mark Siewert	896ab44d1e	- Add some updated files missing from last commit. ... - Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.	2012-11-25 17:19:29 +01:00
Mark Siewert	8ea9f00e6f	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.	2012-11-25 14:12:44 +01:00
Marc Zinnschlag	1dd63e9fb6	Merge branch 'master' into editor2	2012-11-25 10:50:34 +01:00
scrawl	1ccad32877	GetWeaponType	2012-11-25 02:06:43 +01:00
scrawl	e68dc19256	GetCurrentTime, HasSoulGem	2012-11-25 01:54:37 +01:00
scrawl	0db48b29c7	GetSpellEffects, GetRace	2012-11-25 01:26:29 +01:00
scrawl	4b830e5c7a	Merge branch 'scripting' of github.com:scrawl/openmw into scripting	2012-11-25 00:44:38 +01:00
Marc Zinnschlag	eece4226c0	basic sub view system (very incomplete)	2012-11-24 13:30:43 +01:00
Marc Zinnschlag	4c0dcd46a1	added UniversalId class	2012-11-24 11:01:53 +01:00
Marc Zinnschlag	019146756f	minor documentation changes regarding future improvements and additions	2012-11-24 10:14:43 +01:00
scrawl	70aa7459f5	GetWeaponDrawn	2012-11-24 03:04:26 +01:00
scrawl	be82d1452f	HasItemEquipped	2012-11-24 02:59:44 +01:00
scrawl	600ed5f38a	GetAttacked	2012-11-24 02:48:53 +01:00
scrawl	50baf6dac7	moved to controlextensions	2012-11-24 02:45:25 +01:00
scrawl	a596d23203	GetArmorType	2012-11-24 02:38:10 +01:00
scrawl	d7811624d5	GetEffect	2012-11-24 02:15:55 +01:00
scrawl	e8ef4dba1e	getPcRunning, getPcSneaking, getForceRun, getForceSneak	2012-11-24 02:02:49 +01:00
scrawl	10329c780d	GetLocked	2012-11-23 21:31:10 +01:00
Marc Zinnschlag	a6c7f16a7b	Merge remote-tracking branch 'scrawl/reputation'	2012-11-23 21:26:44 +01:00
scrawl	d418e21371	<Mod|Get><Flee|Fight|Hello|Alarm>	2012-11-23 21:14:32 +01:00
scrawl	9c170af30c	SameFaction	2012-11-23 20:57:08 +01:00
scrawl	d54ed557bf	Equip	2012-11-23 20:48:59 +01:00
scrawl	064cb80c0a	fix wait dialog fading	2012-11-23 20:48:53 +01:00
scrawl	0af869c816	GetReputation	2012-11-23 20:22:51 +01:00
scrawl	eb29b1593b	ModReputation, SetReputation	2012-11-23 19:56:45 +01:00
scrawl	f218ef2675	fix separator	2012-11-23 19:21:13 +01:00
scrawl	1d7e92b6b3	dialogue fixes	2012-11-23 19:05:40 +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	04158d03b0	clean up properly after closing a top level window	2012-11-23 10:30:14 +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	d7af9fbec6	various fixes	2012-11-22 17:24:28 +01:00
Marc Zinnschlag	6643674b13	ESM tool fix	2012-11-22 17:23:25 +01:00
Marc Zinnschlag	8e546ebd30	added test command	2012-11-22 16:00:23 +01:00
Marc Zinnschlag	ed3d8b8ca2	added undo stack and undo/redo actions	2012-11-22 15:54:31 +01:00
Marc Zinnschlag	1ddcea1f07	display view indices in title bar	2012-11-22 15:25:16 +01:00
Marc Zinnschlag	789cecb9df	added main menu and implemented new view function	2012-11-22 14:51:38 +01:00
Marc Zinnschlag	758371d7e4	implemented view/document closing	2012-11-22 14:10:23 +01:00
Marc Zinnschlag	9834bb3ad5	basic document handling	2012-11-22 13:30:02 +01:00
Marc Zinnschlag	9201baebf9	template fix	2012-11-22 10:19:11 +01:00
Marc Zinnschlag	c3cd6e8a8a	new attempt at the editor	2012-11-21 17:31:18 +01:00
scrawl	c8562d8442	toggleCollisionBoxes actually does something useful now	2012-11-20 02:20:54 +01:00
Marc Zinnschlag	5d45bcd03a	Merge remote-tracking branch 'trombonecot/master' ... Conflicts: apps/openmw/mwclass/light.cpp	2012-11-19 21:21:00 +01:00
eduard	4e4d15f8ac	Failed action	2012-11-19 21:04:49 +01:00
scrawl	693eeabeca	shiny: fix GLSL texture units when shaders were disabled	2012-11-19 13:55:26 +01:00
Mark Siewert	31fb715bd7	- Add support for moving existing references by plugin files. No cell changing yet. ... - Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber. - Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers. - Many small tweaks so that the new CellRefList does not conflict with existing code.	2012-11-17 21:50:25 +01:00
eduard	82ea547ce4	Failed action	2012-11-17 18:17:08 +01:00
Mark Siewert	2175f13b67	- Add tracking for dependencies between plugins. ... - Add reference number mangling required for moving references around.	2012-11-17 00:21:51 +01:00
scrawl	8ef3edd416	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-16 22:28:00 +01:00
scrawl	f5355e3e92	512x512 map, slightly faster	2012-11-16 22:26:00 +01:00
Marc Zinnschlag	a092deaee8	various fixes	2012-11-16 20:28:20 +01:00
Marc Zinnschlag	3dc013ceae	Merge remote-tracking branch 'gohan/Gohan'	2012-11-16 20:15:58 +01:00
scrawl	dc67a547b0	global map explored overlay	2012-11-16 19:34:09 +01:00
marcin	51027c541e	Feature #391 Dummy AI package classes	2012-11-16 18:38:15 +01:00
Marc Zinnschlag	9193f3b0ae	implemented getCommon/BlightDisease script instructions	2012-11-16 13:32:40 +01:00
Marc Zinnschlag	89c7936534	fixed dialogue script error reporting	2012-11-16 12:47:09 +01:00
Marc Zinnschlag	fd5671e6db	fixed argument lists for setpcfacrep and modpcfacrep	2012-11-16 12:45:07 +01:00
marcin	bed0280ba1	Feature #391 Dummy AI package classes	2012-11-15 22:33:50 +01:00
marcin	99ddc63e2c	Feature #391 Dummy AI package classes	2012-11-15 22:32:15 +01:00
marcin	515419ae0b	Feature #391 Dummy AI package classes	2012-11-15 22:22:44 +01:00
marcin	4b939c7521	Feature #391 Dummy AI package classes	2012-11-15 22:15:20 +01:00
Marc Zinnschlag	82d62eb95a	Merge branch 'script'	2012-11-15 20:00:37 +01:00
Marc Zinnschlag	9669eed083	Issue #219: added last missing function filters	2012-11-15 20:00:27 +01:00
scrawl	aefde3f5bc	Merge branch 'master' into globalmap	2012-11-15 13:21:24 +01:00
marcin	e6c8e1f0d7	Feature #391 Dummy AI package classes	2012-11-14 18:42:04 +01:00
marcin	698afbec3e	Feature #391 Dummy AI package classes	2012-11-14 18:40:32 +01:00
scrawl	5f7d349126	several missing includes	2012-11-14 05:32:23 +01:00
Marc Zinnschlag	b046687f46	added PCFacRep script instructions	2012-11-13 16:11:03 +01:00
Marc Zinnschlag	2a1727d4c5	improved error reporting for dialogue scripts (enabled via --script-verbose)	2012-11-13 15:35:46 +01:00
Marc Zinnschlag	c621a9f7e4	added missing disposition script instructions	2012-11-13 14:29:00 +01:00
Marc Zinnschlag	8aa1fd921b	fixed some stats related script instructions	2012-11-13 14:19:43 +01:00
Marc Zinnschlag	cbb0fd5792	Merge branch 'dialogue'	2012-11-13 10:04:08 +01:00
Marc Zinnschlag	409d15576b	Merge remote-tracking branch 'greye/player-model'	2012-11-12 14:18:38 +01:00
Marc Zinnschlag	e2ccec99f0	Issue #219: added another missing PC stats filter	2012-11-12 14:02:49 +01:00
Marc Zinnschlag	586ac3f5c6	Issue #219: added some more stats filters; fixed two filters	2012-11-12 13:56:51 +01:00
Marc Zinnschlag	77ba8c5117	Issue #219: implemented rank requirement filter	2012-11-12 13:23:25 +01:00
scrawl	8e847fdc6e	fix speechcraft skill increasing when persuade didn't succeed	2012-11-11 19:18:41 +01:00
Mark Siewert	42eefaf36f	- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). ... - Reference loader now (partially) supports MVRF tag.	2012-11-10 21:43:41 +01:00
scrawl	11a8d5d70a	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-10 21:19:41 +01:00
scrawl	7c22690116	Merge branch 'next' into globalmap	2012-11-10 21:19:10 +01:00
greye	623e00531d	fix reentering race selection	2012-11-10 21:54:43 +04:00
greye	0d33d005a5	head/hair selection	2012-11-10 21:30:16 +04:00
greye	50867e8d87	fix gender selection update, main model visibility and couple of crashes	2012-11-10 19:57:50 +04:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	7b1788b03b	minor fix	2012-11-10 15:11:21 +01:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	6dc2214502	Issue #219: more DialogueManager refactoring	2012-11-10 14:52:44 +01:00
Marc Zinnschlag	79706bf60f	Issue #219: dialogue manager cleanup	2012-11-10 14:31:58 +01:00
Marc Zinnschlag	d24e3eec9f	Issue #219: added filters for various player stats	2012-11-10 14:02:52 +01:00
Marc Zinnschlag	f8fcca64b6	Issue #219: Proper implementation of talked to PC filter	2012-11-10 13:31:10 +01:00
Marc Zinnschlag	7e8d4bb3c9	Issue #219: added various creature and NPC stats; implemented respective filters	2012-11-10 13:21:38 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
Marc Zinnschlag	e97f3003ab	Issue #219: added expelled status tracking; implemented expelled filter	2012-11-10 12:28:40 +01:00
Marc Zinnschlag	bd2c772dae	Issue #219: implemented player skill and attribute filter	2012-11-10 12:08:04 +01:00
Marc Zinnschlag	d6961c0246	Issue #219: made all unimplemented filters return false	2012-11-10 11:42:03 +01:00
Marc Zinnschlag	ceaf1677ce	Issue #219: rewrote AI settings and implemented AI settings filters	2012-11-10 11:38:37 +01:00
Marc Zinnschlag	eb4e72aaa7	Issue #219: implemented disease filters	2012-11-10 11:08:36 +01:00
Marc Zinnschlag	c425b3f4a3	Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter	2012-11-10 09:48:20 +01:00
Marc Zinnschlag	a752536cea	Issue #219: added function decoding and moved same faction function from DialogueManager to Filter	2012-11-10 09:35:50 +01:00
greye	235b565bb7	update main character model	2012-11-10 11:51:48 +04:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	92bba18218	removed useless member	2012-11-10 00:47:24 +01:00
scrawl	553ea08eae	consider temporary disposition change when trading	2012-11-10 00:42:31 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	f6a9029c4b	bounty & disease disposition effect	2012-11-09 18:33:11 +01:00
Marc Zinnschlag	4994a253da	Merge branch 'bountydisease' into dialogue	2012-11-09 18:17:14 +01:00
Marc Zinnschlag	be1334b202	disease tests	2012-11-09 18:16:29 +01:00
Marc Zinnschlag	0727d943b1	Merge branch 'next' into bountydisease ... Conflicts: apps/openmw/mwmechanics/npcstats.cpp	2012-11-09 18:04:44 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
Marc Zinnschlag	39ff2f06ce	added bounty to NpcStats	2012-11-09 14:31:38 +01:00
scrawl	ae78eaeb28	fixed training, fixed todo comments	2012-11-08 23:21:03 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
scrawl	322faf13e4	cleanup	2012-11-08 22:37:59 +01:00
scrawl	bf4e855260	fixed creatures	2012-11-08 22:31:08 +01:00
Marc Zinnschlag	e6021a3fe3	Issue #219: moved checks for local and global variables from DialogueManager to Filter	2012-11-08 22:11:50 +01:00
gugus	4634227f1c	notify the user when the merchant doesn't accept the offer	2012-11-08 21:50:56 +01:00
Marc Zinnschlag	e68bb3481e	Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time)	2012-11-08 21:48:17 +01:00
Marc Zinnschlag	91afef140b	Issue #219: moved first batch of integer type functions from DialogueManager to Filter	2012-11-08 21:16:49 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	3d7146cd50	don't allow opening a window multiple times, primarily the console	2012-11-08 19:34:54 +01:00
Marc Zinnschlag	2be60041f3	Merge remote-tracking branch 'greye/player-dynamics' into next	2012-11-08 18:32:25 +01:00
Marc Zinnschlag	e912b5bed2	Merge remote-tracking branch 'greye/next' into dialogue	2012-11-08 18:19:52 +01:00
greye	af5fb7916f	fix searching in store	2012-11-08 21:07:14 +04:00
Marc Zinnschlag	235397dde8	Issue #219: added missing implemented for isInverted function	2012-11-08 17:29:10 +01:00
Marc Zinnschlag	f5972a3080	Issue #219: Support for boolean select structs	2012-11-08 17:04:44 +01:00
Marc Zinnschlag	b412ebd0af	Issue #219: Supoort for inverted select structs	2012-11-08 17:01:26 +01:00
Marc Zinnschlag	4614d2bc8e	Issue #219: added basic select struct analysis and type checking	2012-11-08 16:49:38 +01:00
greye	b5a59c3a07	minor doxygen comments update	2012-11-08 19:01:42 +04:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
Marc Zinnschlag	662054acf4	Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter	2012-11-08 14:55:31 +01:00
Marc Zinnschlag	1502b3f6f8	Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)	2012-11-08 14:09:40 +01:00
Marc Zinnschlag	6c6c0dd1e3	Merge branch 'next' into dialogue	2012-11-08 13:45:20 +01:00
gugus	0a883f4492	The player can now barter with merchants	2012-11-08 13:38:20 +01:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	2a06d72e32	remove unused custom character classes	2012-11-08 02:27:01 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	f818fa1ebf	minor update since records contains own id	2012-11-08 01:39:24 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
greye	9ab2c16055	store created character classes as dynamic records	2012-11-08 01:22:44 +04:00
greye	78740306db	non-const access to Store<T> from ESMStore	2012-11-08 01:21:54 +04:00
Marc Zinnschlag	c5a6171aab	cleanup	2012-11-07 19:43:42 +01:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
greye	11c0e6382f	make ESMStore setting up itself after loading	2012-11-07 15:41:59 +04:00
greye	bc218759e9	forgotten module	2012-11-07 15:38:25 +04:00
Marc Zinnschlag	0805301922	Merge remote-tracking branch 'bwrsandman/master' into next	2012-11-07 10:40:40 +01:00
Mark Siewert	7f77bf76c7	- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. ... - Add many TODOs to mark points where more work is required to fully implement this feature.	2012-11-06 22:13:19 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
bwrsandman	7911f08c53	Issue #438: set 0 a.m. to be 12 a.m.	2012-11-06 13:19:35 -05:00
Marc Zinnschlag	81a2c629d8	Merge remote-tracking branch 'scrawl/master' into next	2012-11-06 18:21:24 +01:00
scrawl	21e0cde914	changed OIS includes since OIS_INCLUDE_DIR is already an include directory	2012-11-06 15:26:51 +01:00
greye	58b7927a36	move 'player' record to dynamic	2012-11-06 18:17:32 +04:00
greye	83f5b1df81	change to static --> dynamic search order	2012-11-06 17:58:49 +04:00
greye	9f1733a415	move record insertion to ESMStore	2012-11-06 17:51:38 +04:00
gugus	bf98b95955	bugfix	2012-11-06 13:10:54 +01:00
Marc Zinnschlag	6d5333be05	some code cleanup	2012-11-06 13:08:25 +01:00
Marc Zinnschlag	d661d4f6d6	Merge remote-tracking branch 'emoose/bug-368' into next	2012-11-06 13:04:38 +01:00
greye	dccc157f4c	setting up	2012-11-06 15:26:55 +04:00
greye	18bb5960e4	let's rescue linker	2012-11-06 15:10:57 +04:00
greye	620184a009	fix typos	2012-11-06 14:44:56 +04:00
greye	0fd22ce4b0	CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &)	2012-11-06 14:23:21 +04:00
greye	242a9b5a59	various interface fixes, commented unused code	2012-11-06 14:03:36 +04:00
greye	b3ad872845	new interface in manualref, fix various typos	2012-11-06 13:43:48 +04:00
greye	e74b2c060d	disable createRecord(), Land constness hack, various fixes with Store<T> interface	2012-11-06 13:14:03 +04:00
greye	ff8da265ed	applying new interface vol.9, inconsistent	2012-11-06 12:36:21 +04:00
greye	932a9dc6f9	applying new interface vol.8, inconsistent	2012-11-06 11:53:00 +04:00
greye	a9c1ce412a	applying new interface vol.7, inconsistent	2012-11-06 11:29:18 +04:00
gugus	2841d831a6	Disposition is now updated everyframe	2012-11-05 23:16:37 +01:00
Marc Zinnschlag	a7da929496	Merge remote-tracking branch 'scrawl/master' into next	2012-11-05 22:46:42 +01:00
emoose	3e5b396b56	Changed: world: cleanup	2012-11-05 21:10:04 +00:00
emoose	5c1b3fc043	Fixed: scene: adjust rotation/scale when creating objects	2012-11-05 20:45:04 +00:00
greye	4637503680	applying new interface vol.6, inconsistent	2012-11-06 00:34:11 +04:00
emoose	e8e3c211a4	Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation	2012-11-05 19:56:20 +00:00
scrawl	646e689239	clear name edits when opening alchemy / spell creation	2012-11-05 20:47:28 +01:00
greye	42aae566a7	applying new interface vol.5, inconsistent	2012-11-05 23:41:26 +04:00
emoose	7a7825577a	Changed: use MWWorld::Ptr for PhysicsSystem arguments	2012-11-05 19:37:27 +00:00
gugus	9ebe9cb40c	Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes	2012-11-05 19:55:06 +01:00
gugus	aaf1b66c7e	BarterOffer is used in other trading services too	2012-11-05 19:53:55 +01:00
greye	11567663a7	applying new interface vol.4, inconsistent	2012-11-05 22:34:08 +04:00
greye	e628b23da6	applying new interface vol.3, inconsistent	2012-11-05 21:45:35 +04:00
greye	86ad7a96f4	applying new interface vol.2, inconsistent	2012-11-05 21:19:22 +04:00
Marc Zinnschlag	61942c9c4a	Issue #440: Make day numbers start at 1 instead of 0	2012-11-05 18:01:50 +01:00
greye	bd1bb2e55d	applying new interface vol.1, inconsistent	2012-11-05 18:39:42 +04:00
greye	7cf0b8a680	just replace esmstore, inconsistent	2012-11-05 18:09:58 +04:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	10ae5d3365	dynamic storage for cells	2012-11-05 17:18:02 +04:00
greye	0f524e4a60	dynamic storage for records with string id	2012-11-05 17:18:01 +04:00
greye	9995fd324d	split record comparator from store	2012-11-05 17:18:01 +04:00
greye	558e0557d0	basic static esmstore	2012-11-05 17:18:01 +04:00
greye	dd8f5e1a91	stores for records indexed with int, basic resolving	2012-11-05 17:18:01 +04:00
greye	ce91c5636d	load() method for records with string id	2012-11-05 17:18:01 +04:00
greye	5ac54d1fff	alter ESM::Script for storing id as std::string	2012-11-05 17:18:01 +04:00
greye	f0ecbbb056	basic Pathgrid store	2012-11-05 17:18:01 +04:00
greye	3b86955d37	basic Cell store	2012-11-05 17:18:01 +04:00
greye	e1f2f190d4	base record containers	2012-11-05 17:18:01 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
emoose	accf8b2f71	Updated Bug #430 fix so it only moves the player now	2012-11-04 23:26:26 +00:00
Marc Zinnschlag	6f7a621b6f	disabled enchanting unfinished enchantment GUI for now	2012-11-04 23:15:20 +01:00
Marc Zinnschlag	aabb1b8f3f	Issue #219: implemented death count filter	2012-11-04 13:26:04 +01:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00
scrawl	b7aa7e4cef	pause all animations	2012-11-04 11:57:51 +01:00
scrawl	ba2fc2d6f8	better fix for chargen button colors	2012-11-04 11:37:47 +01:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
emoose	c8cc6b6e65	Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper)	2012-11-03 16:39:32 +00:00
emoose	b70b8cc4bc	Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...)	2012-11-03 06:02:33 +00:00
emoose	1c8e941f0d	fix kdevelop indentation again...	2012-11-02 21:21:32 +00:00
emoose	96b56d9803	fixes: containers: key id case comparison	2012-11-02 21:18:37 +00:00
emoose	4a9821dc65	fix kdevelop indentation...	2012-11-02 20:43:07 +00:00
emoose	15f972cc62	fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit ... todo: going from CharacterCreation back to CreateClassDialog loses data	2012-11-02 20:33:08 +00:00
pvdk	8cdd1e5539	Fixed problem with sorting of the masters in the launcher	2012-11-02 15:06:14 +01:00
Marc Zinnschlag	4bc4ca775c	Issue #432: fixed MWWorld::ContainerStore::clear	2012-11-01 15:11:13 +01:00
Marc Zinnschlag	648b53ef93	removed unused launcher.cfg file	2012-10-31 10:09:27 +01:00
pvdk	b0647d6c8a	Fix for Bug #413: resolutions no longer appear multiple times on Windows	2012-10-30 19:05:44 +01:00
pvdk	60aea3653f	Modified sorting, should not crash anymore	2012-10-30 18:58:17 +01:00
Pieter van der Kloet	64c348c39e	Added support for different encodings	2012-10-30 11:26:48 +01:00
Pieter van der Kloet	433773e0ea	Fixed segfault in datafilesmodel because of invalid modelindex row	2012-10-30 11:10:06 +01:00
Pieter van der Kloet	6920958e16	Oops, forgot to add timestamps for master files	2012-10-30 10:08:24 +01:00
Pieter van der Kloet	6e758af05c	Launcher cfg is stored in the user location only, fixes Bug #414	2012-10-30 06:51:22 +01:00
Pieter van der Kloet	1c06a06f91	Files are now sorted by modified timestamp, fixes Bug #415	2012-10-30 06:47:39 +01:00
Pieter van der Kloet	2b25178aef	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-30 05:04:31 +01:00
Pieter van der Kloet	ef11a32fee	Fixed a bug where a non-existant openmw.cfg would crash the launcher	2012-10-30 05:03:58 +01:00
Pieter van der Kloet	d065b56948	Fixed default profile adding and made switching profiles more efficient	2012-10-30 04:21:31 +01:00
scrawl	a04df37f83	implemented looting corpses	2012-10-28 16:04:33 +01:00
Marc Zinnschlag	d7add0b9e6	Issue #61: fixed alchemy skill	2012-10-28 14:07:36 +01:00
Marc Zinnschlag	c635447cea	Merge branch 'death'	2012-10-27 13:34:20 +02:00
Marc Zinnschlag	ed3641b214	Issue #68: check for essential actors	2012-10-27 13:33:54 +02:00
Marc Zinnschlag	2e63ca5e0a	Merge branch 'death'	2012-10-27 11:33:26 +02:00
Marc Zinnschlag	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +02:00
Marc Zinnschlag	f72c35fc17	Issue #68: tally deaths	2012-10-27 11:15:52 +02:00
Marc Zinnschlag	6b09b3ad61	Issue #68: Play death animations	2012-10-27 10:36:42 +02:00
bwrsandman	5d45d328b8	Fixed uninitialized variable that caused a segfault when going to previous page.	2012-10-26 21:28:22 -04:00
greye	9f923e7963	fix crashing if /home/greye/.cache not exist	2012-10-25 15:14:34 +04:00
Marc Zinnschlag	21c24dedb6	Issue #68: Stop player from dying (temporary workaround)	2012-10-25 12:28:45 +02:00
Marc Zinnschlag	0ab432b074	Issue #68: fixed death detection	2012-10-25 12:22:48 +02:00
Marc Zinnschlag	9172c3ec4d	Issue #68: stop NPCs from instantly dropping dead	2012-10-23 13:54:36 +02:00
scrawl	234716daa6	finished spell creation	2012-10-23 11:42:38 +02:00
scrawl	33361e6539	Merge branch 'master' into spellcreation	2012-10-23 10:38:53 +02:00
Pieter van der Kloet	fe9120bcb3	Added support for the profiles and made creation/editing them more user friendly	2012-10-23 01:47:07 +02:00
Pieter van der Kloet	a4855186c5	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-22 15:00:19 +02:00
Pieter van der Kloet	ab8894e07a	Merge remote-tracking branch 'origin/launcher-model' into launcher-model ... Conflicts: apps/launcher/datafilespage.cpp	2012-10-22 14:59:43 +02:00
Pieter van der Kloet	6433b1e022	Some minor fixes	2012-10-22 02:25:10 +02:00
Marc Zinnschlag	0547f11564	Issue #68: Remove dead actors from actor list	2012-10-20 10:54:51 +02:00
Marc Zinnschlag	f2e25b8a47	Issue #68: Keep dead actors out of the actor list for the current scene	2012-10-20 10:49:48 +02:00
scrawl	59560e84eb	small addition	2012-10-19 20:48:15 +02:00
scrawl	b2b9254718	improved the ingredient GUI code (this didnt fix anything, though)	2012-10-19 20:44:53 +02:00
scrawl	475163bd4a	Merge branch 'master' of https://github.com/zinnschlag/openmw	2012-10-19 20:21:34 +02:00
scrawl	fbe3538f32	bug #412: sort birth signs	2012-10-19 20:13:37 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
scrawl	8d7514e341	corrected chance	2012-10-19 19:48:54 +02:00
scrawl	d76522e7a4	searchPtrViaHandle	2012-10-19 19:48:02 +02:00
Marc Zinnschlag	7884a927c9	Issue #68: added dead flag to CreatureStats	2012-10-19 18:56:22 +02:00
Marc Zinnschlag	a8f294c9ae	fixed types of dynamic stats script instructions	2012-10-19 18:01:45 +02:00
Marc Zinnschlag	bdca5aff87	Issue #68: simplified the dynamic stats interface	2012-10-19 13:10:06 +02:00
Marc Zinnschlag	3f833af46a	Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes	2012-10-19 10:07:27 +02:00
scrawl	28cc480ce1	fix some alchemy issues and make the gui use the new implementation	2012-10-18 22:21:39 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	1864dbe031	Issue #61: potion creation	2012-10-18 15:33:27 +02:00
Marc Zinnschlag	f5caf227b2	Issue #61: remove ingredients on potion creation	2012-10-18 14:47:23 +02:00
Marc Zinnschlag	3c71378fad	Issue 61: improved ingredients handling in alchemy and documenation	2012-10-18 14:41:57 +02:00
Marc Zinnschlag	3fe0a73cf2	Issue #61: increase alchemy skill on successful potion creation	2012-10-18 14:38:38 +02:00
Marc Zinnschlag	510674aa5e	Merge branch 'master' into alchemy ... Conflicts: components/esm/loadmgef.hpp	2012-10-18 14:37:05 +02:00
Marc Zinnschlag	5fbca239dd	Issue #61: potion creation (1st part; still missing some implementations)	2012-10-18 14:02:06 +02:00
scrawl	e80394c0b5	fix training limit	2012-10-17 18:48:29 +02:00
scrawl	125315ebe7	remove a cout	2012-10-17 18:21:24 +02:00
scrawl	c64eb96952	Merge branch 'Travel_Dialogue' into training_travel ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/dialogue.cpp apps/openmw/mwrender/globalmap.cpp files/mygui/CMakeLists.txt	2012-10-17 18:17:53 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	6be092e268	substr check	2012-10-17 12:41:24 +02:00
scrawl	84a4fd56c3	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
scrawl	6acbea822b	splash screen directory listing	2012-10-16 23:59:03 +02:00
scrawl	7d1e659960	fading, greying out destinations you cant afford, warning fix	2012-10-16 20:25:50 +02:00
gugus	9583a1b8e9	FadeOut/In, that's for you scrawl!	2012-10-16 19:59:53 +02:00
gugus	c9afe222be	traveling now takes time	2012-10-16 19:34:29 +02:00
scrawl	c991f68a2d	buying created spell	2012-10-15 21:54:19 +02:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
pvdk	85aaacb41a	Some cleaning of the launcher source dir	2012-10-12 02:25:14 +02:00
pvdk	bc95336183	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-12 00:08:14 +02:00
scrawl	f154031e54	last bits of the gui	2012-10-11 18:26:29 +02:00
Marc Zinnschlag	b2025b9209	Merge branch 'pedantic'	2012-10-11 09:03:14 +02:00
cfcohen	e4a61486c8	Removed minor comments left in by accident.	2012-10-10 22:15:19 -04:00
cfcohen	68a856ff6f	Human readable labels for many records types. Human readable flags ... for many record types. Improved DialInfo rule parsing. Discovered several issues involving the assignment of various flag bits.	2012-10-10 22:00:44 -04:00
Pieter van der Kloet	5773676986	Got the Data Files tab to use the new model	2012-10-10 22:58:04 +02:00
Pieter van der Kloet	4174d3c235	Added new plugin model for the Data Files tab in the launcher	2012-10-10 21:31:40 +02:00
cfcohen	50e259c060	Remove tabs as requested. Sorry about that, thought I already ... had. :-) I updated the help to better document the --type option, although I did not finish reasoning through it's interaction with the new loading framework. I also expanded the print() methods of a few more of the record types to make a more consistent commit.	2012-10-09 19:41:45 -04:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
cfcohen	57f3b50dc8	Add more detail to ESMTool record dumping.	2012-10-09 01:33:47 -04:00
gugus	27a3487d78	right prices	2012-10-08 15:51:36 +02:00
gugus	5a611b66d7	traveling.	2012-10-08 11:14:22 +02:00
Mark Siewert	1f961d575e	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp components/esm/loadland.hpp components/esm_store/reclists.hpp	2012-10-07 20:35:54 +02:00
Mark Siewert	28d4d7ea3f	Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. ... - Remove check for 255 master/plugin files.	2012-10-07 20:00:55 +02:00
gugus	85d9357e3a	Travel GUI	2012-10-06 17:52:46 +02:00
scrawl	025e820703	abstracted code and use it in enchanting window as well	2012-10-03 15:36:10 +02:00
scrawl	1c0dd3ccc5	some editing code	2012-10-03 15:06:54 +02:00
Marc Zinnschlag	332039da10	Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI	2012-10-02 10:29:47 +02:00
Marc Zinnschlag	14833a4c3a	Issue #61: More robust tools handling in alchemy window	2012-10-02 10:20:49 +02:00
Marc Zinnschlag	1cc2c2055f	Issue #61: Implemented basic ingredient handling in Alchemy class	2012-10-02 10:20:26 +02:00
Marc Zinnschlag	6469933ce8	Merge branch 'master' into alchemy ... Conflicts: apps/openmw/mwgui/alchemywindow.cpp	2012-10-02 09:30:49 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
scrawl	63fd8172d8	Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation	2012-10-01 23:09:03 +02:00
scrawl	dc33dee22e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/miscextensions.cpp	2012-10-01 20:25:23 +02:00
scrawl	fa358ab196	change the inventory preview to "inventoryhandtohand" animation pose	2012-10-01 18:04:21 +02:00
scrawl	ff2c2d2b96	Merge branch 'master' into spellcreation ... Conflicts: apps/openmw/mwbase/windowmanager.hpp	2012-10-01 17:54:45 +02:00
Marc Zinnschlag	d1c4559abe	fixed GMST string handling in GUI	2012-10-01 10:03:49 +02:00
Marc Zinnschlag	35d7b5e5b0	Merge remote-tracking branch 'greye/record_saving'	2012-10-01 09:50:20 +02:00
Marc Zinnschlag	29633bd02f	Merge remote-tracking branch 'greye/master'	2012-10-01 09:46:20 +02:00
greye	f907a6a86f	updateListener() every frame	2012-10-01 11:24:44 +04:00
Chris Robinson	6c5c9ce46e	Avoid console spam when a sound can't play	2012-09-30 17:38:55 -07:00
Chris Robinson	6942fa97da	Specify a proper up vector for the listener	2012-09-30 17:23:05 -07:00
Chris Robinson	991f942fba	Merge remote-tracking branch 'zini/master' into sound ... Conflicts: apps/openmw/mwsound/soundmanagerimp.cpp apps/openmw/mwsound/soundmanagerimp.hpp	2012-09-30 16:57:54 -07:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Marc Zinnschlag	10c8360e07	Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class	2012-09-30 19:05:45 +02:00
Marc Zinnschlag	42f02f3ccd	Issue #61: Re-implemented tool selection in Alchemy class	2012-09-30 18:54:20 +02:00
Marc Zinnschlag	20a263738a	Merge remote-tracking branch 'chris/animation'	2012-09-29 12:39:56 +02:00
Chris Robinson	41f80908d9	Simplify getting the stop time when playing all animation groups	2012-09-29 01:10:49 -07:00
Marc Zinnschlag	2ab96d0108	Merge remote-tracking branch 'scrawl/next'	2012-09-29 10:03:52 +02:00
Marc Zinnschlag	c6fd864a76	Issue #61: Forgot to add some files	2012-09-29 10:02:46 +02:00
scrawl	0c6ad13364	WakeUpPc instruction	2012-09-29 09:41:34 +02:00
Chris Robinson	cd8515396a	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
gugus	4f5c4bf89a	Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/dialogue.cpp apps/openmw/mwgui/dialogue.hpp apps/openmw/mwgui/mode.hpp apps/openmw/mwgui/windowmanagerimp.cpp	2012-09-28 17:09:15 +02:00
gugus	4d496c1188	correction1	2012-09-28 17:02:27 +02:00
scrawl	044ab3d2b6	fix error in framelistener with tcg enabled	2012-09-28 17:02:18 +02:00
gugus	1971ba66f1	destination name is now OK for every trave services	2012-09-27 13:08:38 +02:00
Marc Zinnschlag	cd343c4fbd	Issue #61: Basic alchemy class (doesn't do anything yet)	2012-09-27 11:59:40 +02:00
scrawl	ac0c1ea986	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation ... Conflicts: apps/openmw/mwgui/dialogue.cpp	2012-09-27 08:47:47 +02:00
scrawl	9b0254a158	small map fix	2012-09-26 23:34:35 +02:00
Marc Zinnschlag	bb6d9a329c	Merge remote-tracking branch 'scrawl/book_skillgain' into next	2012-09-26 20:35:48 +02:00
gugus	3060fbee60	TravelGUI, not completly finished.	2012-09-26 18:30:47 +02:00
scrawl	71d04e16da	fix the global map updating when pinned	2012-09-25 21:57:57 +02:00
scrawl	caef570c8a	fix the weather not changing when sleeping/waiting	2012-09-25 21:49:34 +02:00
scrawl	359824d614	oops	2012-09-25 21:49:34 +02:00
scrawl	4453459378	re-use the texture across preview instances	2012-09-25 21:49:34 +02:00
scrawl	e2b1329620	fix the race selection escape crash	2012-09-25 21:49:34 +02:00
scrawl	d163f8203c	change books to RecListWithIDT	2012-09-25 21:38:34 +02:00
scrawl	853d62adba	book skillgain	2012-09-25 18:59:24 +02:00
Marc Zinnschlag	a34bdb9623	per NPC ID interaction tracking	2012-09-25 10:48:57 +02:00
scrawl	05eb307bfb	added video timing	2012-09-25 02:54:29 +02:00
scrawl	73c69e8eda	video playback	2012-09-25 02:35:50 +02:00
scrawl	b63d205c6e	change the select attribute/skill dialogs to be reusable	2012-09-24 22:09:38 +02:00
Marc Zinnschlag	5bdc7bcacf	Merge branch 'master' into next	2012-09-24 10:14:09 +02:00
scrawl	d393f551ed	edit effect dialog	2012-09-24 08:09:16 +02:00
scrawl	02e7b3df4f	oops	2012-09-24 01:07:33 +02:00
scrawl	f8a18d58a6	re-use the texture across preview instances	2012-09-24 01:06:17 +02:00
scrawl	dd5c083124	fix the race selection escape crash	2012-09-24 00:42:05 +02:00
greye	1339787863	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
scrawl	1cb1259e18	fixing some unrelated warnings	2012-09-23 19:36:37 +02:00
greye	807a56c9e4	fix dynamic potion id	2012-09-23 19:29:00 +04:00
scrawl	9d7c35ae48	and go	2012-09-23 00:36:20 +02:00
scrawl	b4db339fd5	everything uses find now	2012-09-22 21:39:05 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	f45a6b71a9	Merge branch 'master' into next	2012-09-22 20:48:55 +02:00
scrawl	b471bef92a	Merge branch 'master' into next	2012-09-22 20:48:22 +02:00
Marc Zinnschlag	39e21a6103	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-22 18:27:42 +02:00
scrawl	78b2d51cfc	fix a map crash	2012-09-22 16:52:31 +02:00
Marc Zinnschlag	8da00caaa4	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-21 20:39:20 +02:00
scrawl	47d9fae89f	don't use cache	2012-09-21 20:35:50 +02:00
Marc Zinnschlag	3560690660	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-21 18:27:06 +02:00
scrawl	b91d74d394	fix normalized encumbrance	2012-09-21 17:56:15 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
Marc Zinnschlag	28e2430f3a	Merge remote-tracking branch 'scrawl/master'	2012-09-21 17:47:27 +02:00
scrawl	f49401bb53	center map on the player, dynamic map size	2012-09-21 16:26:04 +02:00
scrawl	1d012d1680	don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.	2012-09-21 15:24:26 +02:00
scrawl	9106e5307c	moved global map from RenderingManager to gui and removed world method	2012-09-21 14:11:01 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
greye	e69880f77e	almost perfect byte copies, has redundant data	2012-09-20 20:33:30 +04:00
scrawl	a161b34c67	remove useless member, fix map rendering crash	2012-09-20 18:23:27 +02:00
scrawl	98c1dc1151	ShowMap & FillMap commands, merged next	2012-09-20 18:02:37 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	451a9fd6ac	don't update world arrow position in interior	2012-09-20 17:35:30 +02:00
scrawl	e5e3d829d0	player arrow & markers	2012-09-20 17:30:09 +02:00
scrawl	5f014f7411	oops, left in a testing assertion	2012-09-20 14:04:29 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	87a9373a56	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-20 09:01:58 +02:00
scrawl	b9a3f8e8d7	gamma slider	2012-09-19 23:47:42 +02:00
scrawl	d9f6072f02	gamma correct rendering & adjustment setting	2012-09-19 23:25:07 +02:00
Marc Zinnschlag	ede9a2b170	fixed an orientation problem	2012-09-19 19:56:02 +02:00
scrawl	32de090079	Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities	2012-09-19 19:34:02 +02:00
Marc Zinnschlag	a3c680d20a	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-19 09:41:32 +02:00
scrawl	be44810623	implemented GetPCSleep	2012-09-19 03:11:23 +02:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	ab698bb401	date time label	2012-09-18 20:53:32 +02:00
scrawl	4d4ba6698a	fix character preview destruction; don't allow empty names in name dialog	2012-09-18 19:00:20 +02:00
scrawl	0ba996f290	dialog layout	2012-09-18 18:29:03 +02:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
Marc Zinnschlag	fcda3b6ca8	fixed some script argument types	2012-09-18 11:09:54 +02:00
Marc Zinnschlag	ea8eab4f34	more cleanup	2012-09-18 11:06:19 +02:00
Marc Zinnschlag	408c5b8bd4	some cleanup	2012-09-18 10:49:51 +02:00
Marc Zinnschlag	4469976be9	Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-09-18 10:44:25 +02:00
gugus	3c1a9061de	Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly	2012-09-17 14:12:27 +02:00
gugus	032ff7c879	Clean-up. There is still a little bug.	2012-09-17 13:36:48 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Jason Hooks	192d634098	Movement keys; View angles	2012-09-16 13:19:38 -04:00
Marc Zinnschlag	2bb400eaa8	Merge remote-tracking branch 'pvdk/datalocalfix'	2012-09-16 10:36:03 +02:00
Marc Zinnschlag	b041a511b6	Merge remote-tracking branch 'mmd/windowswarnings'	2012-09-16 10:33:06 +02:00
Jason Hooks	76f2a82884	More pmove stuff; Turned off broadphase, we could not fall in exteriors	2012-09-15 22:48:24 -04:00
Pieter van der Kloet	4bcc34f4f9	Re-enabled and fixed multiple data directory handling in the launcher	2012-09-16 04:28:51 +02:00
Pieter van der Kloet	97326ffdbf	Fixed data-local directory handling in the launcher	2012-09-16 03:01:48 +02:00
Jason Hooks	f586f53a42	positioning	2012-09-15 16:45:50 -04:00
scrawl	896428c129	enableRestMenu & enableLevelupMenu	2012-09-15 20:18:41 +02:00
scrawl	9cf1cbc89b	remove book skill gain	2012-09-15 20:03:53 +02:00
scrawl	3e5ab069a6	remove the const cast	2012-09-15 19:52:18 +02:00
Jason Hooks	02bca98e9f	Setrotate working	2012-09-15 13:23:49 -04:00
scrawl	cf358fa79d	>= instead of ==	2012-09-15 19:20:13 +02:00
scrawl	0dc242c603	don't increase skill beyond 100	2012-09-15 19:10:48 +02:00
scrawl	f5237ff1a6	skill gain from books	2012-09-15 19:06:56 +02:00
scrawl	234f8fa5d5	added the missing sound & notification for skill increase	2012-09-15 18:35:59 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	95f3a20e2c	Merge branch 'master' into levelup	2012-09-15 14:25:37 +02:00
scrawl	3e794a6087	remove useless member and removed a warning	2012-09-15 01:02:07 +02:00
scrawl	2793096b50	Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/world.hpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp	2012-09-15 00:57:29 +02:00
Marc Zinnschlag	b7c9285b24	added support for out of world rendering	2012-09-14 21:12:16 +02:00
scrawl	b76a28f69c	beginnings of the gui	2012-09-14 19:44:00 +02:00
scrawl	35f7216f2f	fixed some things	2012-09-14 17:25:32 +02:00
scrawl	7c59b83419	performance optimization	2012-09-14 17:10:10 +02:00
scrawl	a308d2e38a	fixed exception, fixed armor label obscuring the items	2012-09-14 15:33:24 +02:00
scrawl	1f7e044fad	removed some debug stuff	2012-09-14 14:41:19 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	5155339cb6	character preview working	2012-09-13 14:56:50 +02:00
scrawl	d90af9c524	Merge branch 'master' into characterpreview	2012-09-13 14:22:17 +02:00
Marc Zinnschlag	835c530e06	Merge branch 'ingredients'	2012-09-13 13:31:46 +02:00
Marc Zinnschlag	5706caa141	Issue #356: added ingredient eating sound effect	2012-09-13 13:30:57 +02:00
Marc Zinnschlag	fe68a252d5	Issue #356: Implemented ingredient eating	2012-09-13 13:02:26 +02:00
Marc Zinnschlag	2ccd7a480d	Issue #356: added a missing return	2012-09-13 13:01:59 +02:00
scrawl	7ad80e306b	fixed the disappearing	2012-09-13 12:33:09 +02:00
Marc Zinnschlag	9de7b3bf90	Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)	2012-09-13 11:30:59 +02:00
Marc Zinnschlag	0af0dc0d5d	Issue #356: More CreatureStats cleanup	2012-09-13 11:13:05 +02:00
Marc Zinnschlag	2934987f78	Issue #356: Some CreatureStats cleanup	2012-09-13 10:52:34 +02:00
Marc Zinnschlag	9dcf8939e9	Issue #356: added function for fatigue term calculation	2012-09-13 10:45:32 +02:00
Marc Zinnschlag	fca3b67507	Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)	2012-09-13 09:30:47 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
Jason Hooks	a1a7733730	Set scale implemented	2012-09-12 18:30:32 -04:00
scrawl	2f0b47fc38	test	2012-09-13 00:21:58 +02:00
scrawl	a96ed6ac61	splash screens on startup	2012-09-12 19:15:29 +02:00
scrawl	c3966a7c5a	oops, I used a float texture for water reflection. this change should give a little performance boost.	2012-09-11 22:45:41 +02:00
Marc Zinnschlag	e9e30c0fce	fixed a memory leak	2012-09-11 20:34:54 +02:00
scrawl	a8d9aa98b1	some fixes	2012-09-11 19:18:26 +02:00
scrawl	d5a08e31e7	scene does not disappear anymore during load	2012-09-11 17:36:20 +02:00
scrawl	369db182de	actual progress bar, performance optimization	2012-09-11 16:53:49 +02:00
scrawl	2b339f6c0f	loading screen	2012-09-11 16:37:54 +02:00
Jason Hooks	c5b25ef70b	Very basic actor physics (no set scale/rotate functions)	2012-09-10 20:29:24 -04:00
scrawl	4977c33e4c	fixed a stats window resizing problem that I introduced today	2012-09-10 21:58:19 +02:00
Marc Zinnschlag	6c03d7aec4	documentation fix	2012-09-10 21:12:35 +02:00
scrawl	9448ce5968	implemented "get<Control>Disabled" functions	2012-09-10 18:44:59 +02:00
scrawl	89ad2af1d9	key usage to open doors or containers ... to test: player->additem, "key_arrile", 1 (door in arille's tradehouse) player->additem, "key_alvur", 1 (chest in the back of beshara)	2012-09-10 17:44:59 +02:00
scrawl	fdc2a7433c	remove the wrong container open sound	2012-09-10 15:01:51 +02:00
scrawl	d581ac426e	useless cout message	2012-09-10 14:10:56 +02:00
scrawl	996e6280d8	more spell buying window cleanup	2012-09-10 14:10:01 +02:00
scrawl	ba0acd4056	changed some text colors	2012-09-10 13:52:37 +02:00
scrawl	fde69d0c87	Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing	2012-09-10 13:40:34 +02:00
scrawl	bc6a1979b0	replaced everything with the new method	2012-09-10 13:39:22 +02:00
Marc Zinnschlag	61c8a627aa	added a missing include	2012-09-10 13:19:15 +02:00
Marc Zinnschlag	273ac0a97f	Merge branch 'spellbuying'	2012-09-10 13:16:02 +02:00
Marc Zinnschlag	f17756712a	fixed spell list handling	2012-09-10 13:15:55 +02:00
Marc Zinnschlag	6c928e93d3	added missing initialisation of NPC/creature spell lists from ESX records	2012-09-10 13:04:00 +02:00
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
scrawl	35dd49f948	fixed some "using namespace" in headers	2012-09-10 09:10:50 +02:00
scrawl	56061474c4	another 3 unnecessary lines	2012-09-09 23:53:23 +02:00
scrawl	bb267dddf6	some stats window cleanup	2012-09-09 23:50:57 +02:00
scrawl	432c089434	fix the spell tooltips to show the spell target	2012-09-09 23:06:24 +02:00
Marc Zinnschlag	bcf3a81a6c	and a tiny bit more of cleanup	2012-09-09 21:18:47 +02:00
Marc Zinnschlag	9c49ca1468	a bit more random cleanup	2012-09-09 21:08:57 +02:00
Marc Zinnschlag	06677a0fc8	fixed ID handling and some misc cleanup	2012-09-09 21:03:39 +02:00
Marc Zinnschlag	3fad1c0786	fixed a crash	2012-09-09 20:43:21 +02:00
Adam Hogan	08410b9062	Renamed SpellBuyingWindow, took some suggestions from scrawl	2012-09-09 14:10:07 -04:00
Adam Hogan	562df5388f	Merge branch 'master' of git://github.com/zinnschlag/openmw	2012-09-09 08:38:56 -04:00
Adam Hogan	ebf80943a9	Added spell buying window	2012-09-08 18:17:03 -04:00
Lukasz Gromanowski	99c46093dd	Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests	2012-09-08 22:18:25 +03:00
Jason Hooks	23777033fd	Starting to implement new PhysicActor	2012-09-05 17:44:11 -04:00
Marc Zinnschlag	0879abb948	Merge branch 'actiontarget'	2012-09-04 20:56:40 +02:00
Marc Zinnschlag	da041f902f	Issue #370: fixed item taking sound	2012-09-04 20:56:28 +02:00
Marc Zinnschlag	482874f99e	Merge remote-tracking branch 'scrawl/cache'	2012-09-04 20:40:18 +02:00
Marc Zinnschlag	6813bafbfc	added missing sound effect for chest opening; minor cleanup	2012-09-04 15:42:41 +02:00
Marc Zinnschlag	fb8aae243d	Issue #370: replaced custom target handling in talk action with base class implementation	2012-09-04 15:38:21 +02:00
Marc Zinnschlag	8ed8dd649a	Issue #370: replaced custom target handling in take action with base class implementation	2012-09-04 15:34:44 +02:00
Marc Zinnschlag	ea1c3fe1e4	Issue #370: replaced custom target handling in open action with base class implementation	2012-09-04 15:29:51 +02:00
Marc Zinnschlag	8c2b4f996c	Issue #370: replaced custom target handling in equip action with base class implementation	2012-09-04 15:27:10 +02:00
Marc Zinnschlag	b51c42146f	Issue #370: replaced custom target handling in read action with base class implementation	2012-09-04 15:24:55 +02:00
Marc Zinnschlag	3f181f9a9d	Issue #370: Support for targets in containers	2012-09-04 15:21:56 +02:00
Marc Zinnschlag	cc55056adf	Issue #370: replaced custom target handling in apply action with base class implementation	2012-09-04 15:18:59 +02:00
Marc Zinnschlag	733654d730	Issue #370: implemented target handling in action base class	2012-09-04 15:14:33 +02:00
Marc Zinnschlag	1cecab6e3d	fixed RefData::getHandle	2012-09-04 15:08:59 +02:00
Marc Zinnschlag	ead04e1cc3	Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update	2012-09-04 13:32:35 +02:00
Marc Zinnschlag	345eec1135	Issue #389: added AI package base class and AI packages management class	2012-09-04 13:25:53 +02:00
Marc Zinnschlag	ef6f033dd1	Merge branch 'multidata'	2012-09-04 11:02:28 +02:00
Marc Zinnschlag	2284d76307	re-enabled local data directory support in launcher	2012-09-04 11:02:18 +02:00
Jason Hooks	2efceba1fc	Tearing apart PhysicActor	2012-09-03 20:32:20 -04:00
gugus	d261263824	oups forgot vmformat	2012-09-02 21:09:07 +02:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
gugus	95c27723f7	fixed a bug (see commit reverted)	2012-09-02 18:12:13 +02:00
gugus	99885e8ca4	Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" ... This reverts commit 165065d378.	2012-09-02 18:04:36 +02:00
gugus	fa9f2b268b	PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe	2012-09-02 17:57:03 +02:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
Jason Hooks	0697c7f7f4	Finally merged in master	2012-09-01 17:28:12 -04:00
Marc Zinnschlag	e2bf4694cb	Merge remote-tracking branch 'scrawl/master'	2012-08-31 09:22:32 +02:00
scrawl	760f05c454	the HUD can be toggled with F12 key; useful for screenshots	2012-08-30 20:47:39 +02:00
Marc Zinnschlag	bc34fab17f	Merge remote-tracking branch 'greye/aidata'	2012-08-30 09:55:01 +02:00
Michael Mc Donnell	3c3737ed78	Write error message for exception and fix warning ... Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.	2012-08-29 19:38:33 -04:00
greye	a90547bbbe	code formatting	2012-08-29 21:35:06 +04:00
Marc Zinnschlag	81463fa23d	Issue #372: fixed positions in SoundManager	2012-08-29 18:48:20 +02:00
scrawl	6ad08dfd33	added settings for crosshair & subtitles	2012-08-29 11:15:17 +02:00
Artem Kotsynyak	e9b2f4ee74	fix equipment visibility update	2012-08-28 22:59:44 +04:00
scrawl	1c5055c8ac	fix a problem where hovering a marker would render it on top of the fog of war instead of below	2012-08-28 18:49:44 +02:00
scrawl	7eaf5e7f0f	changed the markers to look more like morrowind's (hover effect)	2012-08-28 18:40:11 +02:00
scrawl	d9276ca09d	don't make copy of CellRefList in World::getNorthVector	2012-08-28 18:23:59 +02:00
scrawl	3c39c47e2f	don't make copies of CellRefList & LiveCellRef	2012-08-28 18:23:01 +02:00
scrawl	571d5095d4	removed a cout	2012-08-28 17:32:50 +02:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
Marc Zinnschlag	40d4dad15e	Issue #378: Fix (record wasn't build fully)	2012-08-28 09:32:38 +02:00
Marc Zinnschlag	160b52162b	Merge remote-tracking branch 'scrawl/quick_keys' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2012-08-28 09:06:40 +02:00
scrawl	321f7c3419	fix an infinite recursion regression on several dialogs.	2012-08-27 21:29:04 +02:00
scrawl	5c28a67203	broke something in the last commit.	2012-08-27 20:55:39 +02:00