12201 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	6a2fe564ef	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
Marc Zinnschlag	b2181fae20	safer handling of command macros	2016-03-08 10:48:44 +01:00
Marc Zinnschlag	b5005f7812	keep sub mode over mode changes	2016-03-05 11:41:42 +01:00
Marc Zinnschlag	a63453846b	properly clear drag mode at the end of a drag	2016-03-05 11:14:08 +01:00
Marc Zinnschlag	51a4e3fa7d	properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind)	2016-03-05 10:56:54 +01:00
Marc Zinnschlag	70745487f3	cancel instance move on editing lock becoming active	2016-03-05 10:44:46 +01:00
Marc Zinnschlag	b1fb64bf68	added missing drag mode resets	2016-03-04 16:25:30 +01:00
Marc Zinnschlag	dd564daba0	do not start move drags while the document is locked for editing	2016-03-04 16:24:02 +01:00
Marc Zinnschlag	1726393963	cancel instance move on edit mode change	2016-03-04 15:31:50 +01:00
Marc Zinnschlag	25effc4222	cancel instance move on sub mode change	2016-03-04 15:30:28 +01:00
Marc Zinnschlag	1240e0c716	cancel instance move on drag abort	2016-03-04 15:19:26 +01:00
Marc Zinnschlag	d57021b23c	some code simplification	2016-03-04 12:02:45 +01:00
Marc Zinnschlag	c2a8be9048	confine move marker drags to a single axis	2016-03-04 12:00:05 +01:00
Marc Zinnschlag	4cd24715cb	Merge remote-tracking branch 'pi03k/bug_2570'	2016-03-04 09:41:21 +01:00
Marc Zinnschlag	563f44b823	Merge remote-tracking branch 'origin/master'	2016-03-03 12:13:11 +01:00
pi03k	128508882a	Changed some zeros to NULLs in view.cpp	2016-03-03 11:46:56 +01:00
pi03k	3bfab9c2c9	extracted creation of scroll area to separate method	2016-03-03 11:46:56 +01:00
pi03k	9539925f3e	Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers.	2016-03-03 11:46:56 +01:00
pi03k	bf9aa2e131	Extracted resizing of window's width to separate method	2016-03-03 11:46:56 +01:00
Marc Zinnschlag	9c1b4c671d	Merge remote-tracking branch 'aesylwinn/cell_borders'	2016-03-03 11:04:51 +01:00
Aesylwinn	9d985d883b	added grid icon	2016-03-02 20:45:04 -05:00
Aesylwinn	fa1bd72bc0	fix usage of deprecated function	2016-03-02 15:48:05 -05:00
Aesylwinn	7fb6807e65	cell border markers	2016-03-02 15:02:06 -05:00
scrawl	3d6323f13a	Force-enable hasWater() for exterior cells (Fixes #3222)	2016-03-02 17:02:30 +01:00
scrawl	67c8faec75	Infinite loop fix	2016-03-02 13:20:23 +01:00
scrawl	08f06c6c2d	Fix a crash that could occur with actors that define 'bip01 spine1' but do not define 'bip01 spine2' (Fixes #3223).	2016-03-01 16:58:39 +01:00
Marc Zinnschlag	a19ac72215	render marker	2016-03-01 15:48:34 +01:00
Marc Zinnschlag	6f619ea85f	Merge branch 'master' into move ... Conflicts: apps/opencs/view/render/object.cpp	2016-03-01 12:17:53 +01:00
Marc Zinnschlag	c1f4448547	Merge remote-tracking branch 'origin/master' into createfix	2016-03-01 11:35:28 +01:00
scrawl	2821f46a18	Corpse clearing fix	2016-03-01 11:31:08 +01:00
Marc Zinnschlag	e4f341d4ba	Merge remote-tracking branch 'origin/master' into createfix	2016-03-01 11:21:25 +01:00
Marc Zinnschlag	7d8bd56e11	create new records with basic data in the same step without updates inbetween (Fixes #3207)	2016-03-01 11:21:06 +01:00
scrawl	87871d7d54	Don't add RotateController to an uncontrolled node	2016-02-29 20:23:19 +01:00
scrawl	36bb255bc0	Use safePlaceObject in spawnRandomCreature	2016-02-29 17:30:38 +01:00
scrawl	7485abe5c3	Use safePlaceObject for summoned creature spawning	2016-02-29 17:27:07 +01:00
scrawl	be62ae758a	Fall back to sides first	2016-02-29 17:26:52 +01:00
scrawl	6df71f6250	Factor out safePlaceObject function	2016-02-29 17:19:22 +01:00
scrawl	11f00e3aa9	Rename safePlaceObject to placeObject	2016-02-29 17:05:18 +01:00
scrawl	be2f20f564	PlaceAt: attempt to select a safe spawn location (Fixes #2515, Fixes #1384, Fixes #2925)	2016-02-29 16:54:00 +01:00
scrawl	04d51d5871	Always update the ingredient icons (Fixes #3220)	2016-02-29 13:25:09 +01:00
scrawl	27577ce765	Add ESM::Land::DEFAULT_HEIGHT	2016-02-28 16:49:18 +01:00
scrawl	fc3de3302e	Create a collision shape for the default terrain	2016-02-28 16:47:41 +01:00
scrawl	84e9d346ef	Remove duplicate include	2016-02-28 16:47:33 +01:00
Marc Zinnschlag	ebaeabc962	Merge remote-tracking branch 'scrawl/respawn'	2016-02-28 10:19:14 +01:00
scrawl	3a2dccad4b	Implement 'Show' script instruction	2016-02-27 13:40:53 +01:00
scrawl	f2f601b958	Implement corpse clearing (Fixes #2363)	2016-02-27 13:20:50 +01:00
scrawl	c3ef387208	Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467)	2016-02-27 12:53:07 +01:00
Marc Zinnschlag	290da132b1	Merge remote-tracking branch 'scrawl/activate'	2016-02-26 16:03:50 +01:00
Rob Cutmore	d60786b5da	Do not show cell markers for interior cells	2016-02-26 07:42:05 -05:00
scrawl	a97eae864d	Fix the ObstacleCheck time step (Fixes #3211)	2016-02-26 13:15:41 +01:00