558 commits

Author	SHA1	Message	Date
scrawl	e68600eda2	Make Activate instruction work properly even when onActivate was not called in the same frame. ... There are two major differences to the old implementation: - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low. - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action. Fixes #1166 and #1346.	2014-05-28 19:23:50 +02:00
scrawl	3e2eed9269	Implement getFactionReaction function ... Strange bug when using value != 0 for the garbage argument?	2014-05-27 15:23:22 +02:00
scrawl	e266c39c5d	Implement modFactionReaction instruction (Closes #1347)	2014-05-27 14:54:29 +02:00
scrawl	578adb4ef6	PcJoinFaction and friends: make sure the given faction exists	2014-05-27 13:54:25 +02:00
scrawl	10d835a55c	Some more missing isInCell checks	2014-05-25 15:07:35 +02:00
scrawl	f3ba31de2d	Merge branch 'master' of https://github.com/OpenMW/openmw ... Conflicts: apps/openmw/mwscript/cellextensions.cpp	2014-05-25 14:58:47 +02:00
scrawl	039398c8ae	Basic RefData and CellRef change tracking ... Wrapped item charge handling in getItemHealth function	2014-05-25 14:30:07 +02:00
cc9cii	4f94a31b54	Fix crash starting a new game.	2014-05-25 07:50:19 +10:00
scrawl	b47b2b84f3	Merge branch 'master' of https://github.com/OpenMW/openmw ... Conflicts: apps/openmw/mwdialogue/filter.cpp apps/openmw/mwgui/waitdialog.cpp	2014-05-23 08:39:48 +02:00
Emanuel Guevel	1e4a854433	Remove static method MWWorld::Class::get(&Ptr) ... It was just adding a level of indirection to Ptr.getClass(). All the call were replaced by that instead. The number of lines changed is important, but the change itself is trivial, so everything should be fine. :)	2014-05-22 20:50:00 +02:00
scrawl	3a7e2f8bb5	Allow invoking Journal instruction with non-existing index ... This is used by the MG_EscortScholar1 quest.	2014-05-21 14:18:14 +02:00
scrawl	6bd0bbb8df	Do not load (0,0) on new game	2014-05-19 14:09:16 +02:00
Marc Zinnschlag	56c4367c1a	Merge remote-tracking branch 'mrcheko/master'	2014-05-18 18:42:23 +02:00
mrcheko	e1249f6a31	actor handle and id confusing fix	2014-05-18 20:13:46 +04:00
Marc Zinnschlag	f7c89015f9	Merge remote-tracking branch 'scrawl/master'	2014-05-17 11:50:31 +02:00
scrawl	36d9ae17cc	Revert "Change all AI packages (except AiActivate) to use ActorIds" ... Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..) This reverts commit 2e9985c1a3.	2014-05-16 12:11:34 +02:00
scrawl	028e00c98f	Add missing status report for some toggle commands	2014-05-16 09:21:28 +02:00
Marc Zinnschlag	3b2ba4f6cd	Merge remote-tracking branch 'scrawl/master'	2014-05-15 14:25:36 +02:00
scrawl	2e9985c1a3	Change all AI packages (except AiActivate) to use ActorIds ... More robust in case the target changes cell or there are multiple targets with the same RefId	2014-05-15 09:54:10 +02:00
slothlife	f33559fead	Fixes for MSVC warnings, less overall changes ... Kept some fixes from the first round of review. Found out that several targets weren't being built with the same basic warnings disabled. Disabled a few warnings for external libraries specifically, rather than applying them to all targets.	2014-05-14 20:12:52 -05:00
slothlife	c160a04ede	Revert "Fixes for warnings when building with MSVC" ... This reverts commit 46eb20b98c.	2014-05-14 00:03:30 -05:00
slothlife	46eb20b98c	Fixes for warnings when building with MSVC ... Most warnings are innocuous (wrong type-specifier for forward declarations, conversion of literals into unsigned integers, warnings about methods optimized out), but I believe actual bugs were revealed in vartypedelegate.cpp and combat.cpp.	2014-05-09 08:32:52 -05:00
scrawl	dd9117809d	Say an attack phrase when combat starts ... Move combat start to a helper method Added some todo comments	2014-05-06 00:13:31 +02:00
scrawl	1fd7a07b5e	Merge branch 'master' of https://github.com/OpenMW/openmw into return ... Conflicts: apps/openmw/mwmechanics/aisequence.cpp apps/openmw/mwmechanics/aiwander.cpp	2014-04-29 09:14:13 +02:00
scrawl	9b36a13821	Feature #1289: NPCs return to default position ... Make stationary NPCs return to their previous position once combat/crime AI finishes.	2014-04-29 09:09:51 +02:00
Marc Zinnschlag	3013c34d9b	Merge remote-tracking branch 'scrawl/master'	2014-04-28 21:46:05 +02:00
scrawl	7f37f2c2be	Fixes #1187: Make GetDistance handle actors in remote cells gracefully	2014-04-28 19:23:25 +02:00
Thomas	885228ec02	Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/openmw/mwmechanics/actors.cpp	2014-04-28 12:27:57 -04:00
scrawl	84961d7843	Fixes #1254: PcRank should return first rank if not in the faction	2014-04-28 15:31:18 +02:00
scrawl	b2119441b9	Fix bug in PcRank / PcNextRank ... It was using the first faction instead of the actor's faction.	2014-04-28 15:26:40 +02:00
scrawl	27a05027f4	Fixes #1172: Added basic loading/saving progress bar ... The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.	2014-04-28 11:29:57 +02:00
Thomas	c2127845af	Added onKnockdown command	2014-04-27 20:54:22 -04:00
scrawl	f921f2e7db	Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. ... This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.	2014-04-26 12:04:37 +02:00
Thomas	f6deca7c80	Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors	2014-04-23 13:02:51 -04:00
Thomas	61341d4206	Removed mLocked, kept it as "Negative lock level means unlocked"	2014-04-23 10:00:18 -04:00
Thomas	420163d35f	Small changes to lock command (If no valid lockLevel exists, defaults to 100)	2014-04-23 05:19:34 -04:00
Thomas	cac8e52154	Seperated locked and lock level, to allow for relocking doors to previous lock level. ... The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.	2014-04-23 05:12:07 -04:00
Marc Zinnschlag	a91b386381	Merge remote-tracking branch 'jeffreyhaines/master'	2014-04-20 13:34:58 +02:00
Jeffrey Haines	6733a1541e	Fixes to Crime System ... Victimless crimes were removed because victims may not exist in the case of stealing items. Is class now uses case insensitive comparison. Fixed issue with confiscation of stolen items.	2014-04-19 19:03:31 -04:00
Marc Zinnschlag	86e65944b8	Merge remote-tracking branch 'jeffreyhaines/master' ... Conflicts: apps/openmw/CMakeLists.txt	2014-04-15 11:31:48 +02:00
Jeffrey Haines	940c88d2ec	Cleaned up code, implemented crime ids ... There is a problem with my game freezing. ToggleAi stops my character	2014-04-05 10:26:14 -04:00
Jeffrey Haines	b1abef7a38	Cleaned up code	2014-04-03 01:07:56 -04:00
Jeffrey Haines	58b135a2be	Crime is now checked every frame call	2014-04-03 00:50:09 -04:00
Jeffrey Haines	6f1211dd8d	Moved mWitnesses into Player. resetCrime for paying fine.	2014-04-02 12:23:38 -04:00
Jeffrey Haines	7c0b51fb7e	Ai pursue now controls guards pursuit of crimes ... Should extend AiActivate in the future	2014-04-02 00:18:22 -04:00
Jeffrey Haines	4037f3705e	Feature 1154 & 73: NPCs react to crime	2014-04-01 14:15:55 -04:00
scrawl	5906d795c0	Refactored video player (now a MyGUI widget)	2014-03-27 19:10:15 +01:00
scrawl	793649c854	ToggleAI: Report current status on toggle	2014-03-26 19:55:52 +01:00
scrawl	c8c0e5de38	Fixed code issues found with unity build. Missing include guards, duplicated functions, ...	2014-03-16 23:49:06 +01:00
cc9cii	b2e3fa70c2	Fix spelling errors in comments.	2014-03-14 07:04:39 +11:00