14537 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	49c07de773	Merge pull request #643 from ace13/win-build-fix ... Fix build error and a pair of warnings	2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson	aaaee74a4d	Fix the comments	2015-07-05 21:56:04 +02:00
Stanislav Bas	47d21ff4b3	Add edit locking to ExtendedCommandConfigurator	2015-07-05 22:49:48 +03:00
Stanislav Bas	3c6bc74062	Close the extended configurator when all respective records were removed outside	2015-07-05 22:10:37 +03:00
Marc Zinnschlag	e0781a5d70	Merge remote-tracking branch 'scrawl/master'	2015-07-05 20:47:04 +02:00
Marc Zinnschlag	6c5dc5c7a0	Merge remote-tracking branch 'smbas/fix-cell-creating'	2015-07-05 20:43:59 +02:00
Stanislav Bas	ceb3dea55c	Rewording of the user setting for extended configuration	2015-07-05 20:11:21 +03:00
scrawl	531bca1273	Add a threshold for changing aicombat targets (Fixes #2755)	2015-07-05 18:09:13 +02:00
Stanislav Bas	6162a46fbe	Update to upstream/master. Resolve the merge conflict	2015-07-05 16:15:48 +03:00
Marc Zinnschlag	432384d280	Merge remote-tracking branch 'scrawl/aicombat'	2015-07-05 14:47:20 +02:00
Marc Zinnschlag	ea1ddb5c9f	Merge remote-tracking branch 'smbas/feature-dialogue-edit-id'	2015-07-05 14:44:33 +02:00
Stanislav Bas	3ffa0aa185	Count of nested columns can be retrieved for a collection with no records	2015-07-05 15:36:41 +03:00
dteviot	1239667cb4	AiWander uses points between PathGrid points (Fixes #1317) ... When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.	2015-07-05 18:21:35 +12:00
dteviot	eb2aa965b9	Extracted function SetCurrentNodeToClosestAllowedNode()	2015-07-05 18:17:18 +12:00
dteviot	76f20b8b20	fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.	2015-07-05 18:10:02 +12:00
dteviot	0095737c40	Use correct type of variable. Remove unnecessary casts.	2015-07-05 18:09:14 +12:00
dteviot	f942db2b27	Simplified code.	2015-07-05 18:08:09 +12:00
dteviot	9a02a85a24	Pulled duplicate code into function.	2015-07-05 18:07:14 +12:00
scrawl	c90841d649	Fix head tracking for NPCs	2015-07-04 21:00:01 +02:00
Stanislav Bas	4fbd24206b	ExtendedCommandConfigurator: layout changes	2015-07-04 20:47:10 +03:00
Stanislav Bas	880bc31ddf	TableBottomBox: Creator/Configurator can be closed via Escape	2015-07-04 20:30:02 +03:00
Stanislav Bas	c1b06538dc	Add Edit 'ID' action for nested fields	2015-07-04 19:55:48 +03:00
Stanislav Bas	30fd711a47	TableEditIdAction: prevent creation of a UniversalId with Type_None	2015-07-04 19:39:53 +03:00
Stanislav Bas	86dc5a2c67	Add Edit 'ID' action for nested tables	2015-07-04 19:27:59 +03:00
Stanislav Bas	464e674a81	Rework Table (view) code to use a TableEditIdAction	2015-07-04 18:51:39 +03:00
Stanislav Bas	6b34845168	Create a separate class for Edit 'ID' action to use in tables' context menus	2015-07-04 18:49:32 +03:00
dteviot	fae93e3d82	Bugfix: was not resetting mStuckCount.	2015-07-04 19:00:27 +12:00
dteviot	46a654286b	Remove fix for #1317 ... Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.	2015-07-04 18:57:56 +12:00
dteviot	164994f3d3	Made PathFinder::buildPath() private. ... Now all paths are built by calling PathFinder::buildSyncedPath(). Also removed useless comment.	2015-07-04 18:47:26 +12:00
scrawl	6bcea21e14	Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876)	2015-07-04 05:19:05 +02:00
Stanislav Bas	1f826476ff	Fix build error	2015-07-04 02:02:22 +03:00
Stanislav Bas	ff3c9a6fb2	ExtendedCommandConfigurator: the perform button is now the default for the widget	2015-07-03 23:35:00 +03:00
Stanislav Bas	e664ef7578	ExtendedCommandConfigurator: the perform button takes the name of the command that is executed	2015-07-03 23:15:26 +03:00
Stanislav Bas	05cc130212	The configuration panel gets a focus when opening	2015-07-03 22:31:38 +03:00
Stanislav Bas	95d16b24c0	ExtendedCommandConfigurator: disable the perform button when all tables are unchecked	2015-07-03 22:25:56 +03:00
Stanislav Bas	260f6f22ae	TableBottomBox adjusts its size according to the current widget size	2015-07-03 22:07:37 +03:00
Stanislav Bas	d73fd471c3	IdContextMenu: don't add Edit action if it's already in the context menu	2015-07-03 19:07:44 +03:00
Stanislav Bas	61ab0ba482	Prevent the Edit 'ID' action for the current ID of the dialogue subview	2015-07-03 18:48:13 +03:00
Stanislav Bas	149cb9d004	IdContextMenu: if the ID field is empty show the standard context menu (if available)	2015-07-03 16:51:47 +03:00
Stanislav Bas	e8e34f37dd	Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)	2015-07-03 16:24:08 +03:00
Stanislav Bas	47b66b57ae	Create a context menu handler for dialogue editors with ID information	2015-07-03 15:37:10 +03:00
Marc Zinnschlag	382cdb8c60	implemented sorting in report views (Fixes #2540)	2015-07-03 10:45:08 +02:00
scrawl	a7bd050928	Accurate attack timings in AiCombat	2015-07-03 05:58:12 +02:00
scrawl	741e5db862	Fix for non-bipedal creatures that use weapons, e.g. rieklings	2015-07-03 05:37:18 +02:00
scrawl	2385938485	Fix a typo	2015-07-03 02:42:40 +02:00
scrawl	82740c1645	Remove completely broken code	2015-07-03 02:29:42 +02:00
scrawl	d07b176b36	Take into account hit recovery, knockdown and other animations for AiCombat attack timing	2015-07-03 02:18:35 +02:00
scrawl	520a832a9a	Remove an already resolved todo comment	2015-07-02 22:24:23 +02:00
Stanislav Bas	12bf3694bd	Rework widget layout of ExtendedCommandConfigurator	2015-07-02 22:05:45 +03:00
scrawl	6724585777	Light magic effect ... Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)	2015-07-02 20:46:34 +02:00