13327 commits

Author	SHA1	Message	Date
PlutonicOverkill	3545cfa00a	Rewrite feature to reset options to default	2017-05-09 19:50:16 +12:00
PlutonicOverkill	f30d1a3075	Revert everything	2017-05-08 17:24:28 +12: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
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
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
Allofich	143ee387cc	Add enabled check to animation script commands ... (Fixes #3793)	2017-04-21 23:27:24 +09:00
scrawl	fc56fc0b81	Merge pull request #1265 from akortunov/develop ... Use "sLevel" GMST instead of hardcoded text in load game menu	2017-04-21 15:30:15 +02:00
scrawl	2c879ddbbf	Merge pull request #1264 from Allofich/script ... Run scripts for voiced dialogue	2017-04-21 15:26:09 +02:00
Andrei Kortunov	e717d046f2	Escaped class name string	2017-04-21 17:21:57 +04:00
scrawl	1956602aa2	Merge pull request #1262 from Allofich/warnings ... Fix more warnings	2017-04-21 14:34:36 +02:00
Andrei Kortunov	f67ec9c9ce	Use sLevel GMST instead of hardcoded text in load game menu	2017-04-21 09:40:25 +04:00
Andrei Kortunov	6c1e3a0618	Merged from upstream master	2017-04-21 08:48:22 +04:00
Allofich	ff3cb18d4f	Fix shadowing warnings	2017-04-21 11:06:18 +09:00
Allofich	60c67bc327	Run scripts for voiced dialogue ... (Fixes #3787)	2017-04-21 10:39:11 +09:00
scrawl	c2240e3af1	Call the WindowManager::updatePlayer after the startup script is run	2017-04-21 00:51:13 +02:00
scrawl	1ffb9e1bf3	Remove renderWorldMap()	2017-04-21 00:50:22 +02:00
scrawl	bfdde0262f	Merge pull request #1260 from akortunov/levitationfix ... Purge existing levitation effects when levitation is disabled (fixes #3766)	2017-04-21 00:25:09 +02:00
Allofich	ff3e307059	Pass parameters by const reference	2017-04-20 23:47:03 +09:00
Andrei Kortunov	90d90b6d81	Fixed dynamic stats tooltips in review menu	2017-04-20 17:24:34 +04:00
Andrei Kortunov	39682d616c	Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes	2017-04-20 17:20:20 +04:00
Allofich	2e5fd74db0	Fix invalid iterator warning	2017-04-20 19:30:35 +09:00
scrawl	df3b4fe6a5	Merge pull request #1259 from Allofich/warnings ... Fix a few Cppcheck warnings	2017-04-19 20:32:40 +02:00
Andrei Kortunov	f0f1df3a96	Properly clear inventory	2017-04-19 20:54:09 +04:00