2502 commits

Author	SHA1	Message	Date
Andrei Kortunov	3571f7f413	Remove getEncoding() from WindowManager	2017-11-22 08:32:38 +04:00
Andrei Kortunov	5f41f7c48d	Clean code up a bit	2017-11-21 13:03:38 +04:00
Andrei Kortunov	ba91cd658b	Convert topic name to Unicode	2017-11-21 12:31:23 +04:00
Andrei Kortunov	f0ca3eabd3	Merge from upstream master	2017-11-21 09:39:54 +04:00
Andrei Kortunov	a83a43e376	Determine when need to use the Cyrillic journal index	2017-11-21 09:32:35 +04:00
scrawl	719255c5c6	Merge pull request #1557 from akortunov/journalfix ... [Feedback needed] Handle 128px Tx_menubook_topics textures	2017-11-20 23:07:18 +00:00
Andrei Kortunov	ce5bdd6361	Split the JournalBooks::createTopicIndexBook()	2017-11-20 22:25:53 +04:00
Andrei Kortunov	a391990f2a	Provide multibyte toLower() and single chars comparator	2017-11-20 21:30:46 +04:00
Andrei Kortunov	4dcaf040e6	A Russian journal index	2017-11-20 19:37:24 +04:00
Andrei Kortunov	60d0c83cca	Handle 128px Tx_menubook_topics textures	2017-11-20 17:39:28 +04:00
Miloslav Číž	ea2bbce68a	Fix memory leak in WindowManager	2017-11-18 19:27:09 +01:00
Miloslav Číž	3ae5310567	use loading screen to freeze the screen	2017-11-16 22:08:33 +01:00
scrawl	7c5d2a1ac4	Update dialogue topics list after result script is run ... Regression from 0.42.	2017-11-15 17:20:06 +00:00
scrawl	98b4f9c596	Merge pull request #1549 from akortunov/itemmodels ... Item models reworking	2017-11-11 22:12:07 +00:00
Andrei Kortunov	03f129b53c	remove redundant allowedToInsertItems() function from ItemModel	2017-11-11 11:58:22 +04:00
Andrei Kortunov	99517d83ea	Bound items detection refactoring	2017-11-11 11:58:22 +04:00
Andrei Kortunov	a02124f884	Handle item owners during pickpocketing	2017-11-11 11:58:18 +04:00
Andrei Kortunov	3694b6ec90	Move onClose() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	ac33ff9482	Move onDropItem() check to item models	2017-11-10 10:58:43 +04:00
Andrei Kortunov	3604b73d60	Move onTakeItem() to item models	2017-11-10 10:58:40 +04: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
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
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
scrawl	8b19a8b7f6	Merge pull request #1513 from lukago/feature4082b ... Feature #4082: use many ingredients/potions instantly	2017-10-22 20:51:14 +00: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
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
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
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
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
scrawl	5b10e3128e	Use first resolution in fullscreen if current is not supported (Fixes #4113)	2017-09-29 14:58:25 +00:00
scrawl	64e27c032b	Merge pull request #1481 from scrawl/keyfocus ... WindowManager overhaul & improved keyboard support	2017-09-28 22:34:05 +00:00
scrawl	7bb0a76df2	Fix tooltips showing when cursor isn't visible	2017-09-28 19:42:16 +02:00
scrawl	14c9e858c8	Check to make sure button is enabled	2017-09-28 17:00:07 +00:00
scrawl	6ec66fa95f	Restore keyfocus to goodbye when selecting a topic	2017-09-28 16:57:55 +00:00
scrawl	0ae009eb21	Hide message box before deleting it ... Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.	2017-09-27 22:19:42 +02:00
scrawl	d53e7f8a3c	Remove redundant code ... Already worked around in WindowBase::setVisible	2017-09-27 22:07:49 +02:00
scrawl	0deda69a27	Fix wrong skin for levelup attribute values	2017-09-27 22:04:36 +02:00
scrawl	e9d81fdf5a	Fix being able to escape interactive messageboxes	2017-09-27 22:00:20 +02:00
scrawl	db650df416	Fix 'blocking' messageboxes not handling key focus properly	2017-09-27 21:41:22 +02:00
scrawl	a0f5e32113	Fix 'new game' from the main menu not removing menu afterwards	2017-09-27 21:38:15 +02:00
scrawl	0ee57effcc	Make 'Delete game' button not accept keyfocus, to prevent accidents	2017-09-27 12:56:12 +00:00
scrawl	c7a82704c6	Fix key focus resets in SaveGameDialog	2017-09-27 12:56:11 +00:00
scrawl	3d2ad2d339	Include cleanup	2017-09-27 12:56:09 +00:00
scrawl	87311d86b5	Fix what looks like a copy/paste error	2017-09-27 12:56:08 +00:00
scrawl	7a3fbfb34a	Slightly improve journal window keyboard navigation	2017-09-27 12:56:05 +00:00
scrawl	05814c0929	Add key focus handling for WaitDialog ... Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.	2017-09-27 12:56:03 +00:00
scrawl	8964fc93d6	Fix dialogue window not being exited properly	2017-09-27 12:56:02 +00:00
scrawl	7a64098da3	Avoid rebuilding the dialogue topics pane unnecessarily ... Also retaining key focus.	2017-09-27 12:56:02 +00:00
scrawl	22929e53fa	Don't ignore my own advice ... Can't wait until MyGUI 3.2.2 is a build dependency, then we can use key focus events to handle the SDL text input.	2017-09-27 12:55:58 +00:00
scrawl	1714271a76	Improve KeyboardNavigation to better handle modal windows ... It's no longer possible to cycle to widgets that aren't part of the current modal window. The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).	2017-09-27 12:55:58 +00:00
scrawl	41fe16013b	Select first widget if we can't find the current widget	2017-09-27 12:55:55 +00:00
scrawl	475ac46f3e	Workaround keyfocus issues in current versions of MyGUI	2017-09-27 12:55:54 +00:00
scrawl	010a7ea5b3	Fix tooltip widgets being set to accept key focus	2017-09-27 12:55:52 +00:00
scrawl	2514cc5cc8	Workaround key focus being reset in BookWindow when next/prev are hidden	2017-09-27 12:55:50 +00:00
scrawl	fce9a14986	Hide the mouse cursor until it's used	2017-09-27 12:55:48 +00:00
scrawl	9b91ea5d34	Exit drag-and-drop if dragged item is deleted (Fixes #3097)	2017-09-26 16:51:19 +02:00
scrawl	2ce79e07a4	Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways. ... - Fix memory leaks in DialogueWindow - Fix Link objects being deleted from their own event handler	2017-09-25 23:38:28 +02:00
scrawl	c5613e384e	Remove duplicate disposition code	2017-09-25 21:30:03 +02:00
scrawl	36c192a1dd	Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening	2017-09-25 21:15:38 +02:00
scrawl	717e68fab2	Remove redundant resetHistory argument	2017-09-25 19:58:34 +02:00
scrawl	e14573fa8c	Add missing null check	2017-09-25 19:53:42 +02:00
scrawl	19e07fad30	Remove redundant Services enum	2017-09-25 19:52:20 +02:00
scrawl	f8ffd85146	Topic passed to keywordSelected() no longer has to be lower case ... Remove redundant mDialogueMap	2017-09-25 19:03:38 +02:00
scrawl	b7752ec52d	Make TradeWindow not depend on DialogueWindow	2017-09-25 18:07:49 +02:00
scrawl	d78e822833	Add 'delay' argument for screen fading operations	2017-09-25 00:47:10 +02:00
scrawl	c035548f37	Make Tab work if selected widget is marked as not needing keyfocus	2017-09-25 00:47:09 +02:00
scrawl	94b538ac82	Fix crash due to not calling WindowModal::onClose()	2017-09-25 00:47:08 +02:00
scrawl	67dc4e019a	Make Enter on trade window price attempt the trade	2017-09-25 00:47:07 +02:00
scrawl	8ae7e4c958	Make Enter on a name edit accept the dialog	2017-09-25 00:47:07 +02:00