1450 commits

Author	SHA1	Message	Date
scrawl	dea9d21db6	Some additional safety checks for global map loading	2014-02-01 18:42:01 +01:00
Marc Zinnschlag	1b5301eec0	Merge branch 'savedgame' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwbase/soundmanager.hpp apps/openmw/mwgui/mapwindow.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwsound/soundmanagerimp.hpp components/esm/loadcell.cpp	2014-02-01 18:16:32 +01:00
scrawl	4ec86d1c68	Bug #1147: Fix the inventory preview pose used for ranged weapons	2014-01-31 05:06:35 +01:00
scrawl	60bbab52fe	Support keyframe controllers for bones that aren't in the skeleton base	2014-01-31 05:06:34 +01:00
mrcheko	e50e94af0b	remove CreatureStats::mAttackType, set/getAttackType()	2014-01-27 23:05:17 +02:00
scrawl	eba6c9a8fd	Fix massive console spam regarding the scrib's idle3 animation	2014-01-26 02:49:32 +01:00
scrawl	e0de76a6f7	Save/load global map	2014-01-25 19:06:14 +01:00
scrawl	f09328ca84	Clear global map overlay when starting/loading a game	2014-01-25 13:34:56 +01:00
scrawl	03cf383be7	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-24 18:28:35 +01:00
scrawl	295aed3533	Implement savegame screenshots	2014-01-24 17:49:16 +01:00
scrawl	786ed6ca5b	Include some required Ogre headers explicitely	2014-01-24 15:02:34 +01:00
scrawl	cf378ec31e	Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors	2014-01-22 15:25:03 +01:00
scrawl	16f5f5862d	Feature #956: Implement blocking melee attacks	2014-01-21 23:25:24 +01:00
Marc Zinnschlag	9ebe66e693	improved cleanup; failed loads will now drop back into the main menu instead of crashing	2014-01-21 14:50:58 +01:00
scrawl	205e8aa4e9	Feature #957: Implement area magic	2014-01-20 13:11:29 +01:00
scrawl	13646a651b	Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.	2014-01-19 13:32:58 +01:00
scrawl	198bb0de60	Issue #777: Add CreatureAnimation variant for creatures with weapons/shields	2014-01-19 13:05:26 +01:00
scrawl	589fbbd871	Issue #777: Create InventoryStore for creatures with weapons/shields	2014-01-19 11:43:23 +01:00
scrawl	9b32b1403b	Feature #960: Implement Creature::hit	2014-01-17 17:19:08 +01:00
scrawl	805843d7ff	Closes #1086: Implement blood effects	2014-01-17 11:27:13 +01:00
scrawl	240d96a0f1	Renamed AnimationValue to AnimationTime	2014-01-17 10:55:46 +01:00
scrawl	da3295d69c	Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations.	2014-01-15 14:53:29 +01:00
Marc Zinnschlag	1b03eec63e	Merge remote-tracking branch 'scrawl/master'	2014-01-11 11:43:12 +01:00
scrawl	15e48107f7	Use i1stPersonSneakDelta + some cleanup	2014-01-10 22:39:01 +01:00
Marc Zinnschlag	f62497dfdc	Merge remote-tracking branch 'mrcheko/master'	2014-01-10 19:08:35 +01:00
mrcheko	ffcb7fb280	fix for bug scrawl mentioned	2014-01-10 19:04:07 +02:00
mrcheko	d41f27451b	appropriate camera vanity<>preview mode switch + hit recoils fix	2014-01-09 23:36:40 +02:00
scrawl	aa855e9524	Include some required Ogre headers explicitely	2014-01-09 20:56:24 +01:00
Marc Zinnschlag	85707b5e3e	Merge remote-tracking branch 'scrawl/master'	2014-01-09 09:35:54 +01:00
scrawl	6f9113fe88	Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions	2014-01-09 01:49:58 +01:00
Marc Zinnschlag	a7be755db0	Merge remote-tracking branch 'mrcheko/master'	2014-01-08 20:13:31 +01:00
scrawl	098f9712f1	Add getPlayerPtr() utility method. Reduces dependencies a lot.	2014-01-08 18:39:44 +01:00
mrcheko	46519062d3	hit recoils/knockdowns feature	2014-01-08 16:05:14 +02:00
scrawl	728365b48d	Remove an unused hook	2014-01-07 21:07:02 +01:00
scrawl	03b6334ceb	Get rid of a hack	2014-01-07 20:43:08 +01:00
mrcheko	2591ff2d5a	bug repairing	2014-01-06 22:00:01 +02:00
scrawl	62774fcc4a	Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp	2014-01-06 00:23:17 +01:00
scrawl	c004fb778f	Get rid of underscore defines. They are reserved by the standard.	2014-01-05 18:22:29 +01:00
scrawl	634a53211c	Make sure materials are built before trying to determine their transparency	2014-01-04 22:56:06 +01:00
scrawl	c4e4a8fb57	Closes #1083: Fix werewolf change handling	2014-01-04 20:50:18 +01:00
mrcheko	7002412760	resolve conflict in character.cpp	2014-01-04 17:55:09 +02:00
Marc Zinnschlag	ee621245bb	Merge remote-tracking branch 'scrawl/master'	2014-01-03 15:59:06 +01:00
scrawl	623cdef69f	Code cleanup	2014-01-02 21:49:12 +01:00
Lukasz Gromanowski	b017a3be3e	Bug #1074: Inventory paperdoll obscures armour rating ... Changed size of inventory paperdoll. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-02 20:20:57 +01:00
scrawl	0990ca4b75	Closes #1072: Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly	2014-01-02 15:58:00 +01:00
Marc Zinnschlag	a6e6411686	Merge remote-tracking branch 'scrawl/master'	2014-01-02 12:12:52 +01:00
scrawl	c6421276bd	Closes #841: Correct activation distance in third person mode	2014-01-01 23:59:17 +01:00
scrawl	5729672262	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
mrcheko	09a0a69b04	more improvements	2014-01-01 21:40:31 +02:00
Marc Zinnschlag	e1355be47c	Merge remote-tracking branch 'lgro/valgrind_warnings'	2014-01-01 19:41:52 +01:00