5959 commits

Author	SHA1	Message	Date
Marc Zinnschlag	356b53bd22	Merge remote-tracking branch 'scrawl/master'	2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy	7023395012	Windows-specific definition to omit inclusion of unused stuff from Windows.h	2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy	18d4cdb2ac	Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator	2014-01-04 07:46:29 +02:00
scrawl	16838595a3	Another console fix: discard text markup when getting the command line's text	2014-01-04 05:24:32 +01:00
scrawl	1b96c5d266	Console improvements: Show scrollbar, allow copying text from the history	2014-01-04 05:13:53 +01:00
scrawl	710a1e2f37	Smash case for manual reference IDs as well, consistent with references in data files	2014-01-04 04:39:06 +01:00
scrawl	557652112f	Show the target HP bar also when casting a heal effect (same as MCP)	2014-01-04 04:21:44 +01:00
scrawl	12691040d1	Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.	2014-01-04 02:49:10 +01:00
scrawl	09d491d1ba	Move a piece of functionality to its appropriate place	2014-01-04 01:13:19 +01:00
scrawl	be2ebc5cac	Closes #1081: Implement disease contraction	2014-01-03 23:33:14 +01:00
scrawl	2a7d610f87	Implement GetSpellReadied instruction	2014-01-03 22:55:17 +01:00
scrawl	c0fbcf413f	Use the playermagic and playerfighting control switches	2014-01-03 22:44:35 +01:00
scrawl	e9bd43e2da	Use GMSTs for bound items/creatures	2014-01-03 20:54:14 +01:00
scrawl	617a65cdd2	Print message to dialogue window after successful trade	2014-01-03 17:40:14 +01:00
scrawl	b22dd40b41	Implement Paralyze magic effect	2014-01-03 17:06:05 +01:00
Marc Zinnschlag	ee621245bb	Merge remote-tracking branch 'scrawl/master'	2014-01-03 15:59:06 +01:00
scrawl	55c5d7cee4	Implement Resurrect instruction	2014-01-03 15:54:23 +01:00
scrawl	b4230f716e	Implement RemoveEffects instruction	2014-01-03 05:19:10 +01:00
scrawl	7d8ca91286	Implement RemoveSpellEffects instruction	2014-01-03 05:18:44 +01:00
scrawl	366801f3d5	Implement explodeSpell instruction (like Cast, with caster = target)	2014-01-03 04:44:50 +01:00
scrawl	93e1a2df73	Implement Cast script instruction (shrines work now)	2014-01-03 04:09:52 +01:00
scrawl	b42240be6d	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
scrawl	32ff3b530c	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
scrawl	623cdef69f	Code cleanup	2014-01-02 21:49:12 +01:00
scrawl	eba60858dd	Closes #1078: Show stat bar text even when 0	2014-01-02 21:48:33 +01:00
scrawl	299690631f	Implement SoulTrap magic effect	2014-01-02 21:21:28 +01:00
mrcheko	79e972bdb6	resolved accompanying minor problems	2014-01-02 21:54:41 +02: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	596e0c8a49	Correct Dispel effect (use magnitude as chance)	2014-01-02 20:15:07 +01:00
scrawl	94d2ec8e4e	Add missing spells update	2014-01-02 20:02:28 +01:00
scrawl	12de351feb	Check if levitation is enabled before levitating	2014-01-02 16:38:23 +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
scrawl	e6c0e187bc	Closes #1073: Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.	2014-01-02 15:44:58 +01:00
Marc Zinnschlag	a6e6411686	Merge remote-tracking branch 'scrawl/master'	2014-01-02 12:12:52 +01:00
scrawl	c558e12212	Don't try to move objects that are not in a cell	2014-01-02 03:06:48 +01:00
scrawl	993edf0384	Bug #1063: Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.	2014-01-02 02:27:48 +01:00
scrawl	0f2b2fabdb	Implement water walking	2014-01-02 02:03:44 +01:00
scrawl	783c501d70	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
scrawl	590c8cb4a0	Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.	2014-01-02 01:03:44 +01:00
scrawl	899214a906	Use fVanityDelay	2014-01-02 00:13:23 +01:00
scrawl	c6421276bd	Closes #841: Correct activation distance in third person mode	2014-01-01 23:59:17 +01:00
scrawl	24aa743573	Add function for converting feet to game units	2014-01-01 23:34:18 +01:00
scrawl	f6387d5979	Implement Telekinesis magic effect. Remove some duplicate code.	2014-01-01 23:30:58 +01:00
scrawl	531bef6193	Shorter Vector3 initialisation	2014-01-01 22:46:10 +01:00
scrawl	5729672262	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
mrcheko	16e10cc702	error fix	2014-01-01 22:46:29 +02:00
scrawl	bfc9fcf2cd	Add starting spells when building player (F_PCStart flag)	2014-01-01 21:34:00 +01:00
mrcheko	09a0a69b04	more improvements	2014-01-01 21:40:31 +02:00
Marc Zinnschlag	1f4c192bf6	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'	2014-01-01 19:47:11 +01:00
Marc Zinnschlag	e1355be47c	Merge remote-tracking branch 'lgro/valgrind_warnings'	2014-01-01 19:41:52 +01:00
scrawl	eab7ffd6b4	Remove redundant finding of default exterior position height	2014-01-01 18:05:28 +01:00
scrawl	8e5cae1081	Implement mark/recall magic effects	2014-01-01 17:06:21 +01:00
Lukasz Gromanowski	2d4e06cd50	Updated comments about freeing format_ctx->pb->buffer. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 17:05:49 +01:00
Lukasz Gromanowski	722469d57b	Correction to the e9844e1 commit. ... Restored interrior check in WeatherManager::update(). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 16:45:39 +01:00
scrawl	69ba8a40bf	Fix weird formatting added during the merge	2014-01-01 16:13:20 +01:00
scrawl	b3cd10dbea	Remove redundant setTeleported calls	2014-01-01 15:18:25 +01:00
Marc Zinnschlag	c3482b6f24	Merge remote-tracking branch 'scrawl/master' ... Conflicts: apps/openmw/mwmechanics/spellcasting.cpp	2014-01-01 15:05:42 +01:00
Marc Zinnschlag	5fa9aa5d1e	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' ... Conflicts: apps/openmw/mwworld/weather.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-01 14:57:14 +01:00
scrawl	ea3b88951a	Implement divine/almsivi intervention magic effects	2014-01-01 02:22:11 +01:00
scrawl	c86760e3cd	Remember the last known exterior position of the player in case we fail to map the interior to a world position.	2014-01-01 01:10:55 +01:00
Lukasz Gromanowski	101813fd0d	Fixes #417: Apply weather instantly when teleporting ... Correction to previous commit - WeatherManager->update() will always be called. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 21:18:10 +01:00
Lukasz Gromanowski	e9844e1b37	Fixes #417: Apply weather instantly when teleporting ... Changed teleporting detection from "position tracking" to manually setting "teleportation" flag ( player->setTeleported(true) ). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 20:40:23 +01:00
scrawl	b02b966c44	Closes #994: Don't cap skills to 100 when set via console (except for modX variants)	2013-12-31 19:11:16 +01:00
Marc Zinnschlag	c34b586b65	Merge remote-tracking branch 'ace/fix'	2013-12-31 18:37:12 +01:00
scrawl	3604b9d171	Closes #566: In interior cells, update global map position marker using the first exterior teleport door	2013-12-31 18:35:46 +01:00
scrawl	be1938ee90	Closes #805: Don't add entities that are supposed to be invisible to static geometry	2013-12-31 18:32:46 +01:00
Lukasz Gromanowski	1ce4663065	Updated compiler opcodes for COE, and setHello. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 18:13:38 +01:00
mrcheko	a8fb1ae51c	improved, added knockdown after falling	2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson	8381cad5a4	Don't try to set a cursor before one exists	2013-12-31 14:13:42 +01:00
mrcheko	d6345bce91	added npc hit reactions	2013-12-31 13:24:20 +02:00
scrawl	94cdc1efd2	Enable mipmap generator for 1.9+	2013-12-31 00:54:40 +01:00
Lukasz Gromanowski	cb04f43384	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 23:08:53 +01:00
Lukasz Gromanowski	6107d5bad2	Updated ffmpeg decoder fix ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 22:16:06 +01:00
Lukasz Gromanowski	5c5f87445b	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 21:47:06 +01:00
scrawl	b8ac37347c	Code cleanup for Class::canBeEquipped	2013-12-30 19:04:35 +01:00
scrawl	79a440e94a	Many additions to 900bc06d2c: ... - Fix indentation - Consider any kind of light, not just torch_infinite_time - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon) - Remove redundant code and don't add additional lights to the inventory - World::isDark returns false for interiors which are unaffected by weather	2013-12-30 17:57:41 +01:00
Scott Howard	2f082ef796	remove unneeded libraries	2013-12-29 16:25:49 -05:00
Lukasz Gromanowski	c65f018760	Fixes #417: Apply weather instantly when teleporting ... Corrected constant name. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 15:09:49 +01:00
Marc Zinnschlag	6de39a7329	Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-12-29 15:00:31 +01:00
Lukasz Gromanowski	faf8011c48	Fixes #417: Apply weather instantly when teleporting ... Removed changing speed of weather transition introduced in previous commit. Instead try to detect player "teleporting" (ie. coc), and then switch instantly to the next weather type. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 12:47:44 +01:00
scrawl	04f9f7af56	Closes #990: Add option to unlock mouse cursor when in any menu	2013-12-29 00:58:48 +01:00
scrawl	17ff8165d2	Closes #1065: Don't apply fall damage when landing in water	2013-12-29 00:36:36 +01:00
scrawl	2a8ab932ef	Bug #951: Only recalculate derived stats when attributes change	2013-12-28 17:19:35 +01:00
Lukasz Gromanowski	100edda8c0	Fixes #417: Apply weather instantly when teleporting ... Change speed of weather transition from blight to other (twice fast as normal) and from other to blight (four times faster than normal). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-28 16:15:34 +01:00
scrawl	596c9b80a9	Check if threads are joinable before joining (issue with boost 1.52)	2013-12-27 22:38:30 +01:00
scrawl	85ec80100c	Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat	2013-12-27 22:00:16 +01:00
scrawl	7265b427fe	Bug #1013: Rewrote fall height detection	2013-12-27 21:21:18 +01:00
scrawl	02277db685	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
scrawl	686d9efac3	Bug #1060: Fix incorrect spell type checks	2013-12-27 18:58:35 +01:00
scrawl	27092a4494	flagAsModified should be private	2013-12-27 18:58:35 +01:00
scrawl	6400f23ab0	Use the material controller manager for effects with overridden texture	2013-12-27 14:54:36 +01:00
scrawl	d262d9e6b0	Bug #1054: Set render queue group for effects	2013-12-27 14:51:59 +01:00
scrawl	1c60a781a5	Add header to CMakeLists	2013-12-27 14:42:22 +01:00
scrawl	561c661156	Reset starting angle / position when adding world item to a container	2013-12-27 01:57:08 +01:00
scrawl	608bd0f525	Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028	2013-12-27 01:34:56 +01:00
scrawl	30b1da996b	Issue #1029 - Quick keys menu: Select compatible replacement when tool used up	2013-12-27 00:51:29 +01:00
scrawl	5a287a7e01	Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.	2013-12-27 00:41:19 +01:00
scrawl	d09a86e208	Issue #1018: Don't allow view mode switching while performing an action	2013-12-27 00:36:06 +01:00
scrawl	a3017e16d4	Don't allow changing the spell that is being cast mid-animation	2013-12-26 22:32:39 +01:00
scrawl	5054d8e6c1	Bug #1055: Check power use and mana before starting cast animation	2013-12-26 22:06:13 +01:00
scrawl	71d9755ef1	Bug #991: Don't autoequip items with harmful permanent enchantments	2013-12-26 21:26:59 +01:00
scrawl	5931fdcbde	Implement NiBillboardNode. Flags not handled yet.	2013-12-26 20:53:52 +01:00
scrawl	fb845e81a4	Rename nosound to no-sound for consistency	2013-12-26 20:53:52 +01:00
scrawl	85ed21dbd2	Remove unused command line option	2013-12-26 20:53:51 +01:00
scrawl	33389b9b63	XDG compliant paths	2013-12-26 20:53:51 +01:00
scrawl	a9e1e89bbc	Bug #1007: Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible	2013-12-26 20:53:51 +01:00
scrawl	31c1f484ed	Slight performance improvement for WindowManager::updateVisible	2013-12-26 20:53:51 +01:00
scrawl	b6bad969a0	Fix an issue with items that have no UI icon	2013-12-26 20:53:51 +01:00
scrawl	81ec8c2f55	Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense	2013-12-26 20:53:51 +01:00
scrawl	6d27ebabb6	Integrate AddGlow with material controllers	2013-12-26 20:53:45 +01:00
Lukasz Gromanowski	900bc06d2c	Fixes #845: NPCs hold torches during the day ... Moved 'equipping torches at night and unequipping at day' code from Character to Actors class. Removed unneeded showLights method (introduced in previous commits) from animation/npcanimation classes. Since this commit autoEquip() method doesn't automatically equip lights. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 22:38:23 +01:00
Marc Zinnschlag	18e7e83585	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-20 13:13:06 +01:00
mrcheko	8eb2696f6c	using gmst string	2013-12-20 14:04:59 +02:00
Lukasz Gromanowski	abc126e2af	Fixes #845: NPCs hold torches during the day ... Added check for Player character so it won't be affected by showing, or hidding torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 01:01:30 +01:00
Lukasz Gromanowski	6eb674e4e5	Fixes #845: NPCs hold torches during the day ... Added equipping/unequipping torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 00:18:34 +01:00
Lukasz Gromanowski	92072d968b	Fixes #845: NPCs hold torches during the day ... Simplified a bit code which shows and hides light. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-19 21:11:07 +01:00
mrcheko	3816a09c6f	bug 428 ask to load recent saved game	2013-12-19 22:08:34 +02:00
scrawl	9afdf71af3	Fix crash with player->position command	2013-12-19 00:37:57 +01:00
scrawl	a0d38dfb63	Fix highlighted topics being selectable when in a choice	2013-12-19 00:26:08 +01:00
scrawl	876fb9a899	Addition to bb4bd999ba : adjust position for objects placed from inventory	2013-12-19 00:11:14 +01:00
Marc Zinnschlag	c22e38f825	removing 255 content file limitation	2013-12-17 21:19:05 +01:00
Marc Zinnschlag	09fadd446b	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-17 19:33:32 +01:00
mrcheko	a854eb73db	StateRunning check returns	2013-12-16 21:02:21 +02:00
scrawl	eb5e4ecec2	Remove more unused code	2013-12-16 15:35:38 +01:00
mrcheko	f50ff0b1c4	reworked http://bugs.openmw.org/issues/428	2013-12-16 15:40:47 +02:00
scrawl	19e5978a01	Merge branch 'master' of https://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/main.cpp	2013-12-16 13:35:31 +01:00
scrawl	56893a097d	Don't stack used torches	2013-12-16 13:31:03 +01:00
scrawl	cd756a8a39	Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.	2013-12-16 13:22:27 +01:00
Marc Zinnschlag	1cf1d49bc4	fix to content file reading error reporting in case of missing dependency	2013-12-16 11:39:24 +01:00
mrcheko	fd9f8c34f6	bug fix http://bugs.openmw.org/issues/428	2013-12-15 18:50:25 +02:00
Marc Zinnschlag	3590fa40bd	store global script state in saved game files	2013-12-15 16:16:50 +01:00
Marc Zinnschlag	0890fa66b0	Merge remote-tracking branch 'mrcheko/master'	2013-12-13 18:47:11 +01:00
mrcheko	8b3a393a6b	bug fix at http://bugs.openmw.org/issues/985	2013-12-13 19:33:01 +02:00
mrcheko	c8bf69b91a	Revert "bug fix http://bugs.openmw.org/issues/985" ... This reverts commit 7a9b64c6f4.	2013-12-13 19:02:25 +02:00
scrawl	39eea24dc3	Don't try to show exceptions in a message box if SDL was not initialized	2013-12-13 03:50:01 +01:00
mrcheko	7a9b64c6f4	bug fix http://bugs.openmw.org/issues/985	2013-12-12 16:09:38 +02:00
Marc Zinnschlag	2a35c7d33a	fixed running global scripts a second time after they have been stopped	2013-12-12 13:16:32 +01:00
Marc Zinnschlag	74793c1c2f	globals script cleanup; fixed potential case folding bug	2013-12-12 13:15:38 +01:00
Marc Zinnschlag	fc37c77a91	store global variables in saved game files	2013-12-12 12:19:25 +01:00
Lukasz Gromanowski	91a4d9a2eb	Fixes #845: NPCs hold torches during the day ... Added method in WeatherManger and World which returns true if it is night. This method is used later in character controller to show torches (or other sources of light) at night and hide them at day. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-10 23:48:49 +01:00
Marc Zinnschlag	b38bfe1f21	removed a redundant function for listing global variables	2013-12-10 15:22:38 +01:00
Marc Zinnschlag	51bfa5cde3	rewrote global variable storage (using ESM variant type now)	2013-12-10 15:09:58 +01:00
Marc Zinnschlag	1fdd43bbb7	removed a redundant new	2013-12-10 12:31:18 +01:00
Emanuel Guevel	357ecd92b2	Do not display negative stat values ... Display zero instead of negative values. Also remove useless for loops and some unused attributes.	2013-12-10 00:41:36 +01:00
Emanuel Guevel	fc8bd1aacb	Allow fatigue stat to become negative when fatigue damages are taken	2013-12-09 21:53:04 +01:00
Marc Zinnschlag	77a2179d1e	Merge remote-tracking branch 'scrawl/master'	2013-12-09 18:39:34 +01:00
scrawl	0bc3a13c0f	Break invisibility on Use or Activate	2013-12-08 23:36:37 +01:00
scrawl	5fd2df5546	Ignore invisible targets for combat AI	2013-12-08 23:21:23 +01:00
scrawl	37a7ee8fcd	Set alpha value of character animations according to Invisibility / Chameleon effects.	2013-12-08 23:05:21 +01:00
Lukasz Gromanowski	594cc693b2	Fixes #1006: Many NPCs have 0 skill ... Added calculation of skill values for NPC with mNpdtType set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-08 21:47:43 +01:00
Lukasz Gromanowski	8d63f8eea2	Fixes #998: Setting the max health should also set the current health ... Added setting current value of dynamic stat in OpSetDynamic class. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 21:00:46 +01:00
scrawl	1624e0fd8a	Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.	2013-12-07 20:15:39 +01:00
Marc Zinnschlag	ef8c0fab73	Merge remote-tracking branch 'scrawl/master'	2013-12-07 16:26:52 +01:00
scrawl	742e0e014d	Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.	2013-12-07 14:15:51 +01:00
scrawl	bb70deabb1	Add an incomplete implementation of SayAnimationValue (lip animation)	2013-12-07 14:15:45 +01:00
Marc Zinnschlag	1c13a9037a	save and load dynamic records	2013-12-07 13:17:28 +01:00
Marc Zinnschlag	030c733e2d	Merge branch 'master' into savedgame ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg	2013-12-07 12:27:06 +01:00
Lukasz Gromanowski	e01085cac5	Fixes #1015: Player status window scroll state resets on status change ... Removed resetting scroll state position. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 02:57:30 +01:00
Marc Zinnschlag	48b779af80	Merge remote-tracking branch 'ace/win-fix'	2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson	baacf91de4	Another windows build fix	2013-12-06 11:37:29 +01:00
Marc Zinnschlag	14eff87339	removed some junk from ESM store	2013-12-06 11:34:24 +01:00
Lukasz Gromanowski	bfd79bfbe6	Various fixes for CppCheck warnings. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-06 07:36:16 +01:00
scrawl	845bc5f7eb	Show fatal exceptions in a message box instead of cerr when running without a terminal	2013-12-05 15:51:07 +01:00
scrawl	afa71bb622	Throw an exception if a BSA is not found	2013-12-05 15:51:07 +01:00
scrawl	f695deb29d	Remember window positions	2013-12-05 15:46:23 +01:00
Marc Zinnschlag	ee6ddc3404	block saving while chargen is in progress	2013-12-05 14:56:30 +01:00
Marc Zinnschlag	8b7889f8e5	setup player after loading a saved game	2013-12-05 14:22:08 +01:00
Marc Zinnschlag	a7b42b867b	more cleanup	2013-12-05 14:18:43 +01:00
Marc Zinnschlag	ce624e024b	make sure player record stays in place across cleanups	2013-12-05 14:03:25 +01:00
Marc Zinnschlag	e818d43bc3	removed an outdated typedef and some dead code	2013-12-05 13:21:26 +01:00
Marc Zinnschlag	537b2efe8e	first round of cleaning up world cleanup	2013-12-05 12:49:25 +01:00
scrawl	8f4ffe4ddc	Fix new window size not being written to settings when manually resizing window	2013-12-03 15:55:31 +01:00
Marc Zinnschlag	63721682f6	GUI fix: previous character was selected when saving new character	2013-12-03 15:19:13 +01:00
Marc Zinnschlag	34cdd2bb1f	deal with dialogue/info records that don't exist anymore	2013-12-03 14:39:54 +01:00
Marc Zinnschlag	2293b92efe	storing and loading the journal	2013-12-03 14:28:46 +01:00
Marc Zinnschlag	0f971163f7	use Entry instead of plain string for topic and quest entries	2013-12-01 14:50:25 +01:00
Marc Zinnschlag	b273f9e387	splitting JournalEntry into Entry and JournalEntry	2013-12-01 14:44:27 +01:00
scrawl	8391891a5b	Ignore case for content file extensions	2013-11-30 14:25:29 +01:00
Marc Zinnschlag	43f5f16731	removed a todo comment	2013-11-30 12:54:44 +01:00
Marc Zinnschlag	177aab536d	storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)	2013-11-30 12:41:18 +01:00
Marc Zinnschlag	eed46960fe	some spelling fixes	2013-11-30 12:02:56 +01:00
Marc Zinnschlag	9d64c92d33	store text in journal entries	2013-11-30 11:57:33 +01:00
Marc Zinnschlag	aebc2791a5	fixed selecting current character based on value stored in settings	2013-11-30 11:08:41 +01:00
scrawl	4b4025ed0f	Keep the player's CharacterController when changing cells. Fixes several glitches.	2013-11-30 11:01:45 +01:00
scrawl	e1e9de0f02	Don't hide tooltips on mouse click. Probably wasn't such a bright idea.	2013-11-30 09:04:52 +01:00
scrawl	6aa9e18915	Reset filter when starting a trade	2013-11-30 08:33:18 +01:00
scrawl	bb4bd999ba	PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.	2013-11-30 08:29:22 +01:00
scrawl	0e267b79ec	Don't heal dead actors when resting	2013-11-29 20:21:57 +01:00
scrawl	bcf61331ab	Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.	2013-11-29 20:06:54 +01:00
scrawl	ce2d521b8f	Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra". ... When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.	2013-11-29 20:03:50 +01:00
scrawl	ffc885853a	Fix bolt for magic effects that don't have one specified	2013-11-29 10:39:37 +01:00
scrawl	b82ee4b44f	Fix some problems with the previous commit	2013-11-28 21:49:15 +01:00
scrawl	076cc9230b	First try at handling target magic	2013-11-28 17:31:17 +01:00
scrawl	20ccfe2324	Play sound when enchanting	2013-11-28 11:37:30 +01:00
Marc Zinnschlag	5aea6ef80f	some clean up for the cleanup code	2013-11-28 11:22:34 +01:00
Marc Zinnschlag	35e8e23037	keep track of total play time per character	2013-11-28 09:33:50 +01:00
Marc Zinnschlag	7e2819c62e	store year in saved game profile	2013-11-28 09:27:10 +01:00
Marc Zinnschlag	b0eb5938bf	removed some redundant code	2013-11-28 09:13:54 +01:00
Marc Zinnschlag	71436b1160	changed interface for global variable access	2013-11-28 09:10:38 +01:00
scrawl	97fadb24ca	Update the Ptr in mObjects in Objects::updateObjectCell	2013-11-27 18:49:04 +01:00
scrawl	03c4b680ca	Fix changePointer	2013-11-27 18:49:04 +01:00
scrawl	a8c838b53a	Don't list deleted refs in CellStore::foreach	2013-11-27 18:49:04 +01:00
scrawl	49ea1aae67	Use GMST for sun damage reduction	2013-11-26 15:01:22 +01:00
Marc Zinnschlag	99ea63dc4a	factored out code for generating month names	2013-11-26 12:47:30 +01:00
Marc Zinnschlag	e6dc927f11	removed duplicates of the cell name function	2013-11-26 11:49:07 +01:00
Marc Zinnschlag	bc6fe682c9	replaced getCurrentCellName function with a more general getCellName function	2013-11-26 11:39:58 +01:00
Marc Zinnschlag	eea433f141	restore last played character selection across sessions	2013-11-26 10:37:58 +01:00
scrawl	eba068149d	Fix AIWander crash	2013-11-25 15:38:18 +01:00
Marc Zinnschlag	ad143e0524	case fix (content file names)	2013-11-25 14:56:05 +01:00
Marc Zinnschlag	616e3aa32f	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
Marc Zinnschlag	55544e931c	reject newer formats when scanning saved games	2013-11-25 10:21:49 +01:00
Marc Zinnschlag	e3670cff8a	improved character selection logic	2013-11-24 16:58:41 +01:00
Marc Zinnschlag	67cd0887e6	added description field to saved game record; make use of description in GUI	2013-11-24 15:19:56 +01:00
Marc Zinnschlag	7efac4c9a5	fixed handling of characters without a valid slot	2013-11-24 15:05:00 +01:00
Marc Zinnschlag	18a3b38fb4	when scanning saved game directory, reject characters without a valid saved game	2013-11-24 14:42:58 +01:00
scrawl	14c9a4e1d3	Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.	2013-11-23 23:12:54 +01:00
scrawl	07408a4652	Don't allow selling gold (again - when did this get broken?)	2013-11-23 22:52:20 +01:00
scrawl	4aa9f3bcef	Don't set the enchanted item in HUD for "WhenStrikes" enchantments	2013-11-23 22:48:56 +01:00
scrawl	f3e89e9168	Fix arrow down in console	2013-11-23 22:48:39 +01:00
scrawl	d2ed77f3f2	Fix shields being visible during spellcasting	2013-11-23 20:24:52 +01:00
Marc Zinnschlag	d8c40562ae	Merge remote-tracking branch 'scrawl/light'	2013-11-23 12:44:42 +01:00
scrawl	a1fe07181c	Fix rotation offset of some lights (bug 955)	2013-11-23 05:55:03 +01:00
scrawl	0e254aa7c7	Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.	2013-11-23 03:25:55 +01:00
scrawl	39de0510a0	Fix another case of container scripts not getting re-added	2013-11-22 02:12:37 +01:00
scrawl	829512ded4	Fix container scripts not getting re-added when the player changes cells	2013-11-22 01:02:12 +01:00
scrawl	2e87cbc231	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
scrawl	cf79a83d4f	Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.	2013-11-21 19:07:54 +01:00
scrawl	b490e56ba1	Remove redundant setLocals (already done by ContainerStore::add)	2013-11-21 17:19:41 +01:00
scrawl	61ab6e1739	Use fWortChanceValue for making ingredient/potion effects visible	2013-11-21 17:19:41 +01:00
scrawl	320ba98097	Correct getDerivedDisposition according to wiki (check if player expelled)	2013-11-21 17:19:41 +01:00
scrawl	6451b687d9	Adjust value for several item types as according to wiki	2013-11-21 17:19:41 +01:00
scrawl	b6c22ad5d9	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
scrawl	bab657fe2b	Add a utility function to add items to a ContainerStore by RefID	2013-11-21 17:14:30 +01:00
scrawl	6641fd4635	Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.	2013-11-21 17:14:30 +01:00
scrawl	800a2845b0	Add Bound & Summon effects (will need some adjustments later)	2013-11-21 17:14:23 +01:00
Marc Zinnschlag	2702d10911	more comments	2013-11-21 12:31:04 +01:00
Marc Zinnschlag	b5f99522c7	added a few comments	2013-11-21 12:29:24 +01:00
Marc Zinnschlag	c165894869	load saved game record	2013-11-21 12:24:24 +01:00
Marc Zinnschlag	5ba56a5ea5	character signatures	2013-11-21 11:18:56 +01:00
Marc Zinnschlag	cbbdf390ad	added function for inspection of saved characters and character slots	2013-11-21 11:10:18 +01:00
Marc Zinnschlag	fc1501a510	store character profile information in saved game file	2013-11-21 10:53:42 +01:00
Marc Zinnschlag	e938c5a0ee	changed character creation logic (create on save instead of on new game)	2013-11-21 10:20:50 +01:00
scrawl	bf153e1c8e	Fix bug applying instant effects	2013-11-21 00:41:52 +01:00
scrawl	4ed4c1e319	Add Vampirism and Sun Damage effects. Some fixes.	2013-11-21 00:41:31 +01:00
scrawl	7f735c2c4c	Release and show the cursor when focus lost	2013-11-20 16:07:14 +01:00
scrawl	5a4bd9b202	Remove software cursor option, hw cursors seem to be working well enough	2013-11-20 06:20:16 +01:00
scrawl	fa63924884	Simplify message box manager, should fix a random bug with boxes not disappearing	2013-11-20 05:49:05 +01:00
scrawl	3452bd2e0b	Add glow effect for enchanted items	2013-11-20 00:13:12 +01:00
scrawl	0b9676aaa3	Fix an issue with the AI code	2013-11-19 18:43:32 +01:00
scrawl	38a82c4b0b	Add a todo comment	2013-11-19 18:43:21 +01:00
scrawl	8b095982e9	Don't auto equip for dead actors	2013-11-19 18:42:43 +01:00
scrawl	f3ff2e4260	Handle Unreflectable flag	2013-11-19 17:33:02 +01:00
scrawl	c03c82c78a	Apply disease resistance manually as according to wiki	2013-11-19 17:15:17 +01:00
Marc Zinnschlag	8190fdb16c	Merge remote-tracking branch 'scrawl/master'	2013-11-19 16:56:18 +01:00
scrawl	654b7d9ba5	Apply disease resistance manually as according to wiki	2013-11-19 16:52:26 +01:00
scrawl	e8dcd74741	Recharge enchanted items in player's inventory over time	2013-11-19 16:42:24 +01:00
Marc Zinnschlag	9487bd33c3	removed broken save function from ESMWriter	2013-11-19 16:07:36 +01:00
Marc Zinnschlag	5e64888227	added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)	2013-11-19 15:38:26 +01:00
Marc Zinnschlag	11e254aac8	Merge remote-tracking branch 'gus/AICombat' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2013-11-19 09:10:48 +01:00
scrawl	74e42a2d02	Add missing skill increases for Enchant skill	2013-11-19 07:39:07 +01:00
scrawl	cab535dd69	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
scrawl	16e5477c60	Fix an uninitalized member	2013-11-19 02:17:44 +01:00
gus	dff3cf162d	ToggleAI script instruction	2013-11-18 23:03:44 +01:00
Marc Zinnschlag	1c7a4d4b3a	adjust availability of main menu items based on game state	2013-11-18 15:52:25 +01:00
Marc Zinnschlag	f45cff8aff	flag game as ended when player dies	2013-11-18 15:38:08 +01:00
Marc Zinnschlag	82c8495338	removed boolean running flag with state enum	2013-11-18 15:15:47 +01:00
Marc Zinnschlag	e55691096c	Merge remote-tracking branch 'ace/win-fixes'	2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson	4baaf9463e	Remove crashcatcher.cpp from windows builds, it can't be built or used there.	2013-11-18 12:34:25 +01:00
gus	4559e932ae	AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState	2013-11-18 12:33:09 +01:00
scrawl	6902569d03	Implement Absorb effects (AbsorbHealth, etc)	2013-11-18 05:01:36 +01:00
scrawl	a420698237	Don't try to absorb or reflect for self casted spells	2013-11-17 23:41:24 +01:00
scrawl	0dc2e829dd	Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.	2013-11-17 23:31:08 +01:00
scrawl	fc268bf302	Initialize mFallHeight	2013-11-17 23:31:08 +01:00
scrawl	47fc3f81f5	Don't update actors while paused	2013-11-17 23:31:08 +01:00
scrawl	2a11618ee7	Make sure the equipped weapon HUD icon is updated properly	2013-11-17 23:31:07 +01:00
scrawl	b8c358df63	Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place	2013-11-17 23:31:07 +01:00
scrawl	e7993ced69	Fix invalid casts	2013-11-17 04:33:04 +01:00
scrawl	07251f0fa4	Don't apply spells to dead actors	2013-11-17 04:32:56 +01:00
scrawl	b8f5cd6cb7	Forgot to apply the same fix to companion window	2013-11-16 23:55:54 +01:00
scrawl	eb46de54e4	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-11-16 22:48:59 +01:00
scrawl	7eb1dcb682	Fix trade windows crashing after a new game	2013-11-16 22:29:40 +01:00
scrawl	e32c73725c	Merge branch 'crashcatcher'	2013-11-16 20:56:07 +01:00
scrawl	f990ba09f0	gdb detection doesn't seem to work for the forked process	2013-11-16 20:55:41 +01:00
Marc Zinnschlag	a19242b4ec	fixed expression in if statement	2013-11-16 19:31:35 +01:00
vorenon	b2d2a3dd17	Closing message boxes with numpad enter	2013-11-16 19:15:47 +00:00
Marc Zinnschlag	985ce7c552	Merge remote-tracking branch 'scrawl/crashcatcher'	2013-11-16 18:34:08 +01:00
scrawl	20d806b40c	Change is_debugger_attached to a different hack	2013-11-16 18:15:54 +01:00
Marc Zinnschlag	c5f81e3508	don't run udpates if no game is running	2013-11-16 17:46:48 +01:00
scrawl	883140babf	Add missing include for signals to make travis happy	2013-11-16 17:00:26 +01:00
scrawl	b9899696e3	Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.	2013-11-16 15:56:15 +01:00
scrawl	aa84ce3f0d	Copy paste mistake (oops)	2013-11-16 14:44:31 +01:00
Marc Zinnschlag	ec5b2e9a7e	added running flag; moved new game code to MWState	2013-11-16 12:22:28 +01:00
Marc Zinnschlag	31ec973c9c	removed default value for --start	2013-11-16 12:08:00 +01:00
Marc Zinnschlag	b3a7c8c098	removed --new-game switch	2013-11-16 11:36:32 +01:00
Marc Zinnschlag	7a4b604376	added --skip-menu switch	2013-11-16 11:33:20 +01:00
Marc Zinnschlag	f19973450f	moved exit game flag from Environment to StateManager	2013-11-16 11:07:23 +01:00
Marc Zinnschlag	79b7fa258b	added new mwstate subsystem	2013-11-16 10:31:46 +01:00
scrawl	7474e87edc	Implement RestoreHealth/Magicka/Fatigue	2013-11-16 05:06:54 +01:00
scrawl	bb43ec9b35	Implement damage tick effects	2013-11-16 03:16:21 +01:00
scrawl	b1a29eb27e	Implement Resist & Weakness effects	2013-11-16 02:34:43 +01:00
scrawl	d49b6f19ff	Don't advance acrobatics skill for NPCs	2013-11-16 02:11:11 +01:00
scrawl	aa4b2d9504	Fix uninitialized mSkill/mAttribute for spellmaker spells	2013-11-16 01:19:39 +01:00
scrawl	c73217627e	Move code for listing effect sources to the spell management classes	2013-11-15 20:29:47 +01:00
Marc Zinnschlag	eddd6bf48d	enabled load and save items in main menu	2013-11-15 10:29:53 +01:00
scrawl	d619d0fa25	Don't grab the cursor while the console is opened	2013-11-15 03:39:25 +01:00
scrawl	065f14579f	Fix a container window regression (oops)	2013-11-15 02:57:21 +01:00
scrawl	f7befa3e54	Remove a no longer required method	2013-11-15 02:20:04 +01:00
scrawl	00af6b5617	Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.	2013-11-15 02:08:36 +01:00
scrawl	427de69b79	Allow stacking enchanted items when charge is full	2013-11-14 21:02:37 +01:00
scrawl	49125fa26e	Fix restacking unequipped items	2013-11-14 19:54:00 +01:00
scrawl	da85f3e575	Use the formula from the wiki for spell success.	2013-11-14 19:19:32 +01:00
scrawl	4083c55848	Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.	2013-11-14 19:18:27 +01:00
scrawl	5458207325	Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0.	2013-11-14 18:41:34 +01:00
scrawl	9c5847e2f4	Fix VFX not getting removed when an actor dies	2013-11-14 14:52:30 +01:00
scrawl	e26cc31e3b	Disable projectiles for now	2013-11-14 14:45:08 +01:00
scrawl	992a8e9c36	Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.	2013-11-14 14:41:10 +01:00
scrawl	956d8adb99	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic ... Conflicts: apps/openmw/mwgui/inventoryitemmodel.cpp	2013-11-14 14:25:22 +01:00
scrawl	0b5f5351b5	Fix continuous FX getting removed instantly	2013-11-14 13:30:48 +01:00
Marc Zinnschlag	9f0dac00ec	silenced a warning	2013-11-14 12:22:24 +01:00
Marc Zinnschlag	d49b8e7443	Merge branch 'dialogue'	2013-11-14 11:40:50 +01:00
scrawl	da5c59c8af	addEffect should check effectId, not model.	2013-11-13 19:07:44 +01:00
scrawl	ff7e4174f9	Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.	2013-11-13 18:51:28 +01:00
scrawl	a6e2f43b75	Stop continuous VFX when the effect is no longer active.	2013-11-13 15:44:43 +01:00
scrawl	9b0e82a37f	Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)	2013-11-13 14:02:15 +01:00
Marc Zinnschlag	a8274e5c86	Merge remote-tracking branch 'potatoesmaster/inventory-fix'	2013-11-13 13:55:24 +01:00
scrawl	0627e23d3c	Fix wrong skill level for spell success formula.	2013-11-13 01:26:25 +01:00
Emanuel Guevel	baf13483c0	Update actor model only when in the current cell	2013-11-13 00:04:04 +01:00
scrawl	60bec03987	Rename variables called 'slots' to work around wrong code parsing in QT Creator.	2013-11-12 23:23:19 +01:00
scrawl	027f4152e4	Missing flagAsModified()	2013-11-12 23:17:03 +01:00
scrawl	3c6a391507	Rename arguments again	2013-11-12 23:12:56 +01:00
scrawl	700d06764c	Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.	2013-11-12 22:58:56 +01:00
scrawl	0dab7031c0	Make sure effects are destroyed with the animation	2013-11-12 02:22:44 +01:00
scrawl	eccb8f38ba	Apply "cast when strikes" enchantments when hitting with a weapon	2013-11-12 02:07:51 +01:00
scrawl	5f209b120b	Use the new ContainerStore::remove method.	2013-11-12 01:26:16 +01:00
scrawl	ffdb91bb21	Add particles for Cast + Hit. Not looking quite right yet.	2013-11-11 23:43:28 +01:00
scrawl	6f3d737498	Missing const, thanks to jeaye	2013-11-10 23:27:11 +01:00
scrawl	1773c70455	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic	2013-11-10 22:03:17 +01:00
Marc Zinnschlag	ef8360f346	silenced a warning	2013-11-10 21:45:27 +01:00
scrawl	6cd373c5c6	Only allow using powers once every 24 h. Apply on touch effects.	2013-11-10 15:40:31 +01:00
scrawl	71828351e6	Code cleanup: use enum instead of integer	2013-11-10 15:28:26 +01:00
Marc Zinnschlag	8c4303399f	Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp	2013-11-10 13:21:39 +01:00
Emanuel Guevel	bbfd7f4c9d	Disable equipped item re-stacking when the item is removed from inventory ... The item was not removed if it was re-stacked.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	d2dcf0b203	Add a warning comment to RefData::setCount()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	467bd91651	Update actor model on inventory change	2013-11-10 02:45:17 +01:00
Emanuel Guevel	f428921b93	Always update the source container view on drag&drop ... This fix the indicator not being displayed for items auto-equipped after an other item is removed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	4fcf427e1f	InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged ... The unequipped item is also re-stacked if needed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	37e91a278e	Add InventoryStore::unequipItem()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	12dbbde1e3	InvStore::unequipSlot: return an iterator to the unequipped item	2013-11-10 02:45:17 +01:00
Emanuel Guevel	59c963b6cc	Auto-equip items when a clothe or an armor is removed from inventory ... This fix auto-equip on corpses.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	750f1fd760	Edit ContainerStore::stacks for clarifications and correctness ... Rename arguments and fix some potential errors (add checks).	2013-11-10 02:45:16 +01:00
Emanuel Guevel	26e4ccb8c2	Cosmetic changes ... Rename ContainerStore::addImpl to addNewStack (it was confusing, since ContainerStore had methods named 'addImp' and 'addImpl').	2013-11-10 02:45:16 +01:00
Emanuel Guevel	aefa54d72d	Pass item count to ManualRef constructor ... This remove the need to call setCount in multiple places.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	0691978603	Add item count to ManualRef constructor as optional argument	2013-11-10 02:45:16 +01:00
Emanuel Guevel	f4f2586e8c	Remove duplicate code for PlaceAtMe/PlaceAtPC using a template	2013-11-10 02:45:16 +01:00
Emanuel Guevel	8ff747fbef	Move some deleteObject logic from OpDelete to MWWorld::deleteObject	2013-11-10 02:45:16 +01:00
Emanuel Guevel	2786530430	Edit InventoryStore::equip() to call the new unequipSlot function… ... …to unequip previously equipped item.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	52cef19982	Update weapon/magic icons when items are removed from player inventory	2013-11-10 02:45:16 +01:00
Emanuel Guevel	d05baa8c22	Add method InventoryStore::unequipSlot() ... This will permit to do run a treatment when an item is unequipped.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	10abb9d297	Call ContainerStore::remove() to remove items from inventory ... Make placeObject() and dropObjectOnGround() in MWWorld to copy objects (and indicate it clearly). Enchanting an item now unequips it.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	23b8206bdc	Add remove methods to MWWorld::ContainerStore	2013-11-10 02:45:16 +01:00
Marc Zinnschlag	a198751f21	Merge remote-tracking branch 'scrawl/magic'	2013-11-09 17:00:27 +01:00
scrawl	5c148a3d41	Fix effect source display	2013-11-09 11:09:44 +01:00
Marc Zinnschlag	8be3ffc2a0	Merge remote-tracking branch 'scrawl/magic' ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-11-09 10:54:51 +01:00
scrawl	3e58655a90	Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!	2013-11-09 10:49:00 +01:00
scrawl	3ea7d58ca8	Advance skill on successfull spell cast	2013-11-09 10:34:46 +01:00
scrawl	976344f0a3	Handle CastOnce enchantments	2013-11-09 08:07:40 +01:00
scrawl	1051611ffa	Added spell failure sound	2013-11-09 07:59:17 +01:00
scrawl	cbe96a2170	Refactor ActiveSpells to track range type. Added basic self range magic.	2013-11-09 07:51:46 +01:00
Jordan Ayers	3fbf918751	Chargen Review Dialog: Init fix. ... Load the starting Health/Magicka/Fatigue from the player stats when creating the Review Dialog, and remove the extra copy of these stats. In some cases, the old stat values were never updated from 0/0.	2013-11-06 23:19:53 -06:00
Jordan Ayers	d48cc27a89	Chargen fix: Back sequence control. ... Related to bug #894. Eliminate double windows when using 'Back' from the review screen. Force consistent back behavior (handling was changing after a individual change button had been used).	2013-11-06 23:19:53 -06:00
Jordan Ayers	e94da61ff0	Chargen cleanup. ... Move common gui state pop out of if checks. Move health update before gui state push (used as input for some windows).	2013-11-06 23:19:53 -06:00
Marc Zinnschlag	d85360e7fd	Merge remote-tracking branch 'scrawl/ui'	2013-11-06 10:21:41 +01:00
Marc Zinnschlag	418ccf705d	Merge branch 'openmw-27' ... Conflicts: apps/launcher/graphicspage.hpp components/CMakeLists.txt	2013-11-06 10:21:25 +01:00
scrawl	9e2b1942fc	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
scrawl	bf5529819d	Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.	2013-11-05 19:50:24 +01:00
Marc Zinnschlag	2d4a6c0edf	cleaned up ID handling in INFO record (including a ESMTool bug fix)	2013-11-05 12:56:20 +01:00
Marc Zinnschlag	9d7695ea88	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
Marc Zinnschlag	245d7b0ae4	Merge remote-tracking branch 'scrawl/windowclosefix'	2013-11-05 08:19:53 +01:00
Marc Zinnschlag	f4e6f31658	Merge remote-tracking branch 'scrawl/openmw-27'	2013-11-05 08:19:29 +01:00
scrawl	c3d9bc31bb	Fix exiting OpenMW via the window close button (regression)	2013-11-05 03:02:28 +01:00
scrawl	3a827d9c12	Deleted Obliviontt.zip	2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson	468e8e3635	Missing iostream include	2013-11-04 10:36:22 +01:00
Marc Zinnschlag	dec1483fa4	Merge branch 'saving' into openmw-27	2013-11-04 08:57:32 +01:00
Lukasz Gromanowski	afce10cf37	Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp ... It seems that assertion was unnecessary, after removing it, dialogs related to moon-and-star in "Path of the Incarnate" quest were correctly loaded (dumped DialInfo records were correct). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-11-02 16:39:05 +01:00
gus	683b8d77dd	build fix (thanks travis)	2013-10-31 11:02:26 +01:00
gus	d587f3c946	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-10-31 09:51:17 +01:00
gus	02ded18fc5	Linux backslash fix	2013-10-31 09:43:12 +01:00
gus	2a927f65d3	perfomances optimisations (pathfinding is computed less often, max 4 times per sec)	2013-10-30 20:52:23 +01:00
gus	650a112e2e	better timer	2013-10-30 20:42:50 +01:00
scrawl	636d399c7f	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00
scrawl	4f35fd8184	Removed a workaround from Renderer, some cleanup	2013-10-30 13:05:28 +01:00
gus	a6e7c6c104	disable AI combat for creatures	2013-10-28 23:04:46 +01:00
gus	5b20cce849	CMake fix	2013-10-28 18:36:09 +01:00
gus	0e86209224	linux fix :p	2013-10-28 18:33:10 +01:00
gus	b7a9243173	fighting should stop when the target is dead	2013-10-28 18:22:36 +01:00
gus	12d8b4e0f8	bugfix	2013-10-28 18:13:07 +01:00
gus	2d84f7d33d	NPC run	2013-10-28 18:10:00 +01:00
gus	d7584f9df7	getLineOfSight, no script instruction yet	2013-10-28 18:01:40 +01:00
gus	2515a1239e	improved combat conditions	2013-10-27 14:22:51 +01:00
gus	968968502e	NPC always face you when fighting	2013-10-27 14:03:58 +01:00
gus	a0edb55f60	only NPC with fight over 80 will attack you now	2013-10-27 13:50:29 +01:00
gus	882b136b35	bugfix of bugfix ^^	2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad	23eaf90846	Breath meter flashes when drowning	2013-10-27 04:05:01 -04:00
Marc Zinnschlag	c995533e07	Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp	2013-10-21 16:45:43 +02:00
scrawl	3a3f2a37c8	Add cut, copy & paste of text	2013-10-17 12:47:49 +02:00
Marc Zinnschlag	8c139783b7	silenced a warning	2013-10-16 21:33:11 +02:00
Marc Zinnschlag	19bd0f90b9	Merge remote-tracking branch 'rainChu/torches'	2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad	65818155d8	Fixed punctuation consistency	2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad	e11da5c0a3	Added a constructor to Light CustomData	2013-10-16 15:13:36 -04:00
Alex "rainChu" Haddad	2643214ca6	Lights extinguish underwater	2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad	30ee3c5cf6	Equipped torches and lights run out of fuel	2013-10-15 21:50:14 -04:00
Emanuel Guevel	ba4b8a37e2	Remember pressed message box button longer ... Remember which button was pressed until a new interactive message box is displayed or until the pressed button number is read. Before that, it was not possible to get the pressed button after the message box was hidden/destroyed.	2013-10-14 12:55:06 +02:00
Marc Zinnschlag	ce8694c84e	Merge remote-tracking branch 'scrawl/master'	2013-10-13 18:55:49 +02:00
scrawl	683ad40e21	No need for this ifdef since there is a default argument.	2013-10-13 18:28:22 +02:00
scrawl	fa264935ff	We can apply vsync at runtime now that the Ogre bug is fixed.	2013-10-13 17:56:26 +02:00
scrawl	f504ab42fe	Turn off vsync while in the loading screen	2013-10-13 17:52:14 +02:00
Marc Zinnschlag	fc5afe430b	Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'	2013-10-13 14:40:48 +02:00
Emanuel Guevel	dcfff79460	Regenerate fatigue over time	2013-10-13 00:40:27 +02:00
Marc Zinnschlag	708cde2688	Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'	2013-10-12 23:18:19 +02:00
Jordan Ayers	141382b8c0	COC Command: Exterior cell selection fix. ... Return the northernmost cell of the easternmost matching column for Ext. cells.	2013-10-12 14:48:37 -05:00
Marc Zinnschlag	608d154ad7	Merge remote-tracking branch 'rainChu/master'	2013-10-12 20:31:33 +02:00
Marc Zinnschlag	2606feec3a	Merge remote-tracking branch 'lgro/cfg_without_data_path'	2013-10-12 13:52:38 +02:00
Marc Zinnschlag	3c580fbc59	Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'	2013-10-12 13:40:29 +02:00
Marc Zinnschlag	458c752425	Merge remote-tracking branch 'mckibbenta/tgm'	2013-10-12 13:38:10 +02:00
Marc Zinnschlag	87cd5d4267	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	2013-10-12 13:31:06 +02:00
Marc Zinnschlag	9c4d88cd76	Merge remote-tracking branch 'potatoesmaster/acrobatics'	2013-10-12 13:20:12 +02:00
Lukasz Gromanowski	5ce1f50fab	Cleanup in MWGui::WindowManager constructor initialzation list. ... Corrected order of initialization list, and added missing member field initializations - without this openmw crashes when installer is interrupted and there are no valid data path in openmw.cfg, as reported by BrotherBrick in: https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-10 23:06:37 +02:00
Jordan Ayers	6e4978643c	Magic Effect descriptions: support feet / level modes. ... Show proper suffixes for all magnitudes. Drop extra 'times' symbol in 'timesInt format (not consistent with other magnitude displays).	2013-10-09 00:08:11 -05:00
Jordan Ayers	6ab7002908	MagicEffect: Put magnitude type into ESM::MagicEffect helper.	2013-10-07 22:28:55 -05:00
Jordan Ayers	065f435225	Format fix: remove extra spaces from ranged TimesINT formatting.	2013-10-07 20:02:20 -05:00
gus	94069e3a7e	bugfix	2013-10-07 20:30:12 +02:00
gus	1ac3d99c78	pathfinding now works in AICombat.	2013-10-07 10:20:02 +02:00
Jordan Ayers	6303e56ce4	Magic Effect Display cleanup: Don't put spaces in percentages.	2013-10-06 20:35:59 -05:00
Jordan Ayers	707f45aa8e	Magic Effect Display improvement. ... Related to Bug #794. Always show one decimal point precision for Fortify Max. Magicka effect.	2013-10-06 20:26:39 -05:00
Jordan Ayers	6983a55a16	Magic effect display improvement. ... Related to Bug #794. Show the "x INT" notation for Fortify Max. Magicka. Show "%" notation for weakness / resistance effects.	2013-10-06 19:32:40 -05:00
Emanuel Guevel	2abe5c1c9a	Acrobatics: do not apply fall damages when slowfalling spell effect is active ... If spell effect ends up in mid-air, calculate fall height from then.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	4265dddc40	Add MWWorld::isSlowFalling(Ptr)	2013-10-02 23:34:25 +02:00
Emanuel Guevel	6e09a5fb4a	Acrobatics: reinit fall height at current height rather than zero ... To prevent problems.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	2b992ef3b5	Acrobatics: use calculated fatigueTerm	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4c151e59a2	Acrobatics: do not touch modified stats	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4860514865	Acrobatics: cosmetic changes	2013-10-02 23:34:24 +02:00
mckibbenta	857deb3723	Merge branch 'master' into tgm	2013-10-02 13:54:03 -04:00
mckibbenta	073f64c8bb	stop weapon condition degredation (for the player) with tgm on	2013-10-02 13:46:33 -04:00
Emanuel Guevel	496f786c2a	Implement Disable/EnableLevitation script functions ... Totally copied on Disable/EnableTeleporting implementation. Thanks KittyCat!	2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad	f1b4c2e400	Fixed first person offset to use world transform ... It slipped my mind that some necks might not be perfectly vertical.	2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad	ed0c31b485	Refactored, moved logic out of NpcAnimation ... The logic is now handled by RenderingManager, and Camera sets its animation's first person offset height. Due to how NpcAnimation seems to be updated, it has to be the one to actually set its own nodes, in the case of the hands. Otherwise, the hands would not move without a messier hack.	2013-10-02 05:16:52 -04:00
Emanuel Guevel	b8c60dabb3	Reintroduce Acrobatics changes made by Glorf ... Advance Acrobatics skill on jump and on landing, apply fall damage on landing.	2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad	0ddb5097fc	Revert "Bug #840, First Person Sneaking Camera Height" ... This reverts commit 296abfd48f.	2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad	296abfd48f	Bug #840, First Person Sneaking Camera Height ... Also, added comments to existing code in the area.	2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad	00a776a1a8	Fixed compilation failure on my machine ... Fixed shared records not being populated before the player record is moved.	2013-09-30 02:54:20 -04:00
greye	4cdb57e388	workaround segfault on --new-game switch	2013-09-30 10:30:40 +04:00
Lukasz Gromanowski	9c2145eda1	Issue #913: Merge --master and --plugin switches ... Merged master/plugin switches into content in openmw and mwiniimporter. Extension in content files is now required. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-09-29 09:11:57 +02:00
gus	83a375b55d	AI now continue to hit you. ... TODO: change the way time is handled	2013-09-28 21:17:06 +02:00
gus	2537384c50	bug fix	2013-09-28 12:25:37 +02:00
gus	9353f4d14f	WIP AI combat	2013-09-25 18:01:36 +02:00
Marc Zinnschlag	0f1c4cb00e	cleanup	2013-09-23 15:34:52 +02:00
Berulacks	91d7291c0c	Switched to using proper enums as opposed to ints.	2013-09-23 08:31:36 -04:00
Berulacks	0c518fb047	Replaced tabs with spaces.	2013-09-23 07:36:50 -04:00
Berulacks	c423479f20	Fixed bug #887	2013-09-23 07:31:14 -04:00
graffy76	70ac14b8ba	Merge branch 'master' into esxSelector	2013-09-21 23:07:53 -05:00
graffy76	cfdc19c427	Renamed esxSelector to contentSelector ... Fixed datafilespage model implementation in launcher Filtered addons in table view by selected game file	2013-09-21 23:06:29 -05:00
Marc Zinnschlag	94bb97e766	replacing tabs with spaces	2013-09-21 08:40:00 +02:00
Marc Zinnschlag	96b181bb54	Merge remote-tracking branch 'xethik/master'	2013-09-21 08:07:00 +02:00
Xethik	094e4d93b7	Generally speaking, you should never compare iterators from two different compilers ... http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10. It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.	2013-09-20 21:38:10 -04:00
Xethik	58bb0b8773	Bug #907 ... Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.	2013-09-20 21:26:12 -04:00
Marc Zinnschlag	99fe6e68c7	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-19 15:14:35 +02:00
scrawl	d5ef843f56	Fix a missing model update	2013-09-16 19:22:08 +02:00
mckibbenta	6bb6ba6372	added god mode comment	2013-09-15 16:12:59 -04:00
mckibbenta	3035675a26	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-09-15 15:49:18 -04:00
mckibbenta	644f081c60	minor changes	2013-09-15 15:48:32 -04:00
Marc Zinnschlag	9637e1641b	fix for building with system tinyxml	2013-09-14 13:33:49 +02:00
Marc Zinnschlag	bf8a25c2c6	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-12 19:07:35 +02:00
mckibbenta	89b7d6121d	Initial toggleGodMod/tgm instruction. Currently only affects player health.	2013-09-12 08:30:00 -04:00
mckibbenta	85b8af6262	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-12 08:08:07 -04:00
scrawl	09e692f1f6	Fixed polish font	2013-09-10 22:11:57 +02:00
gus	f9bfbc8764	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat	2013-09-10 16:18:39 +02:00
gus	46a734852b	adding script instruction getLOS + some test about AI	2013-09-10 16:16:13 +02:00
scrawl	10c21579bc	Item stacking case sensitivity fix	2013-09-07 01:00:38 +02:00
mckibbenta	e545f49807	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-02 18:40:37 -04:00
Marc Zinnschlag	7076ea9467	Merge remote-tracking branch 'scrawl/map'	2013-09-02 10:55:12 +02:00
scrawl	3ddeb075fb	Fix a cell border seam on the map	2013-08-31 04:36:23 +02:00
Chris Robinson	82a09a988b	Minor pathfinding cleanup	2013-08-29 19:17:27 -07:00
Chris Robinson	8f23b330d3	Remove unnecessary initialization	2013-08-29 17:41:20 -07:00
Chris Robinson	9499ac4fd5	Increase the distance for reaching a path node	2013-08-29 17:41:20 -07:00
Chris Robinson	f9dbce685a	Avoid killing AIWander and AITravel when far away ... This fixes the problem of certain NPCs not wandering because they happened to spawn near a cell border away from the player, which immediately "completed" the wander package. AIWander can't cause NPCs to cross cell boundaries, so there's no risk of them walking into an unloaded to. AITravel will now simply stop moving, and resume later when the cell is loaded.	2013-08-29 17:41:20 -07:00
mckibbenta	f65172bdca	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-08-29 20:26:36 -04:00
mckibbenta	eef9df504a	fiddlings	2013-08-29 20:25:36 -04:00
scrawl	c8e31725dc	Fix weather sounds persisting on a new game	2013-08-29 15:16:08 +02:00
Marc Zinnschlag	ce90c2f3be	Merge remote-tracking branch 'kcat/master'	2013-08-28 21:05:07 +02:00
Chris Robinson	e589d0ec91	Werewolves can't activate activators	2013-08-28 11:36:22 -07:00
Chris Robinson	84d259ab8e	Avoid reconstructing strings for updating the dynamic stats ... Attributes still do this, but they change infrequently enough that it doesn't matter.	2013-08-28 10:50:29 -07:00
scrawl	5918b84666	Don't crash on resize events during load	2013-08-28 17:05:28 +02:00
Chris Robinson	92082dae66	Modify the current magicka and fatigue when the base changes	2013-08-27 22:44:52 -07:00
Chris Robinson	305b5fec0f	Avoid needlessly copying the MagicEffects	2013-08-27 21:40:31 -07:00
Chris Robinson	281fdbd81b	Cleanup some redundancy	2013-08-27 17:56:47 -07:00
Chris Robinson	33c173a23a	Update the watched Ptr when changing it	2013-08-27 17:22:07 -07:00
Chris Robinson	39af9a13fa	Remove some unused functions	2013-08-27 17:13:49 -07:00
Chris Robinson	189541aa72	Apply drowning damage based on the update duration ... 1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid having to track another stat.	2013-08-27 17:08:23 -07:00
Chris Robinson	f216b25be8	Slightly randomize time between environment sounds ... We should use the "Minimum Time Between Environmental Sounds" and "Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't have them.	2013-08-27 16:04:19 -07:00
Chris Robinson	02df8ab841	Store the underwater sound to easily stop it	2013-08-27 13:48:20 -07:00
Chris Robinson	16331bf1ed	Avoid a hack to play the underwater sound properly	2013-08-27 13:26:57 -07:00
scrawl	839d251cc5	Renamed Terrain::Terrain to Terrain::World to make VC happy	2013-08-27 16:01:16 +02:00
scrawl	d3d6dfbde8	Refactored loading screen ... - Add loading progress for data files, global map, terrain - Refactored and improved cell loading progress	2013-08-27 15:48:13 +02:00
Marc Zinnschlag	dcc55b60c3	Merge remote-tracking branch 'kcat/misc-cleanup'	2013-08-26 08:51:19 +02:00
mckibbenta	60fa69139e	minor changes	2013-08-25 19:20:14 -04:00
Chris Robinson	f2889e4bb5	Remove unused functions and parameters	2013-08-25 16:08:45 -07:00
Chris Robinson	3843357cd2	Fix actor stepping	2013-08-25 16:08:43 -07:00
Chris Robinson	0463dc0653	Use a smaller static geometry size for interior cells	2013-08-25 16:08:43 -07:00
Chris Robinson	bd6dd071aa	Use the non-accumulation root's parent as the accumulation root ... This relies on the non-accumulation root not being the skeleton root. I haven't found an instance where this isn't the case.	2013-08-25 16:08:42 -07:00
scrawl	3f8a69b4ad	Don't crash when trying to delete a reference that doesn't exist anymore	2013-08-26 00:14:02 +02:00
scrawl	5af89a9e8f	Fix an AABB assert for loading empty exterior cells	2013-08-26 00:13:42 +02:00
scrawl	c6d2d1999a	Fix an item duplication glitch	2013-08-25 17:40:08 +02:00
mckibbenta	06701467ab	Merge branch 'master' into tgm	2013-08-24 21:28:26 -04:00
mckibbenta	8998b90e8b	initial do-nothing implementation; registered opcode	2013-08-24 21:19:12 -04:00
Chris Robinson	ca24a809fc	Use the position of the actor to determine if they're swimming	2013-08-23 13:44:16 -07:00
Chris Robinson	3fa65f21dd	Use a proper cone shape with a contact test to check for melee hits	2013-08-23 12:27:40 -07:00
Chris Robinson	f5d03a16c1	Rename getFacedObject and getFacedHandle for melee hits	2013-08-23 12:27:39 -07:00
Marc Zinnschlag	2823e5693d	Merge remote-tracking branch 'scrawl/hit'	2013-08-22 15:35:17 +02:00
scrawl	22d5598082	Fix bad_cast exception when hitting creatures	2013-08-22 12:17:12 +02:00
scrawl	1adce8afb3	Fix ambient light getting set from the cell data for non-interior cells	2013-08-22 10:47:48 +02:00
Marc Zinnschlag	e03e2f0817	Merge remote-tracking branch 'scrawl/master'	2013-08-21 19:50:08 +02:00
scrawl	758d989a03	If multiple plugins have land data for the same cell, the last plugin should win	2013-08-21 17:26:11 +02:00
scrawl	ce5ea6d7d2	Use a proper node hierarchy; disconnect the root when entering interior	2013-08-21 17:26:11 +02:00
Chris Robinson	c855ab65cf	Non-colliding objects are considered flying	2013-08-21 07:24:54 -07:00
Chris Robinson	602be9bbe7	Avoid swimming into the air from underwater	2013-08-21 07:24:54 -07:00
Chris Robinson	9f09bb6f6f	Use separate inputs for swimming and flying	2013-08-21 07:24:54 -07:00
Chris Robinson	a546ace94d	Remove an unused method	2013-08-21 07:24:54 -07:00
vorenon	3bf3bd4b8c	Silenced some warnings	2013-08-21 13:53:49 +02:00
Chris Robinson	1a9672e31b	Don't update player physics more than 60 times a second ... Bullet and/or our collision handling code doesn't like timesteps much smaller than that. Ideally we should do physics in 60fps (or even 30fps) steps and use prediction and interpolation to get more, but that's not straight forward and needs a fixed timestep loop to lock physics and logic together.	2013-08-20 11:31:49 -07:00
Chris Robinson	0e56b2facb	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 04:42:28 -07:00
Chris Robinson	d9040df9d6	Increase the max number of physics iterations ... Should help with highly tessellated collision meshes with high framerates.	2013-08-20 04:41:52 -07:00
scrawl	ecf7786d11	terrain_num_lights was removed	2013-08-20 12:31:47 +02:00
scrawl	fa76d1631b	Some terrain fixes	2013-08-20 12:08:46 +02:00
scrawl	0545622f5a	Fix werewolf state not getting completely reset when starting a new game	2013-08-20 11:24:19 +02:00
Chris Robinson	a993af53e7	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 02:21:44 -07:00
Chris Robinson	a17997a973	Continually add bits of input velocity to inertia when falling	2013-08-20 02:10:18 -07:00
scrawl	8c8653160d	Crash fix, material fix	2013-08-20 09:52:27 +02:00
scrawl	13afcc9324	Don't link to OgreTerrain	2013-08-19 22:22:14 +02:00
scrawl	ebf9debb80	Enabled terrain self shadows, implemented getHeightAt, some optimizations	2013-08-19 20:39:37 +02:00
Chris Robinson	d727b15580	Fix tracing down	2013-08-19 20:39:37 +02:00
Chris Robinson	394fc75697	Clean up the trace struct	2013-08-19 20:39:37 +02:00
Chris Robinson	b351109649	Get rid of the old newtrace method	2013-08-19 20:39:37 +02:00
Chris Robinson	14acacf401	Use a better method to do actor physics traces	2013-08-19 20:39:37 +02:00
Chris Robinson	76b812f75f	Improve actor movement collision handling	2013-08-19 20:39:37 +02:00
Chris Robinson	584eec3743	Store the object class in the LiveCellRef	2013-08-19 20:39:37 +02:00
scrawl	e27437f8ed	New terrain renderer - improvements: ... - Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now. - Fixes several blending issues and cell border seams - Fix map render to use the terrain bounding box instead of an arbitrary height - Different LODs are now properly connected instead of using skirts - Support self shadowing - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better - Support a fixed function fallback (though the splatting shader usually performs better) - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance	2013-08-19 20:34:20 +02:00
Chris Robinson	cf6e3ab933	Fix a potential divide-by-zero	2013-08-19 09:36:51 -07:00
Chris Robinson	dca599b8c5	Add NPC landing sounds for soundgen keys	2013-08-19 08:58:50 -07:00
Chris Robinson	2ec39f3622	Don't start the jump animation until after the actor is airborn ... A bit counter-intuitive, but otherwise certain jump animations will improperly add an offset to the initial inertia.	2013-08-19 08:24:47 -07:00
Chris Robinson	ac3d3df9fc	Implement jumping animations	2013-08-19 08:10:18 -07:00
Chris Robinson	48e594b7c4	Improve stepping down when starting on the ground	2013-08-19 08:09:23 -07:00
Chris Robinson	3ca4d54bf9	Better handle animations with a 0-length loop	2013-08-19 07:26:42 -07:00
Chris Robinson	1aa92067c2	Fix tracing down	2013-08-19 04:56:02 -07:00
Chris Robinson	6e9f15793d	Implement a jumping state	2013-08-18 23:42:56 -07:00
Chris Robinson	7770203dff	Some physics cleanup ... Gets rid of some unneeded/unused variables, and halves the 'on ground' offset.	2013-08-18 08:24:39 -07:00
Chris Robinson	b0f8045c72	Improve mid-air control	2013-08-18 05:59:06 -07:00
Chris Robinson	8c3564326e	Improve movement inertia ... Handles all 3 axis. Incoming velocity is only added to inertia when leaving the ground, and does not continually add to it.	2013-08-18 05:38:50 -07:00
Chris Robinson	9d56e2d86d	Apply movement by queueing it to do later	2013-08-17 22:34:38 -07:00
Chris Robinson	96bab88da6	Add physics methods to queue and apply movements	2013-08-17 07:48:45 -07:00
Chris Robinson	0481e64b02	Fix tracing down	2013-08-17 05:09:34 -07:00
Chris Robinson	8bcce0fb55	Clean up the trace struct	2013-08-17 05:09:33 -07:00
Chris Robinson	62c7b3698d	Get rid of the old newtrace method	2013-08-17 05:09:33 -07:00
Chris Robinson	65ce3c6ba5	Use a better method to do actor physics traces	2013-08-17 05:09:32 -07:00
Chris Robinson	d82f54c771	Improve actor movement collision handling	2013-08-17 05:09:30 -07:00
Chris Robinson	21121d5ba5	Store the object class in the LiveCellRef	2013-08-16 04:18:48 -07:00
Chris Robinson	08d1d486a4	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 17:42:16 -07:00
Marc Zinnschlag	d122699b2f	and another fix for the same issue :(	2013-08-15 18:29:09 +02:00
Chris Robinson	58481ec7c3	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 07:11:38 -07:00
Marc Zinnschlag	7b4d8afde7	fix to previous commit	2013-08-15 15:53:50 +02:00
Chris Robinson	fdbf09ed40	Merge remote-tracking branch 'zini/master' into ptr-improvements ... Conflicts: apps/openmw/mwworld/containerstore.cpp	2013-08-15 05:56:24 -07:00
Marc Zinnschlag	e94fcce622	accessing references via their ID now also works for references in containers in active cells	2013-08-15 14:45:13 +02:00
Chris Robinson	2853b56ed5	Throw an exception when trying to get an empty Ptr's type	2013-08-15 04:52:01 -07:00
Chris Robinson	0f2b2ff1ce	Small header cleanup	2013-08-15 01:21:43 -07:00
Chris Robinson	86f2cd5848	Use dynamic_cast to get the LiveCellRef	2013-08-14 20:26:50 -07:00
Chris Robinson	48c07fbd98	Remove some unnecessary fields from Ptr	2013-08-14 17:05:42 -07:00
Chris Robinson	74f855e948	Move common LiveCellRef fields to the base class	2013-08-14 01:55:51 -07:00
Chris Robinson	11166a1a17	Don't store the type name string in the Ptr ... This should get rid of all heap allocations caused by constructing or copying Ptr objects.	2013-08-14 00:45:28 -07:00
Chris Robinson	b6d2888c48	Avoid using boost::any in MWWorld::Ptr ... Reduces dependency on Boost, and should improve performance a bit when copying or constructing Ptr objects.	2013-08-14 00:45:27 -07:00
Marc Zinnschlag	aee0336780	Merge remote-tracking branch 'kcat/script-functions'	2013-08-14 09:05:40 +02:00
Chris Robinson	73437dfdca	GetEffect can accept an effect ID string as well	2013-08-13 19:18:21 -07:00
Chris Robinson	c1dfa980bf	Combine ShowVarsImplicit and ShowVarsExplicit ... Also removes an unnecessary else statement	2013-08-13 17:31:15 -07:00
Marc Zinnschlag	e2e76147c8	Merge remote-tracking branch 'potatoesmaster/magic'	2013-08-13 15:36:43 +02:00
Chris Robinson	30973352e8	Implement ShowVars (SV) console function	2013-08-13 04:54:41 -07:00
Chris Robinson	2353ac1739	Properly implement SetWerewolfAcrobatics	2013-08-13 04:54:41 -07:00
Emanuel Guevel	ad3646cb15	Fix spell icons displayed when effect ended	2013-08-13 04:57:45 +02:00
Emanuel Guevel	a47c76001c	Apply trap magic effects	2013-08-13 04:56:15 +02:00
Emanuel Guevel	37ea0f3fb9	Display refusal message when weapon/magic icons are clicked as werewolf	2013-08-12 15:36:16 +02:00
Emanuel Guevel	997f37700d	Display HUD icons for hidden windows	2013-08-12 15:06:09 +02:00
Emanuel Guevel	c27c33f542	Fix pinned windows hiding ... They were always displayed in console mode and in game (even if they were force hidden).	2013-08-12 15:04:41 +02:00
Chris Robinson	6fd4cdb5fb	Play randomized werewolf sounds	2013-08-11 00:53:17 -07:00
Chris Robinson	00d6690b4d	Ignore encumbrance in werewolf form ... According to UESP, inventory weight is ignored. Not sure if this includes feather and burden effects.	2013-08-10 20:25:18 -07:00
Chris Robinson	180f0d0fe9	Restart from the loop point if replaying the same animation	2013-08-09 21:25:28 -07:00
Chris Robinson	5968165de0	Merge remote-tracking branch 'zini/master' into werewolf ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2013-08-09 07:00:00 -07:00
Chris Robinson	a28c36de17	Don't count as running if not actually moving along (local) X/Y	2013-08-09 06:53:07 -07:00
Chris Robinson	c2d8eb377f	Play some appropriate sounds in werewolf form	2013-08-09 06:40:16 -07:00
Chris Robinson	db1036e5e5	Handle SetWerewolfAcrobatics	2013-08-09 05:37:56 -07:00
Chris Robinson	ae183cb3e4	Handle werewolf stats	2013-08-09 05:14:58 -07:00
Chris Robinson	72a399054f	Don't assume only players activate doors	2013-08-09 01:35:29 -07:00
Chris Robinson	46bc7bd9c8	Some cleanup since NpcStats is now also CreatureStats ... This isn't a thorough cleaning, so keep an eye out for more	2013-08-09 01:14:08 -07:00
Marc Zinnschlag	fb0b57efaa	Merge remote-tracking branch 'vorenon/bug876'	2013-08-09 09:38:10 +02:00
Chris Robinson	75b6515915	Inherit NpcStats from CreatureStats	2013-08-08 23:28:02 -07:00
Chris Robinson	89c7f5bc70	Handle object activation as a werewolf	2013-08-08 22:34:53 -07:00
Chris Robinson	6110a0ee3b	Don't allow resting as a werewolf	2013-08-08 18:30:47 -07:00
Chris Robinson	75131e6a48	Rebuild the actor after switching between werewolf forms	2013-08-08 17:16:24 -07:00
Chris Robinson	5fbfce6d1e	Don't show WerewolfRobe objects in the inventory ... Pretty ugly hard-coding, but this is likely what vanilla does since it has no option to mark clothes or armor as unplayable like Oblivion does.	2013-08-08 16:05:26 -07:00
Chris Robinson	d77d60cbc2	Remove an unneeded forceUpdate method	2013-08-08 15:37:08 -07:00
vorenon	a718a62ef5	Fix for bug 876	2013-08-09 00:06:34 +02:00
PLkolek	86020ad94d	Added underwater and drowning sounds.	2013-08-08 20:57:15 +02:00
Chris Robinson	e3d5a1b38d	Dialog function 72 is not player-specific ... It's used to force any NPC in werewolf form to play the appropriate growls for combat.	2013-08-08 06:02:16 -07:00
Chris Robinson	960ea3d96c	Add/remove a WerewolfRobe when werewolf form is toggled	2013-08-08 04:40:31 -07:00
Chris Robinson	3cff7b1e42	Don't assume icons have a period in their filename	2013-08-08 04:40:31 -07:00
Chris Robinson	1f6055d54b	Don't try to apply body skins for werewolves ... They instead use a hidden WerewolfRobe object for their body	2013-08-08 04:40:31 -07:00
Chris Robinson	946ca7f931	Return the appropriate name for werewolf NPCs	2013-08-08 04:40:31 -07:00
Chris Robinson	dfdd2dc308	Handle swimleft and swimright soundgen keys	2013-08-08 04:40:31 -07:00
Chris Robinson	109df46590	Fix werewolf claw damage multiplier	2013-08-08 04:40:31 -07:00
Chris Robinson	9694b18d1b	Update part skeletons immediately when added	2013-08-08 04:40:30 -07:00
Chris Robinson	f73578a832	Remove unnecessary mBodyPrefix field	2013-08-08 04:40:30 -07:00
Chris Robinson	5051544144	Remove some duplicate code	2013-08-08 04:40:30 -07:00
Chris Robinson	ceed2e30b8	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-08 04:40:30 -07:00
Chris Robinson	5ac82a50b7	Remove unused function	2013-08-08 04:40:30 -07:00
Marc Zinnschlag	e9521dc8f1	Merge remote-tracking branch 'potatoesmaster/pinning'	2013-08-08 13:06:58 +02:00
Emanuel Guevel	1cbfcc3910	Fix HUD weapon icon when turning from werewolf to normal ... The werewolf hand icon remained until the inventory menu was opened.	2013-08-08 10:56:44 +02:00
Chris Robinson	2bac4566c0	Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/statsextensions.cpp	2013-08-08 00:09:29 -07:00
Chris Robinson	4985e17865	Fix werewolf claw damage multiplier	2013-08-07 19:15:36 -07:00
Chris Robinson	4641737fc4	Update part skeletons immediately when added	2013-08-07 19:15:36 -07:00
Chris Robinson	dc0360b1f6	Remove unnecessary mBodyPrefix field	2013-08-07 19:15:36 -07:00
Chris Robinson	0f52ed9a9b	Remove some duplicate code	2013-08-07 19:15:36 -07:00
Chris Robinson	deee14ccfd	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-07 19:15:36 -07:00
Chris Robinson	ab44cd63a1	Remove unused function	2013-08-07 19:15:35 -07:00
Emanuel Guevel	b2e5e8dd0d	Saner inventory window pinning/hiding ... Hide inventory window pin button in container, companion and barter mode. Restore the pinned inventory window position when exiting these modes. Allow toggling windows visibility in inventory mode only.	2013-08-07 23:30:08 +02:00
Alex	b9579e085f	cleanup	2013-08-07 15:40:57 -04:00
Alex	a0931b01fe	Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg	2013-08-07 13:19:23 -04:00
Alex	c3ca5b7c32	mild cleanup	2013-08-07 13:16:20 -04:00
PLkolek	8f4506f5b6	Implemented drowning. ... Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one), the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.	2013-08-07 16:46:46 +02:00
Emanuel Guevel	48d2554ac3	Auto-equip when items are added to the inventory ... We limit that to armor pieces and clothing items. No auto-equiping for the player nor werewolves.	2013-08-07 15:17:55 +02:00
Emanuel Guevel	e0d0cdd18a	Do not auto-equip items continuously ... This was called every couple of frames.	2013-08-07 14:30:13 +02:00
Chris Robinson	076e7d8e16	Make insertBegin internal	2013-08-07 03:56:07 -07:00
Chris Robinson	2b2101958d	Destroy the scene node we create	2013-08-07 03:56:07 -07:00
Chris Robinson	0458fd5531	Remove unused/unneeded parameters	2013-08-07 03:56:06 -07:00
Emanuel Guevel	fd0a159a64	MWScript: update first unused opcode number	2013-08-07 12:05:53 +02:00
Emanuel Guevel	47b8a31317	Fixes suggested by KittyCat	2013-08-07 12:05:53 +02:00
Marc Zinnschlag	932fffd1a7	Merge remote-tracking branch 'kcat/light-objects'	2013-08-07 11:21:01 +02:00
Chris Robinson	b4b095ca72	Don't try to get the center of a null bounding box	2013-08-07 01:32:36 -07:00
Chris Robinson	80d271aeb1	Remove unused stuff	2013-08-07 01:31:01 -07:00
Chris Robinson	3555476dfd	Use Animation-derived objects for generic objects	2013-08-06 19:49:07 -07:00
Chris Robinson	a9dca21d05	Create the Animation SceneNode in the constructor	2013-08-06 19:49:05 -07:00
Chris Robinson	48784c7e2f	Use for_each and functors to avoid some for loops	2013-08-06 19:49:05 -07:00
Chris Robinson	de95926e9f	Use controllers to animate lights in ObjectLists	2013-08-06 19:49:04 -07:00
Chris Robinson	8984d8f8ee	Use a map to simplify NPC part referencing	2013-08-06 19:49:02 -07:00
Chris Robinson	e976bb16c5	Add a light for torches	2013-08-06 19:49:02 -07:00
Chris Robinson	57fb065a86	Add Ogre::Light objects to the object list ... Note that NIFs actually have NiLight-based light records which could be used to create Ogre::Light objects. However, no Morrowind NIF uses them, as far as I can tell.	2013-08-06 19:49:01 -07:00
Chris Robinson	a9cc3a2844	Ensure a valid CellStore for Ptr::isInCell	2013-08-06 19:49:01 -07:00
Chris Robinson	1f436f9886	Render torches	2013-08-06 19:49:01 -07:00
Chris Robinson	8f69c51b24	Avoid some unnecessary references	2013-08-06 19:49:00 -07:00
Chris Robinson	2c03fec4bb	Use the fatigue term for jumping	2013-08-06 19:49:00 -07:00
Chris Robinson	eab4e09566	Handle the pick/probe in the character controller	2013-08-06 19:48:59 -07:00
scrawl	3f7daa4884	Forgot to change initTerrainTextures	2013-08-07 02:58:03 +02:00
Alex	de1f423bd7	initial move of script opcodes and registerExtensions functions to components/compiler	2013-08-06 20:38:41 -04:00
scrawl	76e538c22a	Unused variable fix	2013-08-07 02:03:23 +02:00
scrawl	726c93c365	Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10	2013-08-07 01:34:17 +02:00
Marc Zinnschlag	03af7175dd	Merge remote-tracking branch 'potatoesmaster/bug-839'	2013-08-06 17:39:29 +02:00
Emanuel Guevel	c59ad62c57	Fix UndoWerewolf script instruction	2013-08-06 14:30:01 +02:00
Emanuel Guevel	5188a1c2cd	Implement script instructions Become/UndoWerewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	20d40c4368	Implement MWWorld::World::setWerewolf()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	aa563e947e	Implement MWWorld::InventoryStore::unequipAll()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	ddc92d1fbd	Set appropriate weapon icon when player is a werewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	d054366460	Permit to force hiding GUI windows	2013-08-06 12:34:35 +02:00
scrawl	4caac0d859	Fix idle animations repeating	2013-08-05 02:06:23 +02:00
vorenon	76a1abe9fa	Don't allow the use of the "jump" key while sneaking - Update	2013-08-04 20:10:33 +02:00
vorenon	56cb36caf1	Don't allow the use of the "jump" key while sneaking	2013-08-04 19:45:41 +02:00
Emanuel Guevel	71da2f0a12	Do not allow magic/combat stance unless magic/inventory window are accessible	2013-08-04 00:21:27 +02:00
Marc Zinnschlag	41b2fa985b	silenced some warnings	2013-08-03 15:26:53 +02:00
Marc Zinnschlag	9123afa863	Merge remote-tracking branch 'gus/MeleeCombat2'	2013-08-03 15:23:36 +02:00
gus	a23e7fac93	clean up	2013-08-03 13:58:16 +02:00
scrawl	982f743ddd	Fix wrong idle animations played	2013-08-03 13:13:33 +02:00
gus	c8bb32c40d	small maths correction	2013-08-03 12:29:18 +02:00
gus	a25ee360dc	use angles and GMST. not sure this work as it should	2013-08-03 12:16:51 +02:00
gus	830762722d	first attempt: hit detection with a sphere (not finished)	2013-08-03 11:26:36 +02:00
Emanuel Guevel	a9483dbdf1	Show sneak indicator when sneaking ... Temporary solution, as the indicator should be shown only when the player is not detected by any other actor.	2013-08-03 03:03:29 +02:00
Emanuel Guevel	8f8362d2c4	Expose sneak indicator widget through WindowManager	2013-08-03 03:03:29 +02:00
Emanuel Guevel	9757694060	Update sneaking indicator position with other widgets	2013-08-03 02:43:56 +02:00
vorenon	aa45127895	Adjusted swish sounds ... Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.	2013-08-02 16:33:39 +02:00
Chris Robinson	f57c829cba	Play the appropriate swish sound and follow-up animation	2013-08-02 00:21:02 -07:00
Chris Robinson	b70975a74d	Move getEvasion to CreatureStats	2013-08-02 00:21:01 -07:00
Chris Robinson	9e7d670745	Inline Class::get(const Ptr& ptr)	2013-08-02 00:20:59 -07:00
Marc Zinnschlag	ca94d1a2fb	Merge remote-tracking branch 'swick/inventorypos' ... Conflicts: apps/openmw/mwgui/inventorywindow.cpp	2013-07-31 22:16:56 +02:00
Marc Zinnschlag	24273f338b	Merge remote-tracking branch 'scrawl/master'	2013-07-31 22:12:07 +02:00
Sebastian Wick	7ed763262f	GUI mode dependent position	2013-07-31 21:40:29 +02:00
scrawl	fe51a00112	Fix the initial player inventory being added twice when starting a new game	2013-07-31 21:00:58 +02:00
scrawl	f1f6336a4a	Fixed screenshot keybinding, and make it bindable	2013-07-31 20:24:44 +02:00
Marc Zinnschlag	5cafe65cd7	Merge remote-tracking branch 'scrawl/cppcheck'	2013-07-31 20:00:35 +02:00
scrawl	d106ed3b08	Fixed alchemy	2013-07-31 19:03:51 +02:00
Marc Zinnschlag	4dfd5282ab	Merge remote-tracking branch 'kolek/enchantingwindow'	2013-07-31 19:01:49 +02:00
Marc Zinnschlag	25917b00ec	Merge remote-tracking branch 'scrawl/master'	2013-07-31 19:00:24 +02:00
scrawl	7dc30a01cd	Some changes suggested by cppcheck	2013-07-31 18:46:32 +02:00
scrawl	43e0df479e	Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping	2013-07-31 16:30:22 +02:00
PLkolek	f297c21e4d	Old door sound fades out on door open/close. Door sound is synchronised to angle on action.	2013-07-31 15:46:23 +02:00
PLkolek	8bc8c38f2d	Spell cost is updatedon every change in enchanting and spellmaking.	2013-07-31 13:33:30 +02:00
PLkolek	7fd7621458	Fixed area slider in self enchantments.	2013-07-31 12:26:34 +02:00
Marc Zinnschlag	6ce2b962e1	Merge remote-tracking branch 'scrawl/inventory'	2013-07-31 09:15:22 +02:00
Marc Zinnschlag	eedced729f	Merge remote-tracking branch 'scrawl/master'	2013-07-31 09:14:12 +02:00
Marc Zinnschlag	7639506e49	Merge remote-tracking branch 'scrawl/ai'	2013-07-31 09:07:46 +02:00
scrawl	16cacb338a	Initialize MWMechanics::AiSequence from ESM::AiPackageList	2013-07-31 00:55:08 +02:00
scrawl	45006ea193	Fix inventory/container content loading so that it's done for dynamically spawned objects as well	2013-07-31 00:02:24 +02:00
scrawl	90a5d8b6f5	Fix uninitialized AL listener position/orientation when the game is paused during the first frame	2013-07-30 23:24:18 +02:00
Marc Zinnschlag	958b0c4915	Merge remote-tracking branch 'scrawl/untilhealed'	2013-07-30 22:41:05 +02:00
scrawl	da01ec4f52	Only show the "Rest until healed" button when stats are not full	2013-07-30 22:07:27 +02:00
scrawl	04b90b7d14	Other actors no longer collide with an actor that has collision disabled	2013-07-30 22:00:48 +02:00
scrawl	472a381263	Fix health meter (again)	2013-07-30 16:09:12 +02:00
Marc Zinnschlag	3642562959	Merge remote-tracking branch 'scrawl/master'	2013-07-30 08:11:40 +02:00
scrawl	426e3ec6c6	Fix enemy health meter for creatures	2013-07-30 06:17:21 +02:00
scrawl	3961c276b8	Added enemy health meter	2013-07-30 06:00:20 +02:00
Marc Zinnschlag	e27ba55541	Merge remote-tracking branch 'swick/countdialog'	2013-07-29 21:38:04 +02:00
Sebastian Wick	40d3efc671	use cancel methid	2013-07-29 18:35:23 +02:00
Sebastian Wick	7b40e57ba1	Allow the 'Activate' key to close the countdialog window; cleanups	2013-07-29 18:27:00 +02:00
Marc Zinnschlag	90ab7b2bf5	Merge remote-tracking branch 'swick/viewmodetransission'	2013-07-29 17:08:49 +02:00
Sebastian Wick	7c24c0a64e	fix uninitialized variables	2013-07-29 16:45:35 +02:00
Sebastian Wick	d2b7cb5bb2	First/Third person transitions with mouse wheel	2013-07-29 16:43:16 +02:00
Sebastian Wick	1b310c5c5b	use SDL resolutions in the ingame settings	2013-07-29 13:34:56 +02:00
Marc Zinnschlag	3fa4a194a7	Merge remote-tracking branch 'scrawl/master'	2013-07-29 09:59:23 +02:00
scrawl	6164e5bae6	Restored window resizing	2013-07-29 02:32:08 +02:00
Chris Robinson	3744850545	Fix hand-to-hand health damage reduction	2013-07-28 16:07:09 -07:00
Chris Robinson	39507e3f0f	Decrease armor condition on successful hits	2013-07-28 15:51:17 -07:00
Chris Robinson	1af48ab6e0	Decrease weapon condition on successful hits	2013-07-28 15:17:01 -07:00
Chris Robinson	465f4d2063	Properly handle starting an animation at the end	2013-07-28 09:56:03 -07:00
Chris Robinson	54f91d4b3a	Implement hand-to-hand attacks	2013-07-28 06:48:25 -07:00
Chris Robinson	a34f0de3e1	Play the correct medium armor foot sounds	2013-07-28 04:17:36 -07:00
Chris Robinson	db4f34b332	Play hit sounds when hitting creatures and NPCs	2013-07-27 11:20:39 -07:00
Chris Robinson	1a40d01afa	Fix NPC armor rating calculation and reduce redundant lookups	2013-07-27 09:31:16 -07:00
Chris Robinson	f73008546f	Keep a sound updated with its object's position	2013-07-27 07:24:18 -07:00
Chris Robinson	c94653dc49	Implement the ModRegion script function	2013-07-27 07:10:18 -07:00
Chris Robinson	1174b85ac8	Implement Disable/EnableTeleporting script functions	2013-07-27 00:14:55 -07:00
Chris Robinson	3298eb1b37	Implement HitOnMe script function	2013-07-26 10:50:23 -07:00
Chris Robinson	5379e607cb	Handle the OnPCHitMe script variable	2013-07-26 10:50:23 -07:00
Chris Robinson	f215d2cc30	Only raise weapon skills for the player	2013-07-26 10:50:23 -07:00
Chris Robinson	bec420c69b	Add Class::onHit for creatures	2013-07-26 10:50:23 -07:00
Chris Robinson	dd6edd21f8	Add a separate on-hit method to handle objects being hit	2013-07-26 10:50:23 -07:00
Marc Zinnschlag	3fbbbdc64b	Merge remote-tracking branch 'scrawl/master'	2013-07-26 08:06:53 +02:00
Chris Robinson	a569ae367e	Fix hit chance calculation	2013-07-25 13:09:26 -07:00
Chris Robinson	6195062d72	Try to figure out what gets hit ... This isn't the greatest. The distance multiplier is a guess, and a sphere cast may be better.	2013-07-25 12:58:43 -07:00
Chris Robinson	b3a057d679	Handle hit chance and damage calculation ... Math is based on what the UESP describes, with some tweaks (using fatigue term, and the fCombatCriticalStrikeMult GMST): http://www.uesp.net/wiki/Morrowind:Combat	2013-07-25 08:15:42 -07:00
Chris Robinson	1dcc893703	Merge remote-tracking branch 'zini/master' into combat	2013-07-25 01:16:49 -07:00
Chris Robinson	4ad28ed369	Don't play a weapon-down sound when unreadying a spell	2013-07-25 00:46:20 -07:00
Chris Robinson	92cc566fdc	Rename the Class::attack method to Class::hit	2013-07-25 00:30:01 -07:00
Chris Robinson	0db02af807	Set up the weapon state in the CharacterController constructor	2013-07-24 21:08:16 -07:00
Chris Robinson	d9a9c3d6bd	Handle the "land" soundgen type	2013-07-24 10:36:04 -07:00
Chris Robinson	705498ec24	Play a swish sound when attacking	2013-07-24 10:34:53 -07:00
Chris Robinson	d8ec813939	Say something from the "hit" dialog topic when losing health	2013-07-24 10:02:50 -07:00
Chris Robinson	59f1bc7542	Use time values for the aniamtion's start, stop, and loop points ... This seems to be closer to the expected behavior. This more cleanly handles 0- length animations, especially where the start marker comes after the stop marker while still being on the same time key.	2013-07-24 08:38:36 -07:00
Chris Robinson	bf1d907d07	Don't play casting animations for enchantments	2013-07-24 05:39:15 -07:00