13345 commits

Author	SHA1	Message	Date
Marc Zinnschlag	6906e35ac0	Merge remote-tracking branch 'origin/master'	2017-05-12 14:48:03 +02:00
PlutonicOverkill	5ec97811d8	Don't switch pages when right-clicking on list	2017-05-12 20:22:18 +12:00
PlutonicOverkill	7281e8b888	Remove C++11 features	2017-05-12 12:48:25 +12:00
PlutonicOverkill	cd75c5618c	Move context menu code to PageBase	2017-05-11 19:46:51 +12:00
PlutonicOverkill	16f8341de3	Prevent context menu appearing for modifier settings	2017-05-10 21:24:12 +12:00
PlutonicOverkill	c2f427f48d	Prevent context menu appearing when right-clicking shortcut setting	2017-05-10 20:43:52 +12:00
PlutonicOverkill	646ff72cdc	Add a more elegant way of showing the context menu	2017-05-10 20:27:50 +12:00
PlutonicOverkill	bd9f657603	Show context menu when user clicks on empty space	2017-05-10 19:51:43 +12:00
PlutonicOverkill	30af92f575	Fix pointer initialisation bug	2017-05-09 20:58:32 +12:00
PlutonicOverkill	4879405097	Add reset context menu for key binding pages	2017-05-09 19:58:34 +12:00
PlutonicOverkill	3545cfa00a	Rewrite feature to reset options to default	2017-05-09 19:50:16 +12:00
Allofich	315ad54b29	Don't make NPCs or player speak while underwater ... (Fixes #3851)	2017-05-08 19:55:54 +09:00
Andrei Kortunov	de14e9811d	Fixed Travis CI build	2017-05-08 11:16:03 +04:00
PlutonicOverkill	f30d1a3075	Revert everything	2017-05-08 17:24:28 +12:00
scrawl	48c764a580	Update test	2017-05-07 23:31:06 +02:00
scrawl	813af876f6	Use a partial binary search in isReservedName (Fixes #3835)	2017-05-07 23:28:56 +02:00
scrawl	109bc3cb59	Merge pull request #1281 from akortunov/purgefix ... Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first	2017-05-07 21:08:30 +02:00
scrawl	796d2c59ca	Merge pull request #1282 from MiroslavR/noenv_player_vo ... Do not apply underwater effects to player's voice	2017-05-07 21:07:19 +02:00
PlutonicOverkill	a9760ec805	Fix indenting	2017-05-07 17:07:58 +12:00
PlutonicOverkill	d8a711f89f	Fix tabs	2017-05-07 17:05:50 +12:00
PlutonicOverkill	477af73ad6	Missed another one	2017-05-07 17:00:26 +12:00
PlutonicOverkill	418aeb65f1	Remove unneeded dependencies	2017-05-07 16:58:15 +12:00
PlutonicOverkill	5fca37d0c8	Forgot to remove debugging code	2017-05-07 16:54:38 +12:00
PlutonicOverkill	dff3828710	Keep the settings page in sync with the real settings	2017-05-07 16:51:11 +12:00
PlutonicOverkill	64879c03e4	Add option to reset settings to default	2017-05-06 20:18:31 +12:00
Marc Zinnschlag	a2e863e7dd	Merge remote-tracking branch 'origin/master'	2017-05-03 14:31:21 +02:00
PlutonicOverkill	829560719e	Make name highlighting more consistent and only for variable names	2017-05-02 17:28:42 +12:00
MiroslavR	d24bcbac15	Do not apply underwater effects to player's voice (Fixes #3850)	2017-04-30 18:51:49 +02:00
scrawl	9f1527b7da	Merge pull request #1272 from akortunov/guifixes ... Service menus layout fixes	2017-04-30 12:27:21 +02:00
PlutonicOverkill	95f60d2bb3	Merge branch 'master' into mark-variable	2017-04-28 20:15:48 +12:00
PlutonicOverkill	cbb2b8b119	Add setting so feature can be turned off	2017-04-28 19:57:49 +12:00
PlutonicOverkill	a8e7628e83	Enable highlighting when cursor is placed over a name (script editor)	2017-04-28 19:28:05 +12:00
Marc Zinnschlag	7919c4d672	Merge remote-tracking branch 'plutonicoverkill/master'	2017-04-28 08:40:07 +02:00
PlutonicOverkill	e685de0f84	Fix script editor undo/redo context menu actions	2017-04-27 19:48:01 +12:00
PlutonicOverkill	6063d8e31b	Fix existing context menu in script editor	2017-04-27 16:31:45 +12:00
Andrei Kortunov	bba822c014	Purge all effects with same ID instead only first (fixes #3839)	2017-04-26 17:18:06 +04:00
Marc Zinnschlag	61e6b0d03c	improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault)	2017-04-26 15:03:30 +02:00
PlutonicOverkill	3d1e640388	Add setting to change keyboard shortcut and fix another crash	2017-04-26 19:42:03 +12:00
PlutonicOverkill	1f699552f7	Fix infinite recursion bug in uncommentSelection()	2017-04-26 15:49:39 +12:00
PlutonicOverkill	61e374fdfc	Implement commentSelection() and uncommentSelection()	2017-04-25 19:12:18 +12:00
PlutonicOverkill	83ff7d162c	Add comment/uncomment actions to the context menu	2017-04-25 16:12:59 +12:00
MiroslavR	eada8c6822	Fix wrong incrementation in InventoryStore::visitEffectSources (Fixes #3838)	2017-04-23 18:05:41 +02:00
Andrei Kortunov	c2706ac3e7	Merchant repair and travel window scroll fix	2017-04-23 09:15:25 +04:00
scrawl	0e37e71ea2	Merge pull request #1266 from akortunov/handsfallbackfix ... Improved hands bodyparts selection fallback	2017-04-23 00:36:48 +02:00
Andrei Kortunov	4544caf7f3	Improved bodypart select fallback (fixes #2594)	2017-04-22 22:23:10 +04:00
MiroslavR	0737d6cb72	Merge pull request #1270 from Allofich/scriptfix ... Check for NULL before running voice dialogue scripts	2017-04-22 01:58:20 +02:00
Allofich	f34e35eb19	Check for NULL before running voice scripts ... (Fixes #3834)	2017-04-22 07:51:31 +09:00
scrawl	8fbf9dc597	Merge pull request #1253 from akortunov/pinned ... Remember "pinned" windows across game restarts	2017-04-21 18:44:47 +02:00
Andrei Kortunov	2b3b6d558f	Move updatePinnedWindows() function to private section	2017-04-21 19:37:09 +04:00
Andrei Kortunov	f986e3fafa	Remove unused code	2017-04-21 18:39:01 +04:00