3273 commits

Author	SHA1	Message	Date
Marc Zinnschlag	3f181f9a9d	Issue #370: Support for targets in containers	2012-09-04 15:21:56 +02:00
Marc Zinnschlag	cc55056adf	Issue #370: replaced custom target handling in apply action with base class implementation	2012-09-04 15:18:59 +02:00
Marc Zinnschlag	733654d730	Issue #370: implemented target handling in action base class	2012-09-04 15:14:33 +02:00
Marc Zinnschlag	1cecab6e3d	fixed RefData::getHandle	2012-09-04 15:08:59 +02:00
Marc Zinnschlag	ead04e1cc3	Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update	2012-09-04 13:32:35 +02:00
Marc Zinnschlag	345eec1135	Issue #389: added AI package base class and AI packages management class	2012-09-04 13:25:53 +02:00
Marc Zinnschlag	ef6f033dd1	Merge branch 'multidata'	2012-09-04 11:02:28 +02:00
Marc Zinnschlag	2284d76307	re-enabled local data directory support in launcher	2012-09-04 11:02:18 +02:00
Jason Hooks	2efceba1fc	Tearing apart PhysicActor	2012-09-03 20:32:20 -04:00
gugus	d261263824	oups forgot vmformat	2012-09-02 21:09:07 +02:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
gugus	95c27723f7	fixed a bug (see commit reverted)	2012-09-02 18:12:13 +02:00
gugus	99885e8ca4	Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" ... This reverts commit 165065d378.	2012-09-02 18:04:36 +02:00
gugus	fa9f2b268b	PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe	2012-09-02 17:57:03 +02:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
Jason Hooks	0697c7f7f4	Finally merged in master	2012-09-01 17:28:12 -04:00
Marc Zinnschlag	e2bf4694cb	Merge remote-tracking branch 'scrawl/master'	2012-08-31 09:22:32 +02:00
scrawl	760f05c454	the HUD can be toggled with F12 key; useful for screenshots	2012-08-30 20:47:39 +02:00
Marc Zinnschlag	bc34fab17f	Merge remote-tracking branch 'greye/aidata'	2012-08-30 09:55:01 +02:00
Michael Mc Donnell	3c3737ed78	Write error message for exception and fix warning ... Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.	2012-08-29 19:38:33 -04:00
greye	a90547bbbe	code formatting	2012-08-29 21:35:06 +04:00
Marc Zinnschlag	81463fa23d	Issue #372: fixed positions in SoundManager	2012-08-29 18:48:20 +02:00
scrawl	6ad08dfd33	added settings for crosshair & subtitles	2012-08-29 11:15:17 +02:00
Artem Kotsynyak	e9b2f4ee74	fix equipment visibility update	2012-08-28 22:59:44 +04:00
scrawl	1c5055c8ac	fix a problem where hovering a marker would render it on top of the fog of war instead of below	2012-08-28 18:49:44 +02:00
scrawl	7eaf5e7f0f	changed the markers to look more like morrowind's (hover effect)	2012-08-28 18:40:11 +02:00
scrawl	d9276ca09d	don't make copy of CellRefList in World::getNorthVector	2012-08-28 18:23:59 +02:00
scrawl	3c39c47e2f	don't make copies of CellRefList & LiveCellRef	2012-08-28 18:23:01 +02:00
scrawl	571d5095d4	removed a cout	2012-08-28 17:32:50 +02:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
Marc Zinnschlag	40d4dad15e	Issue #378: Fix (record wasn't build fully)	2012-08-28 09:32:38 +02:00
Marc Zinnschlag	160b52162b	Merge remote-tracking branch 'scrawl/quick_keys' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2012-08-28 09:06:40 +02:00
scrawl	321f7c3419	fix an infinite recursion regression on several dialogs.	2012-08-27 21:29:04 +02:00
scrawl	5c28a67203	broke something in the last commit.	2012-08-27 20:55:39 +02:00
scrawl	4f19b7fb9b	fix leaks.	2012-08-27 20:52:32 +02:00
scrawl	bc36b0e2bd	remove the restriction on the last quick key	2012-08-27 20:51:13 +02:00
scrawl	6161f81c24	last bits of the quick key menu.	2012-08-27 20:44:14 +02:00
Marc Zinnschlag	14b4263143	Merge remote-tracking branch 'scrawl/alttab'	2012-08-27 20:32:56 +02:00
scrawl	dc8f9bd923	workaround for alt tab view mode toggle	2012-08-27 19:25:30 +02:00
scrawl	9af0b48ad6	show/hide crosshair correctly	2012-08-27 19:18:55 +02:00
scrawl	a4c1d979d6	Merge branch 'master' into quick_keys	2012-08-27 18:14:41 +02:00
scrawl	c5e55d3cac	fix screenshot function	2012-08-27 15:51:01 +02:00
greye	61923349e5	resolving conflicts	2012-08-27 14:52:54 +04:00
scrawl	5ebcaeb098	Merge branch 'next' into quick_keys	2012-08-27 11:04:23 +02:00
scrawl	b1a394552d	mouse click sounds	2012-08-27 10:01:53 +02:00
Marc Zinnschlag	d0cebea580	some cleanup	2012-08-26 18:50:47 +02:00
Marc Zinnschlag	450656a890	Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next	2012-08-26 18:39:09 +02:00
Marc Zinnschlag	ef4910293b	Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next	2012-08-26 18:35:26 +02:00
Douglas Diniz	5cbb08fee1	Task 339 - Moving all sounds to actions	2012-08-26 11:47:45 -03:00
scrawl	c0f27bd5ef	magic selection window	2012-08-26 11:37:33 +02:00
scrawl	fab4cfecb1	some unfinished work on quick keys window	2012-08-26 10:52:06 +02:00
Marc Zinnschlag	1fd4d84173	Merge remote-tracking branch 'mmd/windowswarnings' into next	2012-08-24 15:07:19 +02:00
gugus	165065d378	fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p	2012-08-21 19:54:42 +02:00
Nikolay Kasyanov	71a6ce2202	removed cout spam	2012-08-20 21:14:29 +04:00
Nikolay Kasyanov	5395721c26	more appropriate fix for #189	2012-08-20 21:05:02 +04:00
Douglas Diniz	82e7c04c0a	Changing sounds to Action. ... Adding onActor to Action to choose between playSound and playSound3D.	2012-08-19 20:11:50 -03:00
Lukasz Gromanowski	770f747eec	Added fix for not visible pthreads functions for linker with glibc 2.15 ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-08-20 00:18:40 +03:00
scrawl	f7d537cb28	very small correction	2012-08-19 22:15:31 +02:00
scrawl	19ae30ee68	Merge branch 'master' into next ... Conflicts: apps/openmw/mwbase/inputmanager.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.hpp apps/openmw/mwinput/mouselookevent.cpp	2012-08-19 22:09:22 +02:00
Lukasz Gromanowski	34513cf16b	Added support for code coverage checking and unittests. ... Added support for code coverage checking with gcov and unittests with Google C++ unittest and GMock frameworks. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-08-19 22:23:46 +03:00
greye	e6c3e0744e	tvm update and fix	2012-08-19 10:37:51 +04:00
greye	5b2b378f25	tvm script instruction	2012-08-18 18:05:10 +04:00
Marc Zinnschlag	d1656b2f5d	Merge remote-tracking branch 'greye/player_control' ... Conflicts: apps/openmw/mwrender/player.cpp	2012-08-18 13:38:54 +02:00
gugus	cc01a5ceed	Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation	2012-08-18 10:51:12 +02:00
gugus	f2d080d091	bugfix	2012-08-18 10:50:58 +02:00
greye	b8e56d61d3	update camera code, add idle time	2012-08-18 01:31:57 +04:00
greye	3f3972eb3b	no vanity in gui mode (thanks scrawl)	2012-08-17 23:44:28 +04:00
greye	d2b451eb7d	entering vanity mode	2012-08-17 23:25:29 +04:00
greye	b6954a4e8d	use the same height on non-1st person modes	2012-08-17 22:08:16 +04:00
scrawl	8817a9634c	don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)	2012-08-17 16:55:21 +02:00
Marc Zinnschlag	1da56e2832	removed some unused variables	2012-08-17 15:37:14 +02:00
greye	14f293882c	still resolving	2012-08-17 16:42:42 +04:00
greye	83356d5505	resolving conflicts	2012-08-17 16:25:54 +04:00
greye	7303d595dd	resolving conflicts	2012-08-17 15:36:51 +04:00
greye	4f10138a04	using real player sight angles on ray cast	2012-08-17 15:20:57 +04:00
greye	0e6e141fd4	camera control related script instructions	2012-08-17 15:20:57 +04:00
greye	60fb1e8df6	fix sky in preview mode movement	2012-08-17 15:19:44 +04:00
greye	6961830efb	using real player eye direction when moving	2012-08-17 15:19:44 +04:00
greye	e8fc942bef	reverse Z-axis rotation to make doors happy	2012-08-17 15:19:44 +04:00
greye	a453a7f035	camera adjustment, fix view mode on start	2012-08-17 15:19:44 +04:00
scrawl	34f796c38e	removed the far clip distance hack which is not needed anymore	2012-08-17 15:19:44 +04:00
scrawl	b97b3d7b71	fix sky position when reflection is enabled, fix delay in sky reflection	2012-08-17 15:19:44 +04:00
greye	575244bd35	fix SkaManager issue	2012-08-17 15:19:44 +04:00
greye	783e81afc3	fix 1st/preview/1st change; 1st invisible model	2012-08-17 15:19:43 +04:00
greye	392e6efcb5	initial player rendering	2012-08-17 15:19:43 +04:00
greye	6f87c0c36d	preview mode, advanced vanity support	2012-08-17 15:19:43 +04:00
greye	fe1a9ac3c5	poor camera with some fixes	2012-08-17 15:19:43 +04:00
greye	db94018865	far better camera movement	2012-08-17 15:19:43 +04:00
greye	a7aeda9a3b	initial vanity mode support	2012-08-17 15:19:43 +04:00
greye	c46eeaa100	initial 3d-person camera support	2012-08-17 15:19:43 +04:00
Jason Hooks	63a40e9ba3	npc xy disabled	2012-08-16 15:41:42 -04:00
Marc Zinnschlag	e97d23e626	Issue #361: reset skill level in race selection stage	2012-08-16 15:42:37 +02:00
scrawl	132da92391	Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem	2012-08-16 13:20:53 +02:00
Marc Zinnschlag	b0506e2220	re-enabling support for multiple data directories	2012-08-16 12:59:28 +02:00
Jason Hooks	8762f4a47a	boxrotation nif field; commented functions	2012-08-15 16:47:26 -04:00
Jason Hooks	7b8b4c366d	Set angle now working for npcs and creatures	2012-08-14 20:29:48 -04:00
Jason Hooks	1f5bc229e0	Separate adjustRigidBody function	2012-08-14 18:04:58 -04:00
scrawl	f9efd543e4	use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1	2012-08-13 21:33:53 +02:00
Michael Mc Donnell	b373d0ec7b	Correct struct to class in forward declarations ... Fixes http://bugs.openmw.org/issues/362	2012-08-13 13:58:35 -04:00
scrawl	67577c6192	UI cursor & camera sensitivity sliders	2012-08-13 18:48:50 +02:00
scrawl	c7b8787c32	"reset to defaults" button, invert y axis button	2012-08-13 02:55:22 +02:00
scrawl	bc6e4feedc	hotkey window first version	2012-08-13 01:26:15 +02:00
scrawl	c4fe2e4e2a	Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem	2012-08-12 23:01:25 +02:00
scrawl	976ad7a301	key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw	2012-08-12 22:59:58 +02:00
scrawl	90f1d9c2f2	OSX suggestion by corristo	2012-08-12 21:25:13 +02:00
scrawl	97c45455fd	fix WindowManager destruction	2012-08-12 21:21:23 +02:00
scrawl	86d6f190bf	Input system rewrite	2012-08-12 20:45:02 +02:00
Marc Zinnschlag	c4bf6214db	Merge remote branch 'scrawl/master'	2012-08-12 18:11:36 +02:00
Marc Zinnschlag	88e70cb5bd	Merge branch 'decouple'	2012-08-12 18:11:17 +02:00
Marc Zinnschlag	6534c2a55a	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
scrawl	b6f427bf5e	fix OpenMW not exiting when the window is closed (alt f4 etc)	2012-08-12 17:20:46 +02:00
Marc Zinnschlag	35a64edf2a	Issue #107: removed a template from the window manager	2012-08-12 16:07:04 +02:00
Marc Zinnschlag	484cce12a8	Issue #107: removed redundant getStore function from window manager	2012-08-12 14:36:46 +02:00
Marc Zinnschlag	f37d3cd3c9	Issue #107: added a few todo comments	2012-08-12 14:09:55 +02:00
Marc Zinnschlag	4ca3cb81d4	Issue #107: some include clean up	2012-08-12 14:07:48 +02:00
Marc Zinnschlag	e0ba7cf952	Issue #107: Fixing up the window manager interface	2012-08-12 13:46:14 +02:00
Marc Zinnschlag	020fde70b8	Issue #107: moving function implementations from hpp to cpp file	2012-08-12 11:10:17 +02:00
Marc Zinnschlag	dbac3d2e5f	Issue #107: fixing WindowManager::removeDialog	2012-08-12 10:52:29 +02:00
Marc Zinnschlag	a3b27ae756	Issue #107: Moved ClassPoint from window manager to character creation	2012-08-12 10:50:03 +02:00
Jason Hooks	e7329d5f8b	Creatures now have a properly positioned box shape	2012-08-12 00:36:49 -04:00
gugus	fb91f76a2b	fixed a crash	2012-08-11 22:08:04 +02:00
gugus	0c8045d606	allow exterior cell for positioncell. Crash!	2012-08-11 19:16:00 +02:00
gugus	0bc48cc5ea	little fix (thanks greye!)	2012-08-11 18:07:20 +02:00
gugus	379fbccf8c	Merge branch 'move_rotate_fix' of https://github.com/greye/openmw.git into object_movement_creation	2012-08-11 17:53:40 +02:00
Marc Zinnschlag	0231533d05	Issue #107: InputManager is accessed only through the interface class from now on	2012-08-11 17:53:39 +02:00
Marc Zinnschlag	b68f9d6a28	Issue #107: MechanicsManager is accessed only through the interface class from now on	2012-08-11 17:30:55 +02:00
scrawl	dcf1e66456	fix main menu placement after resolution changes	2012-08-11 17:26:01 +02:00
greye	f7f8ac0a73	fix move/rotateObject code	2012-08-11 18:28:37 +04:00
scrawl	2ebf4721d1	small main menu fix	2012-08-11 15:15:09 +02:00
Marc Zinnschlag	380defa52f	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 15:08:17 +02:00
greye	47f7a5e988	fix double pos/rot adjustment	2012-08-11 17:01:55 +04:00
Marc Zinnschlag	bc16dc81b9	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 14:44:39 +02:00
gugus	eaf6a8df94	some correction	2012-08-11 14:06:58 +02:00
greye	355ca649c2	camera flip control rewritten	2012-08-11 14:54:33 +04:00
gugus	5d1c01a58e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-08-11 12:28:03 +02:00
Marc Zinnschlag	766e782aae	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 12:05:10 +02:00
Marc Zinnschlag	f3edea77b2	MSCV compatibility fix	2012-08-11 12:03:22 +02:00
Marc Zinnschlag	b53b27533a	fixes some include guards	2012-08-11 12:02:51 +02:00
Marc Zinnschlag	6eb9f15b6d	fixed time stamp operator	2012-08-11 11:38:26 +02:00
greye	45306e4bc3	fixed rotation adjustment	2012-08-11 13:23:54 +04:00
greye	5018db3332	removed some redundant code, added some comments	2012-08-11 12:13:16 +04:00
gugus	54221aab89	Merge branch 'cross_cell-borders' of https://github.com/greye/openmw.git into object_movement_creation	2012-08-11 09:53:06 +02:00
gugus	7fa1dc93d7	2nd try: position/ PositionCell	2012-08-11 09:52:49 +02:00
greye	0042020385	should fix 'north direction' bug ... not even compiled	2012-08-10 21:24:07 +04:00
greye	bed6545e45	still fix assertion fail	2012-08-10 21:06:09 +04:00
greye	56c9c4dbd9	remove some redundant code	2012-08-10 21:03:46 +04:00
scrawl	11fadf4a07	forgot something	2012-08-10 16:25:27 +02:00
scrawl	44ff31b50a	removed world exit methods	2012-08-10 16:21:53 +02:00
scrawl	f72956b918	- added a simple main menu (with Return, Options and Exit buttons) ... - removed OEngine::ExitListener (what a terrible abuse of framelisteners)	2012-08-10 15:15:48 +02:00
Jason Hooks	38c2c5d480	Creatures now use object physics	2012-08-09 18:09:11 -04:00
gugus	b664b174f0	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation ... Conflicts: apps/openmw/mwscript/transformationextensions.cpp	2012-08-09 23:50:44 +02:00
gugus	cb5b69104d	PositionCell	2012-08-09 23:45:06 +02:00
Jason Hooks	083e3537b4	post merge	2012-08-09 17:21:59 -04:00
greye	38b06aee6c	resolving conflicts	2012-08-09 21:49:00 +04:00
Marc Zinnschlag	aca08eb4c2	Merge branch 'decouple' into player_control ... Conflicts: apps/openmw/mwsound/soundmanagerimp.hpp	2012-08-09 16:12:10 +02:00
greye	b5bc7bc424	SoundManager dependency on camera pos/dir	2012-08-09 17:01:03 +04:00
Marc Zinnschlag	6bd48d12af	Issue #107: SoundManager is accessed only through the interface class from now on	2012-08-09 14:33:21 +02:00
Marc Zinnschlag	d00d40cc3f	Issue #107: Journal is accessed only through the interface class from now on	2012-08-09 12:56:03 +02:00
Marc Zinnschlag	a84145a087	Issue #107: minor corrections	2012-08-09 12:05:47 +02:00
greye	181d45661f	fix rotation angles	2012-08-09 13:43:52 +04:00
greye	6b996d8c34	fix disabled camera on start	2012-08-09 13:29:13 +04:00
greye	df60f4bf92	stub for soundmanager, adjust rotation mode	2012-08-09 13:27:32 +04:00
Marc Zinnschlag	923109b260	Issue #107: DialogueManager is accessed only through the interface class from now on	2012-08-09 10:35:53 +02:00
Marc Zinnschlag	e6ede480c7	Issue #107: fixed up some interfaces	2012-08-09 09:41:17 +02:00
greye	378fcc2460	fix DisablePlayerControl logic	2012-08-09 11:10:18 +04:00
greye	1511eb3549	implemented enable/disable player looking switch	2012-08-09 10:55:49 +04:00
greye	a2d87d5f5b	added camera flip control, fixed input rotation axis	2012-08-09 10:24:18 +04:00
greye	ec9cf4d3c6	rotateObject() added, input system rewritten	2012-08-09 00:15:52 +04:00
Marc Zinnschlag	28ecfb4290	Issue #107: ScriptManager is accessed only through the interface class from now on	2012-08-08 15:18:55 +02:00
Marc Zinnschlag	9b567e4ba6	Issue #107: Removed a redundant function in world interface; added a comment	2012-08-08 14:54:35 +02:00
greye	b6f7f21bcf	fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added	2012-08-08 14:51:33 +04:00
greye	79b7487c87	fix using deleted objects	2012-08-07 22:21:46 +04:00
greye	d32a61b928	fix object moving	2012-08-06 18:20:48 +04:00
greye	ee97a204f2	fix npc animation key update	2012-08-06 15:26:37 +04:00
gugus	8a485e213b	first try of the Position script instruction. Still missing: check if overlapp with an object.	2012-08-05 16:44:56 +02:00
gugus	d850a3ee49	some correction	2012-08-05 16:21:53 +02:00
Marc Zinnschlag	f5ee5a5414	Merge remote branch 'edmondo/master'	2012-08-05 00:03:16 +02:00
Marc Zinnschlag	1db7978361	silenced a warning	2012-08-04 22:03:14 +02:00
Marc Zinnschlag	0c5f886683	Merge remote branch 'greye/player_control'	2012-08-04 21:55:13 +02:00
Jason Hooks	cacf0bd10d	Basic collision with npcs	2012-08-04 15:43:33 -04:00
greye	16ad97610d	add support for some scripting player control switches	2012-08-04 11:54:42 +04:00
Marc Zinnschlag	994e33e3d2	fixed object rotation code	2012-08-04 09:34:49 +02:00
Marc Zinnschlag	e4dc01832b	fixing object rotation script instructions (wrong argument type and missing error handling)	2012-08-04 09:18:20 +02:00
Edmondo Tommasina	11d0761528	terrainmaterial.cpp: fix std::runtime_error compile error	2012-08-03 22:42:28 +02:00
gugus	b2ce1dfd1a	getStartingPos	2012-08-03 18:20:51 +02:00
gugus	7d6ad6ad94	setPos and getPos Script instructions. Cell-crossing is not tested yet.	2012-08-03 18:14:05 +02:00
greye	ff62770657	World::isUnderwater(), World::isSwimming()	2012-08-03 14:42:09 +04:00
Marc Zinnschlag	c251fbdf23	Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt libs/openengine/ogre/renderer.cpp	2012-08-02 14:57:35 +02:00
gugus	e9aac4512b	Build fix for Windows ... Fixes a number of places where uint was used and not defined. This commit was originally authored by gus. It rebased by Michael Mc Donnell to take recent commit fixes into account.	2012-08-01 11:47:36 -04:00
gugus	ebd8b064f6	getStartingAngle script instruction	2012-08-01 12:21:42 +02:00
Marc Zinnschlag	f6d657a5f4	Merge branch 'osx_fix'	2012-08-01 09:09:29 +02:00
scrawl	15a16aeba1	Fixed DirectX HLSL shaders and re-enabled them in the gui	2012-08-01 04:11:16 +02:00
greye	f2a2e5f57d	remove MWWorld::Player::setPos()	2012-07-31 19:30:24 +04:00
greye	0e3f70413e	a very little comments	2012-07-31 16:52:21 +04:00
greye	288b63350c	fixed objects update, local script handling	2012-07-31 11:46:57 +04:00
Nikolay Kasyanov	defab0e4b5	Merge remote-tracking branch 'upstream/master' into osx_fix ... Conflicts: CMakeLists.txt	2012-07-31 01:06:18 +04:00
Nikolay Kasyanov	b05dfeae70	bug #348: cleanup ... moved files to appropriate component, moved function to namespace, added docs	2012-07-31 01:01:00 +04:00
greye	37990b5133	fix player update	2012-07-30 23:54:26 +04:00
greye	d6150b7482	high-level implementation, unstable	2012-07-30 23:28:14 +04:00
gugus	d37d0b1947	build fix for windows	2012-07-30 19:45:40 +02:00
Marc Zinnschlag	db10baafe1	Merge branch 'scriptconsole'	2012-07-30 12:43:48 +02:00
Marc Zinnschlag	2ccecd839b	improved the help text for --script-run; updated readme.txt	2012-07-30 12:43:23 +02:00
Marc Zinnschlag	fd6c155118	Issue #352: added --script-run switch	2012-07-30 12:37:46 +02:00
Marc Zinnschlag	23f8595b87	Issue #352: refactored script execution in console	2012-07-30 11:57:19 +02:00
Marc Zinnschlag	90de02b901	Issue #350: console only script instructions	2012-07-30 11:43:28 +02:00
Nikolay Kasyanov	0cdb651c5e	removed excess invocation	2012-07-28 02:05:06 +04:00
Nikolay Kasyanov	fbe9a94568	bug #348: fixed OS X deployment ... just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search plugins inside application bundle instead of Ogre prefix	2012-07-28 01:55:37 +04:00
Marc Zinnschlag	0da3f2cb59	Issue #314: Playing drink sound when using a potion	2012-07-27 12:27:22 +02:00
Marc Zinnschlag	8b08928dae	Issue #351: Added sound playing to Action	2012-07-27 12:19:25 +02:00
Marc Zinnschlag	78fe6fdce5	Issue #351: Refactoring Action class	2012-07-27 12:00:10 +02:00
scrawl	7cf2fc4009	Merge branch 'master' into shadersystem	2012-07-26 23:11:16 +02:00
scrawl	6077965d27	fix the directx startup issue on windows	2012-07-26 23:09:46 +02:00
Marc Zinnschlag	7725190f89	removed some redundant code	2012-07-26 19:09:45 +02:00
greye	aa5f63ffcc	disabled items placing handling	2012-07-26 19:06:48 +04:00
greye	26595f22f6	float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()	2012-07-26 16:14:11 +04:00
greye	b734460dc9	Merge branch 'master' of https://github.com/zinnschlag/openmw	2012-07-26 16:02:58 +04:00
scrawl	06bd2cd919	Merge branch 'master' into shadersystem	2012-07-25 23:54:22 +02:00
greye	cd04911f3c	dropping on the ground	2012-07-25 20:31:39 +04:00
greye	49b1d5e127	fix object placing	2012-07-25 20:31:39 +04:00
greye	e7666d3a7f	move responsibility for cell changing from CellStore::insertObject to Class::moveToCell	2012-07-25 20:31:39 +04:00
greye	bcc47cd5fb	local scripts, move placing to World::placeObject(Ptr, CellStore, Position)	2012-07-25 20:31:39 +04:00
greye	d5fe378a66	Revert "local script registration" ... This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.	2012-07-25 20:31:39 +04:00
greye	aff05b9d36	local script registration	2012-07-25 20:31:39 +04:00
greye	e1c7d1f529	fixed item sinking	2012-07-25 20:31:39 +04:00
greye	6a3a728a56	Class::getModel implementation	2012-07-25 20:31:39 +04:00
greye	87050e48c8	physics getObjectHeight(), MWWorld::Class::getModel() definition	2012-07-25 20:31:39 +04:00
greye	71253c64ab	moving part 2, adding position parameter, stable	2012-07-25 20:31:39 +04:00
greye	61cb012ee7	moving Scene::insertObject to CellStore::insertObject, part 1	2012-07-25 20:31:39 +04:00
Chris Robinson	9f0c1eeb7b	Support playgroup mode 0	2012-07-24 14:54:12 -07:00
Chris Robinson	13ab2baef0	Use a struct to hold the current animation times and remaining loop count	2012-07-24 14:42:01 -07:00
Chris Robinson	fd1e3f6ec5	Add support for playgroup mode 2	2012-07-24 14:14:32 -07:00
Chris Robinson	20121f3b0a	Remove some unused stuff	2012-07-24 13:56:28 -07:00
Chris Robinson	9a7a629d0f	Add support for playing animation groups	2012-07-24 13:51:48 -07:00
Nikolay Kasyanov	94ce95c679	bug #348: works again on OS X	2012-07-25 00:13:33 +04:00
Chris Robinson	f953d7f8c0	Store text keys from base NIF animations	2012-07-23 17:27:35 -07:00
Chris Robinson	36be1536d9	Return text keys from NIFs when creating entities	2012-07-23 17:20:47 -07:00
scrawl	8c8228a15c	fix terrain num lights setting	2012-07-24 00:08:53 +02:00
Chris Robinson	44975854e5	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-07-23 13:46:05 -07:00
Chris Robinson	f67983bbee	Don't assume one sub-entity for the night sky entities	2012-07-23 13:37:05 -07:00
Marc Zinnschlag	2d080ce4ef	compile fix	2012-07-23 21:47:53 +02:00
Marc Zinnschlag	483a6d8605	Merge remote branch 'scrawl/shadersystem'	2012-07-23 21:46:06 +02:00
scrawl	02a52c0ff1	fixed some more settings bugs	2012-07-23 21:39:22 +02:00
scrawl	3ebc6fd590	fixed a settings window bug	2012-07-23 20:50:56 +02:00
scrawl	a70f93b024	fix "Crash when running openmw with --start="XYZ", remove HLSL for windows	2012-07-23 20:12:42 +02:00
scrawl	ab35bfa32c	fixed a sky issue	2012-07-23 18:19:34 +02:00
scrawl	cfa0519721	Merge branch 'master' into nif-cleanup	2012-07-23 15:37:08 +02:00
scrawl	1fef086088	Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" ... This reverts commit 546b640022, reversing changes made to fcaa8aae06.	2012-07-23 15:36:12 +02:00
scrawl	f8d6a36196	Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp	2012-07-23 15:35:31 +02:00
Marc Zinnschlag	a24e7c9de2	Merge remote branch 'scrawl/shadersystem'	2012-07-23 15:25:11 +02:00
scrawl	2eca27bba9	fix horizon color of the sky reflection	2012-07-23 14:21:40 +02:00
Marc Zinnschlag	2c5d3d8df9	Merge remote branch 'scrawl/shadersystem' into shadersystem ... Attention: We have submodules again. Don't forget to update! Conflicts: components/files/configurationmanager.cpp	2012-07-23 14:12:21 +02:00
scrawl	1dbfd60305	Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup	2012-07-23 13:48:12 +02:00
scrawl	afe7c41729	removed some unused code	2012-07-23 13:47:51 +02:00
greye	32b1350b63	CreatureStats class	2012-07-22 18:29:54 +04:00
Chris Robinson	77446a0d58	Fix skipAnim, only skip one animation update	2012-07-21 17:39:57 -07:00
Chris Robinson	e81fc42daa	Remove the beast-race special cases from updateParts ... The special handling should happen at a much lower level, and prevent the objects from being equipped in the first place.	2012-07-21 17:12:41 -07:00
Chris Robinson	c5b9098517	Remove an unused field from EntityList	2012-07-21 17:09:16 -07:00
scrawl	546b640022	Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup	2012-07-21 23:50:56 +02:00
Chris Robinson	81ce8dbe12	Combine animation handling into the base class	2012-07-21 14:41:26 -07:00
Chris Robinson	fcaa8aae06	Don't skip animation state updates for NPCs	2012-07-21 11:26:09 -07:00
scrawl	e7ab3544ac	removed some redundant code	2012-07-21 13:52:12 +02:00
scrawl	acc5c3bbbf	some fixes	2012-07-20 17:08:15 +02:00
scrawl	014396e80c	remove the plugins.cfg files, do not enforce CG plugin	2012-07-20 16:44:03 +02:00
scrawl	21728020f6	fixed the water on local map	2012-07-20 14:45:42 +02:00
Chris Robinson	2db80a1504	Rename a couple methods to match their scripting counterparts	2012-07-20 00:53:12 -07:00
Chris Robinson	66860825cf	Remove some unused and unneeded bits from the Animation class	2012-07-20 00:36:52 -07:00
Chris Robinson	8b5b74f9ee	Add a quick hack to let "playgroup all" work on creatures and NPCs	2012-07-19 22:34:26 -07:00
scrawl	f5ffea4d4b	new button, water timescale	2012-07-19 23:30:41 +02:00
scrawl	e077814a8c	water	2012-07-19 22:23:07 +02:00
Chris Robinson	a86ed46ec4	Use the race ID specified in the ref base's record instead of the race record ... The latter is localized and doesn't match with international versions.	2012-07-19 11:00:26 -07:00
scrawl	739455e6f8	new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc	2012-07-19 16:23:30 +02:00
Chris Robinson	6caa39629d	Reimplement the skirt part	2012-07-18 22:32:26 -07:00
Chris Robinson	b505d4ace0	Fix feet and entity part detachment	2012-07-18 21:39:50 -07:00
Chris Robinson	4af1bce659	Restore and fix some missing parts	2012-07-18 20:14:23 -07:00
Chris Robinson	d9b64b77ec	Attach skinned parts to the scene node instead of the named bone	2012-07-18 18:38:55 -07:00
Chris Robinson	db948969c9	Attach NPC parts to the proper bone	2012-07-18 11:14:13 -07:00
Chris Robinson	04e496a6ca	Store the entity lists for NPC parts	2012-07-18 10:26:25 -07:00
Chris Robinson	6611b0b317	Use an array instead of a bunch of nearly-identical if blocks	2012-07-18 10:09:16 -07:00
Chris Robinson	02d39080c8	Destroy entities when they're done with.	2012-07-18 00:17:39 -07:00
Chris Robinson	4109d0d923	Destroy entities removed from the NPC	2012-07-17 22:47:56 -07:00
Chris Robinson	92546ca18d	Move the last bits of code to createEntities	2012-07-17 20:23:09 -07:00
Chris Robinson	94f3e7a6c0	Store the entity list in the object	2012-07-17 16:00:03 -07:00
Chris Robinson	a590db2cf4	Create entities when loading NIFs for the NPC base	2012-07-17 15:43:40 -07:00
Chris Robinson	3efd2030e2	Create entities when loading NIFs for creatures	2012-07-17 14:11:07 -07:00
Chris Robinson	3dedac5cb1	Create mesh entities for objects when loading the NIF	2012-07-17 13:40:03 -07:00
Chris Robinson	c6cc82a51a	Handle multiple entities per NPC part	2012-07-17 12:20:52 -07:00
Chris Robinson	89cfe778f0	Support multiple entities for the NPC base	2012-07-17 11:38:50 -07:00
Chris Robinson	0a4a141f2e	Support multiple meshes for creatures	2012-07-17 11:23:34 -07:00
Chris Robinson	6047dc6a0c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp	2012-07-17 10:57:15 -07:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Marc Zinnschlag	483b125aad	avoid locking up in case actor updates repeatedly throw exceptions	2012-07-17 18:37:20 +02:00
Marc Zinnschlag	6744375636	fixed a logic error in the auto equip code	2012-07-17 18:35:01 +02:00
Marc Zinnschlag	beb18282bb	Issue #342: various fixes	2012-07-17 16:44:55 +02:00
Marc Zinnschlag	76de2f7360	Issue #342: handle magic effects 79-82 and 17-20	2012-07-17 15:49:37 +02:00
Marc Zinnschlag	a3652f16ce	Issue #342: factored out dynamic stats calculation into a separate function	2012-07-17 12:18:43 +02:00
Marc Zinnschlag	2c70a93553	Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp	2012-07-17 10:32:18 +02:00
Marc Zinnschlag	0d3a7d482e	Merge remote branch 'modred11/master'	2012-07-17 10:21:46 +02:00
Marc Zinnschlag	4bfed952bc	Merge remote branch 'guidoj/master'	2012-07-17 10:17:06 +02:00
Marc Zinnschlag	e9b95d55cd	Revert "Proper way to find and use libtbb" ... This reverts commit d6bf2b7d29.	2012-07-17 09:49:52 +02:00
guidoj	a021165d9f	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
Dmitry Marakasov	d6bf2b7d29	Proper way to find and use libtbb	2012-07-17 00:11:56 +04:00
Dmitry Marakasov	0e934a52ca	Include soundmanager.hpp for Play_Normal enum	2012-07-16 23:54:24 +04:00
Dmitry Marakasov	1c53add6c4	Include boost/shared_ptr.hpp for boost:shared_ptr	2012-07-16 23:54:21 +04:00
Chris Robinson	a539e98274	Handle all meshes when inserting objects into the scene	2012-07-16 10:48:48 -07:00
scrawl	509e9d7034	Merge branch 'master' into shadersystem	2012-07-15 21:58:45 +02:00
Chris Robinson	b4c8375f3c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: components/bsa/bsa_archive.cpp	2012-07-15 12:04:43 -07:00
Marc Zinnschlag	da916cecfb	fixed a bug in a cmake script that resulted in some files being compiled twice	2012-07-15 19:29:09 +02:00
scrawl	778e59ee37	terrain as it was before, with about 4x less code	2012-07-15 08:21:43 +02:00
scrawl	29f91753f7	correction	2012-07-14 18:44:03 +02:00
scrawl	93c641efa7	terrain albedo	2012-07-14 18:25:43 +02:00
scrawl	7d5b94709d	Merge branch 'master' into shadersystem ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2012-07-14 11:16:35 +02:00
scrawl	16c2ea3a75	terrain colourmap	2012-07-14 11:13:38 +02:00
Chris Robinson	939d0d2fc5	Return a list of meshes and the skeleton from NIFLoader::load	2012-07-13 20:01:15 -07:00
Marc Zinnschlag	573d7e7e45	Issue #314: fix to potion use function (was mixing up potion with potion user)	2012-07-13 15:51:57 +02:00
Marc Zinnschlag	782d417d5b	Issue #314: potion usage	2012-07-13 13:09:22 +02:00
Marc Zinnschlag	182017b8e9	Issue #314: Moved ingredients and potions to a different type of record list	2012-07-13 13:08:48 +02:00
Carl Maxwell	e4d046f69c	Prepending m to the name of every member variable. ... I made a bunch of changes in apps/openmw/mwrender/animation.cpp because the scope brackets didn't line up in a bunch of places npcanimations.cpp & creatureanimations.cpp were the same kind of thing	2012-07-13 03:51:58 -07:00
scrawl	d2fbb11475	temp commit	2012-07-13 11:26:36 +02:00
Marc Zinnschlag	29b4a5e5f7	Issue #314: added apply actions	2012-07-13 09:41:38 +02:00
Marc Zinnschlag	84d846cf07	Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc	2012-07-13 09:16:27 +02:00
scrawl	7731e9a6fa	finished cleaning up sky	2012-07-13 09:13:12 +02:00
Marc Zinnschlag	805b81bf6e	Issue #314: added skillUsageSucceeded function to Class	2012-07-13 09:03:17 +02:00
Marc Zinnschlag	7a2d613043	Issue #314: extended Class::apply function to cover the actor	2012-07-13 08:50:46 +02:00
scrawl	b8384162b6	merge	2012-07-13 06:16:55 +02:00
Chris Robinson	ecdd4ee23f	Load NiMorphData and NiKeyframeData using proper key lists	2012-07-12 20:56:47 -07:00
Chris Robinson	386ac56bda	Remove the NIF loader and code to manually transform the vertices ... This currently breaks just about everything. They should come back as it's all reimplemented, though.	2012-07-12 20:12:18 -07:00
scrawl	ad7383be43	sky	2012-07-11 09:08:55 +02:00
scrawl	e0a99f104b	settings tab "shadows"	2012-07-11 04:28:45 +02:00
scrawl	485adc8bdc	shader mode button in settingswindow	2012-07-11 03:19:51 +02:00
scrawl	865bfc6f47	sync mrt_output setting	2012-07-11 02:31:03 +02:00
Marc Zinnschlag	ec9ebe6b58	Merge branch 'skillgain' into potions ... Conflicts: apps/openmw/mwmechanics/activespells.cpp	2012-07-10 14:08:30 +02:00
Marc Zinnschlag	f11bf49a90	cmake fix; silenced some warnings	2012-07-10 13:23:41 +02:00
gugus	164a5c8fe4	rotation now also work with the physic representation	2012-07-10 12:10:50 +02:00
gugus	70c74ede05	changed rotation order	2012-07-10 11:53:12 +02:00
gugus	410b693555	setAngle improvement	2012-07-10 11:15:46 +02:00
scrawl	3537af051d	removed the old shader helper	2012-07-10 00:17:52 +02:00
scrawl	5d1e6b6bf6	remove cg profile check	2012-07-10 00:09:47 +02:00
scrawl	1a9f59d5d4	shadows	2012-07-10 00:07:33 +02:00
Marc Zinnschlag	0d8150f4bd	Issue #324: added useSkill function to NpcStats (adjust skill level according to use)	2012-07-09 21:15:52 +02:00
Marc Zinnschlag	a207c86fd1	Issue #324: added some range checks	2012-07-09 21:14:11 +02:00
Marc Zinnschlag	67c1c5ce18	Issue #324: adjusted setSkill script instructions according to the recent research	2012-07-09 20:42:45 +02:00
Marc Zinnschlag	25a5657d80	Issue #324: Modified the interface for modified stats	2012-07-09 20:34:12 +02:00
scrawl	07fd9986ef	accidently removed the map.	2012-07-09 20:14:07 +02:00
scrawl	b803d0e949	converted shadow caster shader	2012-07-09 19:46:36 +02:00
gugus	557e114992	clean-up + getScale/Angle script instructions	2012-07-09 19:28:44 +02:00
scrawl	81d30ff63a	temp commit	2012-07-09 19:20:41 +02:00
gugus	0a67f60a6e	Clean-up	2012-07-09 18:47:59 +02:00
gugus	e6716c25c3	little correction.	2012-07-09 15:41:19 +02:00
gugus	feec67094f	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwworld/physicssystem.cpp	2012-07-09 15:23:26 +02:00
gugus	03f7740474	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp	2012-07-09 10:39:57 +02:00
Jason Hooks	b5edad790d	merge	2012-07-07 15:27:04 -04:00
Marc Zinnschlag	fe86ce5a2c	DrawState workaround	2012-07-07 20:53:19 +02:00
Marc Zinnschlag	6277e39216	Merge branch 'master' into skillgain	2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson	113457d934	Fixed some windows issues and got rid of a few tiny warnings while at it.	2012-07-07 01:14:18 +02:00
Marc Zinnschlag	0f41cc499d	Issue #324: Added skill gain calculation function	2012-07-06 21:07:04 +02:00
Marc Zinnschlag	10723a149b	Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC	2012-07-06 18:25:16 +02:00
Marc Zinnschlag	d30ba14a17	Issue #324: Finished turning NpcStats into a proper class	2012-07-06 18:23:48 +02:00
Marc Zinnschlag	771863e73b	Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue	2012-07-06 15:50:26 +02:00
scrawl	a095572205	fixed some textures, started with sky	2012-07-06 10:31:48 +02:00
scrawl	33c48b9481	update	2012-07-06 04:28:08 +02:00
scrawl	1a5203749f	fix "error in framelistener" when trying to pick up lights that can't be picked up	2012-07-05 17:13:23 +02:00
scrawl	4ea6530772	hello world.	2012-07-04 00:26:57 +02:00
scrawl	a1e48b0feb	builds now	2012-07-03 22:48:16 +02:00
scrawl	78efc31641	different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change	2012-07-03 16:51:29 +02:00
scrawl	085891879c	fixed another resolution change bug introduced recently	2012-07-03 16:44:20 +02:00
Marc Zinnschlag	205ed0ce5b	post merge fix	2012-07-03 15:53:42 +02:00
Marc Zinnschlag	cc7c6aa0ad	Merge branch 'decouple'	2012-07-03 15:47:57 +02:00
Marc Zinnschlag	c85aaafac2	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
Marc Zinnschlag	87667ab57e	Issue #107: Ptr related include cleanup	2012-07-03 13:55:53 +02:00
Marc Zinnschlag	5a7b95bf7a	Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp	2012-07-03 13:15:20 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
scrawl	d27863bf8e	rename layout files to .layout to get them recognized by layout editor	2012-07-03 11:34:20 +02:00
Marc Zinnschlag	035c1c4b6e	added World interface class; cleanup of World interface	2012-07-03 01:06:38 +02:00
Marc Zinnschlag	efb95e2f83	Issue #317: check if spell actually exist in AddSpell	2012-07-02 14:25:46 +02:00
Pieter van der Kloet	2db6e4f4cf	Second try: added aspect ratios to the resolution combobox	2012-06-29 19:13:12 +02:00
Marc Zinnschlag	7fcd41c69d	Issue #107: Detemplateised CellStore; some include cleanup	2012-06-29 18:54:23 +02:00
Marc Zinnschlag	76174098c7	Issue #107: CellStore moved from ESMS to MWWorld	2012-06-29 16:48:50 +02:00
Marc Zinnschlag	fc063472d0	Revert "Added aspect ratio info to the list of resolutions" ... This reverts commit be5e047106.	2012-06-29 14:41:19 +02:00
Chris Robinson	897622a511	Merge remote branch 'zini/master' into sound	2012-06-28 15:01:41 -07:00
Marc Zinnschlag	e5cdc988a6	Merge remote branch 'pvdk/launcher'	2012-06-28 10:14:03 +02:00
Pieter van der Kloet	dded604eca	Improved launcher images made by serpentine	2012-06-28 05:16:26 +02:00
Pieter van der Kloet	be5e047106	Added aspect ratio info to the list of resolutions	2012-06-28 02:06:42 +02:00
Marc Zinnschlag	70ac1c818d	Merge remote branch 'scrawl/settingswindow'	2012-06-27 09:02:29 +02:00
scrawl	b73b39f3c6	launcher bugfix, settings was not written when "Play" was selected	2012-06-27 00:55:25 +02:00
Chris Robinson	2f8056dfab	Merge remote branch 'zini/master' into sound	2012-06-26 14:59:01 -07:00
scrawl	232fe0be8c	fix for the directx crash	2012-06-26 18:03:52 +02:00
scrawl	c37b14f5f7	Merge pull request #5 from pvdk/master ... Sorting of graphics values	2012-06-26 06:47:39 -07:00
scrawl	30e86e1b9d	settings window resolution sorting, aspect ratio	2012-06-26 15:41:13 +02:00
Pieter van der Kloet	e5159a1950	Modified sorting of the values in the Graphics Page	2012-06-26 15:37:40 +02:00
Pieter van der Kloet	77ac8760d1	Cleaned up the GUI of the Graphics page	2012-06-26 03:07:54 +02:00
Pieter van der Kloet	6fe471c1c6	Resolutions are now sorted descendingly and removed some debug stuff	2012-06-26 02:41:54 +02:00
Marc Zinnschlag	83c3972a89	Issue #314: added return value to addSpell function	2012-06-24 16:23:43 +02:00
Marc Zinnschlag	aa827442e8	Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too	2012-06-24 11:39:21 +02:00
scrawl	797c2c538d	fix some settings bugs	2012-06-23 12:25:28 +02:00
Marc Zinnschlag	2b68e4d489	Merge remote branch 'scrawl/trianglebatchcount'	2012-06-22 14:30:00 +02:00
scrawl	63ce143a04	fix triangle / batch counts with compositors	2012-06-22 12:56:04 +02:00
scrawl	98f13ebcc0	Merge branch 'misc' of github.com:scrawl/openmw into misc	2012-06-21 12:15:43 +02:00
Marc Zinnschlag	ad251065f4	removed more cout spam	2012-06-21 12:00:56 +02:00
Marc Zinnschlag	89ac0fa232	Issue #312: Implemented ID-search caching to speed up some badly written scripts	2012-06-21 11:43:18 +02:00
Pieter van der Kloet	6a2bcddef5	Changed the way the launcher exits and polished the error handling code	2012-06-20 23:25:22 +02:00
Jason Hooks	5c51674070	update	2012-06-20 13:14:27 -04:00
Marc Zinnschlag	1b368506d4	Merge remote branch 'pvdk/filedialog'	2012-06-20 16:05:20 +02:00
Pieter van der Kloet	d162445e68	Got rid of some unwanted warnings and did some cleanup on the launcher	2012-06-20 13:35:05 +02:00
Marc Zinnschlag	95d9c99d0d	Merge remote branch 'pvdk/filedialog'	2012-06-20 09:28:43 +02:00
Pieter van der Kloet	e21442f6cc	Fix for Bug #306: launcher now creates the config dir and returns proper error codes	2012-06-20 02:28:49 +02:00
Jason Hooks	86d8a07fc7	Switching back to old scaling	2012-06-19 13:28:06 -04:00
Marc Zinnschlag	1f0efa9f7d	Merge remote branch 'scrawl/guifixes'	2012-06-19 19:06:18 +02:00
scrawl	15e959868c	make some of the gui mode changes a bit safer	2012-06-19 17:07:00 +02:00
Marc Zinnschlag	590dfe8d63	fixed the container fill problem on cell load	2012-06-19 16:42:10 +02:00
Marc Zinnschlag	511d0c0e1c	Merge remote branch 'scrawl/rendererselection'	2012-06-19 16:04:48 +02:00
scrawl	61ec56debc	don't add duplicate resolutions	2012-06-19 16:02:28 +02:00
scrawl	c9e76d3e90	remove extra tokens at the end of the resolution string, if present	2012-06-19 15:57:58 +02:00
scrawl	ff278ab4ec	chargen generate class: fix result not being shown in review dialog	2012-06-19 15:25:04 +02:00
scrawl	0aa01b93e2	don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter)	2012-06-19 15:24:52 +02:00
Marc Zinnschlag	9a6f012578	Merge branch 'script'	2012-06-19 11:07:47 +02:00
Jason Hooks	4d55ecfdbe	Deleting scaled shapes; scaleObject()	2012-06-18 13:03:00 -04:00
Marc Zinnschlag	09057daac5	Merge remote branch 'scrawl/containerunlocking'	2012-06-18 09:57:22 +02:00
Jason Hooks	33fe80723c	btScaledBvhTriangleMeshShapes	2012-06-17 20:56:10 -04:00
scrawl	de3daf3dc1	allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind	2012-06-18 00:21:55 +02:00
Marc Zinnschlag	4a726f272b	Merge remote branch 'pvdk/filedialog'	2012-06-17 09:58:39 +02:00
Marc Zinnschlag	badb20e5df	Merge remote branch 'scrawl/rendererselection'	2012-06-17 09:54:18 +02:00
Pieter van der Kloet	f81e127701	Created custom directory dialog which only accepts Data Files dirs	2012-06-17 06:48:32 +02:00
scrawl	b831c3313d	render system was not written on launcher exit	2012-06-17 00:47:45 +02:00
Marc Zinnschlag	3c42a71dae	removed some cout spam	2012-06-16 16:42:35 +02:00
Marc Zinnschlag	e2a77037eb	fixed a type in a script instruction	2012-06-16 16:38:54 +02:00
Marc Zinnschlag	8283f5f135	added setHello/Fight/Flee/Alarm instructions	2012-06-16 16:31:32 +02:00
Marc Zinnschlag	ea29b74bb4	added per NPC/creature basic AI-settings (hello, fight, flee, alarm)	2012-06-16 16:17:42 +02:00
Marc Zinnschlag	7454713a9b	addet provisional implementation of AiWander (doesn't do anything yet)	2012-06-16 16:06:15 +02:00
Marc Zinnschlag	b16157a618	documentation fix	2012-06-16 15:49:39 +02:00
Marc Zinnschlag	3167ae9473	added force/clearforce instructions for run and sneak	2012-06-16 15:49:03 +02:00
Marc Zinnschlag	0795730a19	Merge branch 'xdoty' into script	2012-06-16 14:57:13 +02:00
Marc Zinnschlag	10b27e582b	Issue #181: various fixed to member variable access	2012-06-16 13:51:13 +02:00
Marc Zinnschlag	6c5b21fa42	Issue #181: Member variable access in expressions; error reporting fix for the previous commit	2012-06-16 13:06:23 +02:00
Marc Zinnschlag	6a89d76321	Issue #181: Improved script error reporting for local and global scripts	2012-06-16 11:52:35 +02:00
gugus	5397b9dba6	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling	2012-06-16 11:38:07 +02:00
gugus	974585d357	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-06-15 14:53:58 +02:00
gugus	01fefca0a3	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-06-15 14:53:19 +02:00
scrawl	584ae30213	don't show diseases and curses in the spell list	2012-06-15 10:09:46 +02:00
Marc Zinnschlag	0f71439991	Merge remote branch 'garvek/master'	2012-06-15 08:22:56 +02:00
Jason Hooks	897a331244	NPC activation	2012-06-13 12:21:51 -04:00
Jason Hooks	20288de685	Post merge	2012-06-11 15:39:57 -04:00
Jason Hooks	b14c132a31	Merging in the latest master	2012-06-11 13:25:06 -04:00
Alexander "Ace" Olofsson	f675d8d039	Merge branch 'master'	2012-06-11 19:09:10 +02:00
Jason Hooks	595b0729da	Few things changed	2012-06-10 21:08:58 -04:00
Pieter van der Kloet	0bcec32c70	Changed launcher logo to the new one done by Necrod	2012-06-11 02:50:29 +02:00
Mark Siewert	bef4bef5d2	- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. ... - Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first. - Support deleting parent entries from the list.	2012-06-10 11:14:46 +02:00
Jason Hooks	fb0a52809d	Changing transformation processing	2012-06-09 15:19:15 -04:00
scrawl	447158e9d6	shutdown crash fix	2012-06-09 19:15:11 +02:00
Sylvain THESNIERES	fc3a3fc173	MSVC build compliance: ... - static const float member is not ISO - callback do not match DLL signature	2012-06-08 19:55:39 +02:00
Marc Zinnschlag	eb0be10e80	Merge branch 'script' into xdoty	2012-06-07 13:00:01 +02:00
Marc Zinnschlag	ff84fbbfa7	Added DontSaveObject script instruction ... We are ignoring it for now and unless users protest we will probably keep it that way.	2012-06-07 12:36:51 +02:00
Marc Zinnschlag	72fca40090	Issue #181: member variable access in interpreter context	2012-06-07 11:59:45 +02:00
scrawl	42e44ac1b5	fixed some leaks	2012-06-06 21:08:20 +02:00
scrawl	c85c794c86	fixed some cppcheck issues	2012-06-06 20:29:30 +02:00
scrawl	dfac5f26c3	fixed some issues: ... - probes were not showing up in inventory category "misc" - lights, probes, lockpicks were not equippable - weapons could not be picked up	2012-06-04 21:48:20 +02:00
scrawl	ea8e3ca1c8	fix item duplication bug when picking up object with the mouse and immediately dropping again	2012-06-04 21:09:51 +02:00
scrawl	1ecc6f97ed	alchemy effect fix	2012-06-04 20:56:13 +02:00
scrawl	d56defd4f4	set input focus to console after selecting objects in console mode	2012-06-03 21:19:48 +02:00
scrawl	8e96871acd	remove something unused	2012-06-03 18:40:10 +02:00
gugus	0012d7eb58	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-06-03 12:53:23 +02:00
scrawl	b8464d4ce5	allow picking up objects from the gameworld with the mouse in inventory mode	2012-06-02 14:19:02 +02:00
scrawl	b886aea298	change console skin to MW_Window and set the selected object refID as window title	2012-06-02 12:31:23 +02:00
scrawl	0ba0b2122e	set the implicit object for script excution by clicking on it	2012-06-02 12:25:24 +02:00
scrawl	36d26e0681	set the camera orientation after using teleport doors	2012-05-30 15:52:39 +02:00
Marc Zinnschlag	2bbbff2b75	Merge remote branch 'scrawl/spellwindow'	2012-05-30 10:22:56 +02:00
scrawl	2c90654401	fix a typo that caused a crash when trying to disable an already disabled object	2012-05-30 09:21:41 +02:00
scrawl	72bb7a2d2c	fix a typo	2012-05-30 08:04:07 +02:00
Jason Hooks	fb4e7f02b9	code correction	2012-05-29 22:03:00 -04:00
scrawl	c5a685d11f	addition to last commit: show the selected weapon/spell names as inventory/spell window caption	2012-05-29 18:59:11 +02:00
scrawl	298ae4f7f8	HUD icons for selected weapon / selected spell / selected enchanted item	2012-05-29 18:33:01 +02:00
gugus	a711a3ebe1	Various fixes	2012-05-29 16:45:43 +02:00
gugus	f83ffecae5	SetAngle and SetScale script instruction	2012-05-29 15:57:13 +02:00
scrawl	8b7baa808e	fixed the hud icon positioning issues	2012-05-29 15:36:48 +02:00
scrawl	48ba293e88	added the success formula, and spell deleting (shift+click)	2012-05-29 15:13:44 +02:00
scrawl	30461438f6	still left: spell success formula	2012-05-29 12:35:03 +02:00
scrawl	5412d6ed9e	fixed a typo that prevented spells from getting added	2012-05-29 10:47:48 +02:00
gugus	d8051095d6	rotation are updated in the physis system	2012-05-29 10:36:12 +02:00
gugus	26d6c9453c	more work on rotation	2012-05-29 10:15:29 +02:00
scrawl	c7268233df	spell window layout & opening/closing/pinning logic	2012-05-29 09:02:22 +02:00
scrawl	1b561ce91f	Merge branch 'master' into next	2012-05-29 06:56:23 +02:00
scrawl	69e6bc6588	add water settings to settings window	2012-05-29 06:45:44 +02:00
scrawl	5d03e86613	added field of view and texture filtering to settings window	2012-05-29 04:54:54 +02:00
scrawl	6945afe95b	alchemy window layout	2012-05-29 02:57:19 +02:00
scrawl	8c7cb6909d	addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors	2012-05-29 01:59:16 +02:00
scrawl	f75266e4ba	fixed race dialog bug	2012-05-29 01:47:49 +02:00
gugus	77084b27c0	some work for rotation/scaling	2012-05-28 16:01:35 +02:00
scrawl	0a17d6d710	more resolution switching fixes	2012-05-28 12:34:29 +02:00
Marc Zinnschlag	76b23ae864	Merge remote branch 'scrawl/buildplayerfix'	2012-05-28 11:44:43 +02:00
scrawl	a54623bcd2	reset attributes when building player	2012-05-28 11:37:56 +02:00
scrawl	e1ee45a6d6	Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue	2012-05-28 10:50:00 +02:00
scrawl	6014a90002	added tooltip delay option	2012-05-28 09:46:05 +02:00
scrawl	14f4f09f83	proper resolution switching (reposition GUI & adjust mouse clipping region)	2012-05-28 09:19:25 +02:00
scrawl	3daf1ebc3f	small map tweak	2012-05-28 05:03:50 +02:00
scrawl	19c428e86c	delete fix	2012-05-28 02:04:00 +02:00
scrawl	8f667580bb	ogre 1.8 final release compability fixes	2012-05-27 23:12:45 +02:00
scrawl	f6a6684685	when the resolution changes, adjust camera aspect ratio and recreate compositors	2012-05-27 21:39:18 +02:00
scrawl	10cfe0f5bc	Issue #295: Class creation dialogs tooltips; plus tons of other improvements	2012-05-27 06:39:10 +02:00
scrawl	f1d3978897	Issue #290: Auto-Close MW-reference related GUI windows	2012-05-27 01:14:33 +02:00
scrawl	a7e6a142f9	blend fog of war into adjacent cells	2012-05-27 00:39:33 +02:00
scrawl	63213b36bf	Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind	2012-05-26 23:06:15 +02:00
scrawl	313a8e55b7	- Issue #296: Clicking on HUD elements shows/hides the respective window ... - Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore	2012-05-26 21:09:21 +02:00
scrawl	3cba884f59	Issue #294: show/hide HUD elements based on allowed windows	2012-05-26 05:46:46 +02:00
scrawl	738e107b52	Merge branch 'master' into next	2012-05-26 05:31:32 +02:00
scrawl	c7010623fb	Issue #294: disallowed inventory prevents Talk, Open and Take actions	2012-05-25 18:45:17 +02:00
gugus	51b6d5cae0	Scale *should* work. (no script instruction yet)	2012-05-25 18:23:06 +02:00
Marc Zinnschlag	173820d29b	Merge branch 'enable'	2012-05-25 18:19:12 +02:00
scrawl	750259973e	potion creating works, most of the values are bogus	2012-05-25 18:00:13 +02:00
Marc Zinnschlag	6fe53aa320	Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before	2012-05-25 17:55:00 +02:00
Marc Zinnschlag	0131c53005	Issue #176: removed enable/disable functions from MWWorld::Class	2012-05-25 17:28:27 +02:00
Marc Zinnschlag	36885b2e40	Issue #176: removed enable/disable functions from Creature, Npc and Light	2012-05-25 17:04:33 +02:00
scrawl	63b3b82657	don't allow more than 4 potion effects	2012-05-25 16:23:49 +02:00
scrawl	1df1b521a4	show the list of potion effects	2012-05-25 16:20:57 +02:00
scrawl	6eb15f7680	auto-select the alchemy tools with highest quality	2012-05-25 15:24:33 +02:00
scrawl	3ba24aee0d	Merge branch 'alchemy' into next	2012-05-25 13:37:40 +02:00
scrawl	9b623a79ff	Merge branch 'master' into alchemy	2012-05-25 13:14:27 +02:00
scrawl	09c870ad68	first alchemy window layout (not pretty)	2012-05-25 12:58:28 +02:00
scrawl	51b8a76a68	merged by branches together, starting with alchemy window ... Merge branch 'guimode_stacking' into next Conflicts: apps/openmw/mwgui/mode.hpp	2012-05-24 15:57:23 +02:00
scrawl	c2b818373e	adjust tooltip skin, now is never transparent	2012-05-24 15:11:45 +02:00
scrawl	a3a22e9096	ingredient tooltip shows possible effects	2012-05-24 14:47:57 +02:00
Chris Robinson	05fd8f0211	Update the actual sounds and music volume when settings change	2012-05-24 05:30:22 -07:00
Marc Zinnschlag	684208dfc9	Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager	2012-05-24 13:26:07 +02:00
Marc Zinnschlag	c0ee382c72	Issue #176: made actor deregistration more robust	2012-05-24 13:21:52 +02:00
scrawl	57d834b14b	fixed an issue with interactive messagebox	2012-05-24 12:05:43 +02:00
scrawl	6ea7bdb224	vsync & fps buttons, sound volume apply fix	2012-05-24 11:50:48 +02:00
scrawl	cbe89f7e32	copy&paste mistake	2012-05-24 08:56:45 +02:00
scrawl	189b044392	small correction	2012-05-24 04:37:41 +02:00
scrawl	9b94edd561	audio tab with volume sliders	2012-05-24 04:34:53 +02:00
scrawl	cb35f4d208	some unrelated gui cleanup	2012-05-24 03:50:02 +02:00
scrawl	a1907e7b88	cleaning up mwgui/widgets part 1	2012-05-24 03:48:02 +02:00
scrawl	7ebbc099b3	allow stacking gui modes	2012-05-23 12:23:35 +02:00
scrawl	689cf7ce05	ConfirmationDialog	2012-05-23 05:28:25 +02:00
Jason Hooks	0066ef9b54	Some cleanup	2012-05-22 21:40:24 -04:00
scrawl	656a8f1be9	working menu transparency slider	2012-05-23 01:32:36 +02:00
scrawl	313294c522	settings window (hotkey F2) which does nothing. Yay!	2012-05-22 21:40:42 +02:00
scrawl	b25d62a7e2	rename antialiasing mode "MSAA 0" to "none" to avoid confusion.	2012-05-22 20:52:38 +02:00
scrawl	ad46049ee0	got the launcher working with the new settings system.	2012-05-22 20:37:18 +02:00
scrawl	355268dae1	make the launcher build and run again, but it doesn't change settings	2012-05-22 19:36:50 +02:00
scrawl	343bbaf0fd	integrated video settings in the settings file, the launcher is now useless	2012-05-22 03:36:03 +02:00
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
Marc Zinnschlag	76d733d2b3	Merge remote branch 'scrawl/inventoryGUI'	2012-05-21 11:17:11 +02:00
gugus	dac98b2213	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-05-21 11:02:10 +02:00
scrawl	bda90b77bc	oops, forgot something	2012-05-21 10:59:06 +02:00
gugus	ca9224ed7f	starting scale function	2012-05-21 10:58:04 +02:00
scrawl	157dd81524	removed script instruction, will be in the settings window later	2012-05-21 10:57:49 +02:00
scrawl	5f6e8224f4	skill progress	2012-05-21 10:48:25 +02:00
Marc Zinnschlag	3e85151c9d	Merge remote branch 'scrawl/inventoryGUI' ... Conflicts: apps/openmw/CMakeLists.txt	2012-05-21 10:13:27 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	40c52c5d09	max faction rank crashfix	2012-05-21 05:19:20 +02:00