12323 commits

Author	SHA1	Message	Date
Aesylwinn	3a676fc456	Revert "Create a visual representation of the center of the orbit camera." ... This reverts commit 2c894acd98. # Conflicts: # apps/opencs/view/render/cameracontroller.cpp # apps/opencs/view/render/cameracontroller.hpp	2016-03-25 18:20:04 -04:00
Rob Cutmore	1b4c124fe8	Create record on Return key press (Feature #3250) ... Updated to create record when Return key is pressed while input has focus. Record is only created if input has been validated (i.e. Create button is enabled).	2016-03-25 12:13:55 -04:00
Rob Cutmore	29078619aa	Fix editor tab order when adding record	2016-03-25 06:28:11 -04:00
scrawl	e71aa53574	Don't allow playing a sound/soundgen key more than once at the same time on the same object (Fixes #2689)	2016-03-24 19:26:12 +01:00
scrawl	5bd8ef247d	Do not adjust the player position when loading a savegame (Fixes #2089)	2016-03-24 17:18:08 +01:00
scrawl	92c2a10de4	Fall back to 'warrior' for not found class images (Fixes #3228)	2016-03-24 16:52:16 +01:00
Marc Zinnschlag	1774f6d9bf	moved ref num assingment from instance creation to save procedure	2016-03-24 11:12:05 +01:00
scrawl	157c11398d	Add terrain parallax mapping	2016-03-22 21:46:15 +01:00
scrawl	e381957105	Don't assume that class ID and name are equal	2016-03-21 11:51:34 +01:00
scrawl	90cc1de46c	Do not list custom made classes in the pick class dialog	2016-03-21 11:46:25 +01:00
scrawl	b332704df7	Switch hand-to-hand attack types randomly when "always use best attack" is turned on (Fixes #3259)	2016-03-19 18:03:59 +01:00
Aesylwinn	342d31de76	More fixes to the orbit manipulator	2016-03-18 16:56:40 -04:00
Aesylwinn	2903271331	Correct the center position for the orbit camera controller	2016-03-18 16:07:15 -04:00
Aesylwinn	2c894acd98	Create a visual representation of the center of the orbit camera. ... For debugging purposes.	2016-03-18 16:06:35 -04:00
Aesylwinn	c8bae38a8e	Remove trackball mode	2016-03-18 14:53:10 -04:00
Aesylwinn	7009355baf	Remove unused variable	2016-03-18 14:46:53 -04:00
Aesylwinn	4374f69a60	Reduce mouse sensitivity	2016-03-18 14:43:13 -04:00
Aesylwinn	2b72a04e7a	Update 1st person up axis ASAP.	2016-03-18 14:02:55 -04:00
Aesylwinn	999869da24	Position camera above, near, and looking at the scene.	2016-03-18 14:02:24 -04:00
Aesylwinn	fcccacc0fa	Define a constant for the World Up vector	2016-03-18 13:57:48 -04:00
Marc Zinnschlag	589fb1031b	Merge remote-tracking branch 'pi03k/bug_3248'	2016-03-18 07:32:57 +01:00
scrawl	a6e23d03d3	Don't clamp disposition twice, clamping is already done inside getDerivedDisposition	2016-03-18 00:42:22 +01:00
scrawl	102f9719f7	Remove some garbage	2016-03-18 00:39:27 +01:00
scrawl	79eb2d20e0	Cleanup	2016-03-18 00:39:19 +01:00
scrawl	12ec90f9e7	Change default argument, fix GetDisposition	2016-03-18 00:38:02 +01:00
scrawl	bc5adfa4fe	Merge pull request #913	2016-03-18 00:31:55 +01:00
scrawl	30402f75e3	Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258)	2016-03-18 00:24:38 +01:00
scrawl	2b38d10449	Always add xbase_anim	2016-03-18 00:17:05 +01:00
pi03k	629a558e7b	Fix for bug 3248	2016-03-17 22:34:45 +01:00
Aesylwinn	59f59a3385	Fix indentation	2016-03-14 00:45:36 -04:00
Aesylwinn	08fe914ba1	Preliminary editor camera	2016-03-14 00:45:18 -04:00
Aesylwinn	2cff2cd643	Remove unnecessary override.	2016-03-14 00:45:08 -04:00
Aesylwinn	9ed2cf6581	Fix callback being skipped	2016-03-14 00:44:56 -04:00
Aesylwinn	ebdc212886	Moved selectNavigationMode to SceneWidget class, centralized camera selection.	2016-03-14 00:44:46 -04:00
Aesylwinn	9afb0e0f90	Input restructuring.	2016-03-14 00:42:15 -04:00
Aesylwinn	f4f7afb53b	Removed now unnecessary installation of event filter.	2016-03-14 00:41:57 -04:00
Aesylwinn	38059593a7	Removed workaround for OSG input handling in RenderWidget.	2016-03-14 00:41:04 -04:00
scrawl	50acdf3e47	Move createCharacter inside the try block	2016-03-14 00:03:02 +01:00
scrawl	a0cc9de088	Make the creation of save file directories even more explicit	2016-03-14 00:00:11 +01:00
scrawl	b7b7c0612d	Make getCurrentCharacter create argument explicit	2016-03-13 23:48:44 +01:00
scrawl	7463c0c353	Addition to last commit, don't create a save directory on death	2016-03-13 23:48:22 +01:00
scrawl	426a6fdcc2	Don't create the save directory on loading a game ... This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.	2016-03-13 23:42:08 +01:00
scrawl	d7c7bb850b	ToggleAI cleanup	2016-03-12 20:32:42 +01:00
Marc Zinnschlag	d5067201d0	Merge branch 'move'	2016-03-12 13:27:00 +01:00
Marc Zinnschlag	900378a31e	changed 'not implemented' warning message for object movement	2016-03-12 13:26:33 +01:00
Marc Zinnschlag	d6b8033b46	handle cell transitions when moving objects	2016-03-12 13:19:51 +01:00
Marc Zinnschlag	5c587fe93e	Merge remote-tracking branch 'scrawl/cs_waterlevel'	2016-03-12 08:07:38 +01:00
scrawl	d840c7d5eb	Slightly tweak the spawn point heuristics ... Fixes an issue with hlaalu building exits	2016-03-11 22:48:28 +01:00
scrawl	97526284f5	Allow setting the water level of an interior cell with sky (Fixes #3244)	2016-03-11 22:10:59 +01:00
Marc Zinnschlag	fa9689c5e7	delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)	2016-03-11 14:04:47 +01:00
Marc Zinnschlag	6a2fe564ef	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
scrawl	85bd4f52f0	Improve occlusion query geometry rendering	2016-03-11 00:09:46 +01:00
scrawl	93ec289b1d	Improve setting of occlusion query state	2016-03-10 23:18:20 +01:00
scrawl	14e1911820	Fix memory leaks	2016-03-10 20:38:14 +01:00
scrawl	f898bf493f	Don't use Geodes	2016-03-10 13:17:01 +01:00
scrawl	137dde7cf8	Include cleanup	2016-03-10 12:59:17 +01:00
ae-g-i-s	c9791c5c1a	Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233)	2016-03-08 21:30:28 +01:00
ae-g-i-s	2f1c6c740c	Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)" ... This reverts commit 000597236e.	2016-03-08 20:41:39 +01:00
ae-g-i-s	9585a12fb1	Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check	2016-03-08 20:40:47 +01:00
Marc Zinnschlag	b2181fae20	safer handling of command macros	2016-03-08 10:48:44 +01:00
scrawl	3e6cf17665	Warn about cellrefs with an empty refId (Bug #3238)	2016-03-07 22:44:03 +01:00
scrawl	d0aba0d9ee	Catch exceptions thrown during reference loading (Bug #3238)	2016-03-07 21:28:50 +01:00
ae-g-i-s	000597236e	Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)	2016-03-06 18:29:32 +01:00
scrawl	0fc65db6bb	Remove parts before setting the new object root	2016-03-06 11:34:15 +01:00
scrawl	0df975a4d7	Properly detach nodes in CopyRigVisitor (Fixes #3234)	2016-03-06 11:33:07 +01:00
scrawl	60a12b3dee	Use MyGUI's castType function	2016-03-05 20:00:51 +01:00
scrawl	763f647412	Add ItemModel::allowedToInsertItems	2016-03-05 19:53:24 +01:00
scrawl	373c1e7602	Assign the PageDisplay on initialization	2016-03-05 19:48:01 +01:00
scrawl	5ea7446eeb	Change a dynamic_cast to static_cast	2016-03-05 19:41:45 +01:00
scrawl	c085e503c6	Pass the btCollisionObject as const	2016-03-05 16:09:56 +01:00
scrawl	004f0d37d5	Fix the projectile launch position for spells cast from objects (Fixes #3235)	2016-03-05 15:56:54 +01:00
scrawl	910e41e3c4	Allow an Object to be specified as ignore parameter for castRay	2016-03-05 15:56:19 +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
scrawl	76b47c6d5d	PlaceAt: don't correct spawn points for non-actors	2016-03-04 12:25:22 +01:00
scrawl	16dca126dd	PlaceAt: don't use actor's X/Y rotation	2016-03-04 12:22:13 +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