12750 commits

Author	SHA1	Message	Date
Allofich	f4cc5d0399	Sometimes play 1st-person weapon idle to Stop key	2016-08-25 21:34:45 +09:00
Allofich	7db31ab58a	Correct telekinesis glow length	2016-08-24 01:21:15 +09:00
scrawl	346f5a19a3	Merge pull request #1029 from Allofich/anim ... Improvements for playgroup and loopgroup	2016-08-23 14:14:36 +02:00
Allofich	9b0e5d6b59	Loop mid-animation idles when loading a save game	2016-08-23 19:50:56 +09:00
scrawl	0fd810707e	Remove unused stopLooping()	2016-08-22 23:33:26 +02:00
scrawl	b0dc625b18	Run setLoopingEnabled after the anim queue is updated	2016-08-22 23:33:24 +02:00
scrawl	719e884b7c	Remove duplicate code	2016-08-22 23:25:00 +02:00
scrawl	0c9882956a	Add AnimState::shouldLoop()	2016-08-22 23:25:00 +02:00
scrawl	6450c9be27	Simplify condition	2016-08-22 23:22:58 +02:00
Allofich	bf9dc45b2b	Emulate vanilla animation loops more closely	2016-08-23 01:42:36 +09:00
mrcheko	612c7f1a2f	Revert "Revert "Merge pull request #993 from mrcheko/pathfinding"" ... This reverts commit 3732979eec.	2016-08-19 22:15:26 +03:00
Aesylwinn	91fd966146	Fix some issues detected by coverity for the editor.	2016-08-18 12:42:35 -04:00
Allofich	b332a13b4e	Don't restart looped animations on repeated calls	2016-08-18 23:23:38 +09:00
Marc Zinnschlag	2fef8948f1	Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'	2016-08-18 09:13:43 +02:00
scrawl	dda5bfbc9f	CharacterPreview no longer depends on osgViewer	2016-08-16 22:47:45 +02:00
scrawl	8bfcf259a3	LocalMap no longer depends on osgViewer	2016-08-16 22:37:44 +02:00
scrawl	b2ae45f0eb	Remove unneeded setGraphicsContext() calls	2016-08-16 19:33:09 +02:00
scrawl	0209c70583	Improve performance by skipping update if transform is unchanged	2016-08-16 17:50:59 +02:00
scrawl	4751e0e953	Improve performance of animateCollisionShapes by caching the node path	2016-08-16 17:50:59 +02:00
scrawl	8a4722cb84	Revert "animateCollisionShape checks if the shape is really animated" ... This reverts commit cbf344663f. Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00	2016-08-16 17:50:59 +02:00
scrawl	3ef9b3f44d	Merge pull request #1025 from Allofich/anim ... Use loopfallback for idle animation groups	2016-08-16 16:30:55 +02:00
Aesylwinn	7125775648	Change free axis rotation.	2016-08-15 15:07:43 -04:00
Allofich	c05782581e	Account for all instances of play()	2016-08-16 02:52:55 +09:00
Allofich	6163c7bb03	Use loopfallback for idle animation groups	2016-08-16 01:15:26 +09:00
scrawl	641005b317	Remove Camera's children before removing the Camera ... Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )	2016-08-15 18:12:46 +02:00
scrawl	a44ba0e461	Merge pull request #966 from kpp/find_mygui ... Find mygui	2016-08-15 16:36:48 +02:00
Roman Proskuryakov	4cffdb67d8	Uses case-sensitive MyGUI_* variables	2016-08-15 15:59:02 +03:00
Aesylwinn	3e4ac0c662	Potential fix for context sensitive select mode issues.	2016-08-14 14:43:29 -04:00
scrawl	71f786ff84	Delete the WorkQueue first ... Fixes a potential crash on exit.	2016-08-14 18:10:29 +02:00
scrawl	3732979eec	Revert "Merge pull request #993 from mrcheko/pathfinding" ... This reverts commit 5190275b37, reversing changes made to d7845012bf.	2016-08-14 18:04:33 +02:00
scrawl	c3340ec143	Merge pull request #1022 from Allofich/anim ... Make loopgroup loop correct number of times	2016-08-14 17:02:38 +02:00
scrawl	1edcea2ff5	Merge pull request #1023 from psi29a/small_fixes ... small fixes	2016-08-14 16:49:26 +02:00
scrawl	30b549124e	Fix use-after-free	2016-08-14 16:42:29 +02:00
scrawl	c65492193c	Use osg::clone	2016-08-14 16:41:44 +02:00
scrawl	0fbc0d0da7	Attempt to silence warning	2016-08-14 16:41:17 +02:00
Bret Curtis	0547d4b937	clang says that these must be in the MWWorld namespace	2016-08-14 16:17:09 +02:00
scrawl	8c44334409	Merge pull request #1021 from Allofich/weight ... Corrections to tooltip displays of zero-weight items	2016-08-14 15:14:58 +02:00
scrawl	2f6075329b	Clang warning fixes	2016-08-14 15:10:50 +02:00
Allofich	a381a15b19	Make loopgroup loop correct number of times	2016-08-14 21:57:06 +09:00
Allofich	7bf04b5014	Allow showing value of zero-weight lights	2016-08-14 21:15:22 +09:00
Allofich	502a26a7ff	Use getWeightString() to avoid casting to int	2016-08-14 19:38:53 +09:00
Allofich	4f5d676b4e	Allow weight tooltips for gold and keys if not 0	2016-08-14 19:32:43 +09:00
Allofich	caf025f93d	Don't show 0 weight tooltips except for potions	2016-08-14 19:27:59 +09:00
Allofich	cf7278f8ae	Don't show weight tooltip for 0-weight equipment	2016-08-14 18:37:41 +09:00
Allofich	ee2702087c	Make zero-weight boots play light boot footsteps	2016-08-14 17:27:47 +09:00
scrawl	f3f02fe154	Merge pull request #1019 from Allofich/bound ... Don't allow re-casting of bound equipment spells	2016-08-13 21:02:32 +02:00
Allofich	d617651307	Don't allow re-casting of bound equipment spells	2016-08-14 02:05:23 +09:00
Aesylwinn	101c3cc90d	Rotate around center of selection.	2016-08-12 17:12:10 -04:00
Aesylwinn	571969cd65	Scale from center of selection.	2016-08-12 17:11:37 -04:00
MiroslavR	ddbfe0c944	Fix disabled door markers appearing on the map (Fixes #3348)	2016-08-12 03:14:36 +02:00
Aesylwinn	388917df89	Base editor rotate/scale commit.	2016-08-10 19:31:34 -04:00
Allofich	cb9bb92b26	Play locked sounds on locked objects instead of actors	2016-08-10 21:31:14 +09:00
Allofich	83b715734f	Move part of addGlow() to addSpellCastGlow()	2016-08-10 02:52:43 +09:00
Allofich	1c76c93ed8	Use raw pointer to node in glowupdater	2016-08-10 01:35:22 +09:00
Allofich	67f31d948e	Add removeTexture method	2016-08-10 01:11:14 +09:00
Allofich	4b9aff7a03	Glowupdater fix when using shaders	2016-08-10 00:43:14 +09:00
Allofich	9b2cb2fb8c	Cleanups	2016-08-10 00:25:33 +09:00
Allofich	775162ccdf	Rewrite spell glow implementation	2016-08-09 22:56:53 +09:00
Allofich	cad41599cf	Fix travis build error and warnings	2016-08-09 22:56:53 +09:00
Allofich	1910128e9c	Don't remove uniform when spell glow ends	2016-08-09 22:56:53 +09:00
Allofich	35c14bb9bb	Minor rewrite, make "open" spells play glow effect	2016-08-09 22:56:53 +09:00
Allofich	e132b52a69	Handle spell glows within updatecallback	2016-08-09 22:56:53 +09:00
Allofich	123c626f2d	Add glow when using telekinesis on doors	2016-08-09 22:56:53 +09:00
Allofich	57138b416e	Fix spell glows to only run one at a time	2016-08-09 22:56:53 +09:00
Allofich	3841a8fb40	Make non-actors glow when they cast spells	2016-08-09 22:56:53 +09:00
Allofich	dca7b4beb7	Make non-actors also play spell casting sounds	2016-08-09 22:56:53 +09:00
Marc Zinnschlag	a563a9d336	added missing Q_OBJECT	2016-08-09 10:21:37 +02:00
Marc Zinnschlag	96fd9263bf	Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'	2016-08-09 10:17:26 +02:00
Aesylwinn	448c9d5a5b	Fix globals not being initialized with a valid type.	2016-08-09 00:17:41 -04:00
scrawl	0bbd715f65	Fix the cloned StateSet not being assigned	2016-08-09 01:13:19 +02:00
scrawl	5190275b37	Merge pull request #993 from mrcheko/pathfinding ... Pathfinding unification	2016-08-09 00:41:03 +02:00
Aesylwinn	0963adb2f4	Fix pointer being deleted twice.	2016-08-08 14:36:50 -04:00
scrawl	46538b9438	Merge pull request #1011 from devnexen/master ... Mainly making compilable under OpenBSD.	2016-08-07 20:34:03 +02:00
mrcheko	e2cd87fcc7	fix veritcal aiming	2016-08-07 19:23:08 +03:00
Marc Zinnschlag	aa1ed9b172	Merge remote-tracking branch 'aesylwinn/RenderWater'	2016-08-07 17:03:58 +02:00
scrawl	7b557af885	Merge pull request #1007 from MiroslavR/save-anim-state ... Save scripted animation state	2016-08-06 20:39:32 +02:00
David Carlier	83bab29e4b	Mainly making compilable under OpenBSD. ... Renaming one resource file as the space led to issue for qt/moc.	2016-08-06 19:00:27 +01:00
Aesylwinn	16d0580ce8	Fix struct/class mismatch.	2016-08-05 15:39:08 -04:00
Aesylwinn	1f32f1eef5	Add water texture.	2016-08-05 14:55:40 -04:00
Aesylwinn	9454f4f2e7	Use shared water geometry + state generation, ... Fix water position and render bin, Fix passed cell parameter being ignored	2016-08-05 13:49:44 -04:00
Aesylwinn	5753f52b47	Move water mesh + simple state generation to components library.	2016-08-05 13:25:05 -04:00
Aesylwinn	3904a24e6c	Add missing include.	2016-08-05 00:30:28 -04:00
Aesylwinn	5674e0da24	Render water in editor.	2016-08-04 23:01:43 -04:00
LohikaarmeHAV	19c74a4d6e	Part two	2016-08-03 20:39:46 +03:00
LohikaarmeHAV	7309be8592	First part	2016-08-03 20:20:55 +03:00
lohikaarme	e8ef5c233f	Miss info	2016-08-03 14:24:21 +03:00
lohikaarme	0592d1cdcf	Commnent?	2016-08-03 14:22:25 +03:00
MiroslavR	b65f379b7f	Save scripted animation state (Fixes #1931, #2150, #3393)	2016-08-03 03:52:35 +02:00
lohikaarme	48bcde8cc9	...	2016-08-02 15:41:52 +03:00
LohikaarmeHav	b0cf276cfc	hups	2016-08-02 15:27:40 +03:00
LohikaarmeHav	7cd991107c	Nah ... Preview seem to not like removing mCamPositionSet and I have do other things.	2016-08-02 15:26:12 +03:00
LohikaarmeHav	c6bc30d6a8	Forgot to remove line and add comment.	2016-08-02 14:27:19 +03:00
LohikaarmeHav	2e6f80688c	Removed debug	2016-08-02 14:10:08 +03:00
LohikaarmeHav	c6ec473280	Camera reset now every time cell object->view is pressed.	2016-08-02 13:46:43 +03:00
scrawl	3374630e7b	Merge pull request #1008 from Internecine/bug3451-invalid-enchantments ... Fixes Bug 3451 - Invalid Enchantment IDs	2016-08-02 10:14:59 +02:00
Internecine	90735d226d	Replaced Store::find usage with Store::search to remove exception handlers.	2016-08-02 11:43:41 +12:00
Marc Zinnschlag	f32d0121fc	Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts'	2016-08-01 09:57:11 +02:00
Internecine	14165352f6	Added exception handlers when trying to retreive enchantment and magic effect data.	2016-08-01 13:16:42 +12:00
Aesylwinn	f73d60cc73	Make scene controls use configurable speed modifier.	2016-07-31 16:28:03 -04:00
Aesylwinn	bf2ab4ed45	Change the way modifiers are handled so they can be shared.	2016-07-31 16:07:17 -04:00