2422 commits

Author	SHA1	Message	Date
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
greye	355ca649c2	camera flip control rewritten	2012-08-11 14:54:33 +04: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
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
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
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
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
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
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
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
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
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