136 Commits

Author	SHA1	Message	Date
Chris Robinson	3c02e1ccc9	Run physics right after updating the actors	2013-01-16 08:22:38 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
Tom Mason	5bfdb2449d	allowed dropObjectOnGround to be used on npcs, not just player	2013-01-09 18:53:14 +00:00
Marc Zinnschlag	649ae645f3	Merge remote-tracking branch 'blunted2night/bug_495_v2'	2013-01-09 12:12:41 +01:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Nathan Jeffords	b9fbd6ae4b	Factored faced object lookups into MWRender::World ... * Renamed MWWorld::World::getFacedHandle to getFacedObject. * Changed it to return an object pointer * Updated clients to use return object directly.	2013-01-07 23:38:08 -08:00
scrawl	f1b138d0a8	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-07 13:25:15 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
scrawl	64210e6efa	Revert "New Game button" ... This reverts commit c5dd0e1968.	2012-12-18 19:09:27 +01:00
scrawl	1c73a3f2fb	Revert "remove commandline switch for new game" ... This reverts commit 86671096ec.	2012-12-18 19:09:08 +01:00
Chris Robinson	7b2c3e6cd3	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00
Chris Robinson	2f8daec379	Allow pausing only certain types of sounds	2012-12-18 04:19:35 -08:00
Chris Robinson	a5356e194e	Allow specifying a type for the playTrack method	2012-12-18 01:35:20 -08:00
Chris Robinson	72ffceb206	Add type flags to the sound play mode	2012-12-18 00:57:57 -08:00
scrawl	86671096ec	remove commandline switch for new game	2012-12-16 16:14:49 +01:00
scrawl	c5dd0e1968	New Game button	2012-12-16 16:05:31 +01:00
scrawl	edf18a7d6e	change destruction order to fix crash on exit when a video is playing	2012-12-15 22:01:45 +01:00
Chris Robinson	779ced0889	Add a method to play an audio track with a custom decoder	2012-12-13 00:05:57 -08:00
Chris Robinson	2c1eceb9f0	Add methods to pause and stop all playing sounds (and music)	2012-12-12 02:33:12 -08:00
scrawl	faad64b254	Esc cancels the video	2012-12-12 01:13:53 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
scrawl	c8562d8442	toggleCollisionBoxes actually does something useful now	2012-11-20 02:20:54 +01:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	79706bf60f	Issue #219: dialogue manager cleanup	2012-11-10 14:31:58 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
greye	b5a59c3a07	minor doxygen comments update	2012-11-08 19:01:42 +04:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
Marc Zinnschlag	2e63ca5e0a	Merge branch 'death'	2012-10-27 11:33:26 +02:00
Marc Zinnschlag	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +02:00