18006 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
scrawl	5e03e75549	Merge pull request #1283 from Allofich/water ... Don't make NPCs or player speak while underwater	2017-05-09 08:16:06 +02:00
Allofich	315ad54b29	Don't make NPCs or player speak while underwater ... (Fixes #3851)	2017-05-08 19:55:54 +09:00
Bret Curtis	2f866fadcf	Merge pull request #1288 from akortunov/travisfix ... Fixed Travis CI build (removed tab from test_stringops.cpp)	2017-05-08 10:57:00 +02: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
Bret Curtis	c262ae9279	Merge pull request #1285 from ace13/patch-5 ... Update Windows CI scripts to use ffmpeg 3.2.4	2017-05-06 13:28:49 +02:00
PlutonicOverkill	64879c03e4	Add option to reset settings to default	2017-05-06 20:18:31 +12:00
Alexander "Ace" Olofsson	fd03c76e68	And apparently they're only doing zips now	2017-05-06 09:38:14 +02:00
Alexander "Ace" Olofsson	ae05c37a46	Update Windows CI scripts to use ffmpeg 3.2.4	2017-05-06 09:21:02 +02:00
scrawl	8d84869432	Fix commit 8f71b65d38 (don't overwrite the previous user data) ... This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type. (Fixes #3829)	2017-05-05 05:27:00 +02:00
Marc Zinnschlag	a2e863e7dd	Merge remote-tracking branch 'origin/master'	2017-05-03 14:31:21 +02:00
Andrei Kortunov	4d927439ca	Spell priority: item wearing check when disintegrate weapon/armor	2017-05-03 11:13:35 +04:00
Andrei Kortunov	d598809ac6	Spell priority: check spell resistance, check if actor is already has a non-magnitude effect	2017-05-03 10:35:56 +04:00
PlutonicOverkill	829560719e	Make name highlighting more consistent and only for variable names	2017-05-02 17:28:42 +12:00
Andrei Kortunov	da828a1089	Class choice layout fix	2017-05-01 21:37:37 +04:00
Andrei Kortunov	ba78e187c7	Listbox spacing fix	2017-05-01 21:28:42 +04:00
Andrei Kortunov	0e35e6a700	Class generation menu layout fixes	2017-05-01 20:51:54 +04:00
Andrei Kortunov	1520a4d7db	Levelup menu layout fixes	2017-05-01 20:48:39 +04:00
Andrei Kortunov	26ec467df0	Tooltips: faction, magic effects layout fixes	2017-05-01 10:00:51 +04:00
Andrei Kortunov	987677db75	Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes	2017-04-30 22:39:05 +04:00
Andrei Kortunov	27181367e2	Tooltips: skills and attributes layout fixes	2017-04-30 21:26:13 +04:00
MiroslavR	d24bcbac15	Do not apply underwater effects to player's voice (Fixes #3850)	2017-04-30 18:51:49 +02:00
Andrei Kortunov	6331cc6ab9	Tooltips: level, race, class, specialization layout fixes	2017-04-30 19:45:36 +04: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	8299f8677b	updated credits file	2017-04-28 08:45:16 +02: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