2571 commits

Author	SHA1	Message	Date
David Cernat	f2a6957e16	Merge pull request #331 from OpenMW/master while resolving conflicts	2017-11-10 08:43:50 +02:00
scrawl	e42bd71081	Add missing WaitDialog::clear() (Fixes #4196)	2017-11-08 00:24:04 +00:00
scrawl	e6303c578c	Merge pull request #1530 from rexelion/curseitemfix ... Trigger OnActivate when item is picked up through the inventory (Issue #3726)	2017-11-05 15:35:39 +00:00
rexelion	8c2cc0f42f	break invisibility first	2017-11-04 00:44:16 +00:00
rexelion	bcbfa5fe1e	prevent activation, leave the rest to the script	2017-11-04 00:38:33 +00:00
rexelion	a9e5e19482	OnActivate is triggered when the item is picked up	2017-10-31 22:33:26 +00:00
David Cernat	a31d43965f	Merge pull request #328 from OpenMW/master ... Add OpenMW commits up to 31 Oct 2017	2017-10-31 06:22:57 +02:00
rexelion	e8743f3f79	check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords	2017-10-30 21:16:25 +00:00
Miloslav Číž	3c65bdaf14	weapon cycle fix	2017-10-30 18:05:45 +01:00
rexelion	4e6f53d6f1	item added to the player and OnActivate is triggered when the inventory is closed	2017-10-29 11:45:17 +00:00
David Cernat	dd25c7db4e	Merge pull request #324 from OpenMW/master ... Add OpenMW commits up to 24 Oct 2017	2017-10-24 19:36:14 +03:00
scrawl	e564dd842e	Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166) ... Don't delete Link objects prematurely (Fixes #4171)	2017-10-23 23:33:06 +00:00
scrawl	2a0b2c4e24	Hide modal window before deleting it (Fixes #4168)	2017-10-23 23:33:05 +00:00
David Cernat	360cf2ead7	Merge pull request #321 from OpenMW/master ... Add OpenMW commits up to 22 Oct 2017	2017-10-23 14:51:29 +03:00
scrawl	8b19a8b7f6	Merge pull request #1513 from lukago/feature4082b ... Feature #4082: use many ingredients/potions instantly	2017-10-22 20:51:14 +00:00
David Cernat	3a9e5e3a7b	Merge pull request #319 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwworld/worldimp.hpp	2017-10-22 20:27:44 +03:00
lukago	b6cb3b445c	use getIndex to handle other windows, nullsafe fixes	2017-10-21 23:34:57 +02:00
Andrei Kortunov	eaff7e30aa	Fix a 'Good Beast' companion window	2017-10-21 16:56:21 +04:00
lukago	a3225364ff	refactor, use dragItem method	2017-10-19 17:43:27 +02:00
lukago	43f94a8890	simplify drag and drop on avatar for potions and ingredients	2017-10-19 16:50:04 +02:00
David Cernat	e164e6305e	Merge pull request #313 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp	2017-10-16 07:37:29 +03:00
scrawl	03554b2f4b	Fix some style issues flagged by cppcheck	2017-10-15 17:06:58 +02:00
scrawl	624046c558	Fix unused event handler	2017-10-15 17:06:58 +02:00
scrawl	548af6dbfb	Fix jail screen fading	2017-10-14 14:03:16 +00:00
David Cernat	41ff3fee89	Merge pull request #310 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt	2017-10-09 14:41:55 +03:00
scrawl	479f9535b4	Allow training window exit()	2017-10-08 20:38:20 +00:00
scrawl	9cde3e4408	Merge pull request #1495 from akortunov/regressions ... Add showsInInventory() check to the ContainerItemModel	2017-10-08 14:09:59 +00:00
Andrei Kortunov	ea3729790f	Add showsInInventory() check to the ContainerItemModel	2017-10-08 09:20:07 +04:00
David Cernat	711c4d83da	[Client] Fix build after recent OpenMW changes to GUI	2017-10-07 23:33:36 +03:00
David Cernat	3e8d7c8416	Merge pull request #306 from OpenMW/master ... Add OpenMW commits up to 7 Oct 2017	2017-10-07 21:54:21 +03:00
scrawl	7021d354c6	Merge pull request #1493 from akortunov/regressions ... Regression fixes	2017-10-06 16:21:16 +00:00
scrawl	2805781542	Fix a crash when exit() already hides the window (Fixes #4148)	2017-10-06 16:18:57 +00:00
Andrei Kortunov	ad27e0f945	Fix owned tooltip in the spellwindow	2017-10-06 11:38:27 +04:00
David Cernat	38247ff086	Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp	2017-10-06 04:10:04 +03:00
scrawl	842a42ee66	Fix non-top level Windows accepting key focus	2017-10-05 18:41:02 +02:00
scrawl	cd437f094d	Fix exiting savegamedialog with 'esc' when no game is running	2017-10-05 18:35:09 +02:00
scrawl	d94235e3a7	Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard	2017-10-04 16:00:39 +00:00
scrawl	12510efab7	Fade screen out during loading screen (when travelling)	2017-10-04 16:00:38 +00:00
scrawl	a4737d8417	Use MyGUI frame events for ScreenFader	2017-10-04 16:00:38 +00:00
scrawl	e4f0f7157a	Fix pinned windows not being updated	2017-10-04 16:00:37 +00:00
scrawl	49a0922f1b	Remove 'visibility mask' gui feature which did not end up being useful	2017-10-04 16:00:37 +00:00
scrawl	7c68ed04b2	Don't require modal windows to be removed in the same order they were added	2017-10-04 16:00:37 +00:00
scrawl	b5c9977a7b	Merge pull request #1489 from akortunov/guifixes ... Use an "owned crosshair" feature for items in containers	2017-10-04 15:59:43 +00:00
Andrei Kortunov	1cb7ed5db1	Use owned tooltips for items in containers correctly	2017-10-04 12:13:45 +04:00
scrawl	433028e8d7	Fix GUI regressions	2017-10-03 22:07:56 +00:00
scrawl	302e3c8b3d	Merge pull request #1486 from akortunov/pickpocketfix ... Fix some issues with pickpocketing (bug #4131)	2017-10-01 16:05:38 +00:00
Andrei Kortunov	34895157f9	Consider taking items from unconscious NPC as a theft	2017-09-30 20:22:26 +04:00
Andrei Kortunov	04452b0949	Use a pickpocket crime instead of theft when pickpocketing was failed	2017-09-30 20:11:53 +04:00
scrawl	3c62a8c5c2	Fix console selected object persisting on a new game	2017-09-30 15:40:47 +00:00
scrawl	097b9d90bc	Fix travel service not showing	2017-09-30 15:40:47 +00:00