Commit Graph

9974 Commits (openmw-30)
 

Author SHA1 Message Date
Jeffrey Haines b9bd4bc126 broken 11 years ago
Jeffrey Haines ce106d3bec Revert "NPCs detect crime exclusively"
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
11 years ago
mrcheko 82121e0401 some checks reworked 11 years ago
scrawl e42855d522 Minor fix for spell icon 11 years ago
mrcheko 6a3dddfb9a merge master 11 years ago
Marc Zinnschlag 85dbf393d2 Merge remote-tracking branch 'graffy76/master' 11 years ago
scrawl 3eb1e4e117 Fixes #1241: Removed disposition-based combat conditions
The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.

The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.

Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.

Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
11 years ago
scrawl dac0b7090a Get rid of bigbars.png and smallbars.png
Changed loading bar colour to match vanilla
11 years ago
scrawl 3161647809 Fix for not being able to pick up scrolls during combat
This is the behaviour I observed in vanilla morrowind.
11 years ago
scrawl 14757a856b Tweak settings window size and encumbrance bar text align 11 years ago
scrawl dd14dec8dc Tweak loading screen progress bar positioning to match vanilla 11 years ago
scrawl d92f95f5bf Fix a stacking issue 11 years ago
scrawl 93b76a603b Fixes #1100: Looting a corpse is no longer considered stealing 11 years ago
graffy76 985af15a12 removed qdebug references 11 years ago
graffy76 0d711e51b0 Converted SettingType enums to indicate widget type. 11 years ago
scrawl e8210c92c6 Fixes #1240: Don't hardcode drowning time 11 years ago
graffy76 b94466dbb4 Merge branch 'master' of https://github.com/OpenMW/openmw
merge
11 years ago
cc9cii 1fb2c8d87b NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented. 11 years ago
Thomas c2b692e124 getActorsFollowing/Fighting no longer returns dead actors 11 years ago
mrcheko dbe1307de0 code refining + minor fixes 11 years ago
Marc Zinnschlag 5e7cd806c4 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 11 years ago
graffy76 ab33e78b67 Added RangeView class files 11 years ago
Jeffrey Haines 13416a3501 Merge pull request #1 from OpenMW/master
merge into my branch
11 years ago
Jeffrey Haines b28dfa94cd Revert 4a4c089..f0c5d1a
This rolls back to commit 4a4c08946c.
11 years ago
Jeffrey Haines f0c5d1a7e1 Revert "Checks the state of the passed sneak variable"
This reverts commit 4a4c08946c.
11 years ago
scrawl d5dd864404 Fixes #1236: Disable all controls while playing movie 11 years ago
Jeffrey Haines 48b2c0073b fix, sorry for being sloppy.. 11 years ago
Jeffrey Haines afe624bd07 Cleaned up update in Actors.cpp
Removed unnecessary for loops
11 years ago
scrawl 30666f2cce Fixes #1297: Store global map markers in savegame 11 years ago
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.
11 years ago
scrawl ef39b0f6ab Fixes #1291: Faction rank saving issue
A value of 0 is the first rank, -1 means not a member
11 years ago
scrawl 45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 11 years ago
scrawl b13b25dd1b Fixes #1295: Support partial matches in Cell filter 11 years ago
scrawl 6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 11 years ago
scrawl cd1b4218e7 Fix dynamically placed objects being discarded when loading game 11 years ago
scrawl f05606657c Correctly insert pasted text at cursor position 11 years ago
scrawl 91e50585ff AiWander: make sure to walk, not run 11 years ago
scrawl 5b011e43a7 Fix a crash after loading game 11 years ago
mrcheko f3626adc86 remake of z-moving in combat for flying/swimming enemies 11 years ago
Marc Zinnschlag 42b332775a removed some debug statements 11 years ago
Marc Zinnschlag c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
11 years ago
Marc Zinnschlag 837fd2a4c6 Merge remote-tracking branch 'graffy76/master' 11 years ago
graffy76 2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved
UserSetting update functions to DataDisplayDelegate.
11 years ago
Marc Zinnschlag 1f6ed584c2 Merge remote-tracking branch 'digmaster/master'
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
11 years ago
Jeffrey Haines 4a4c08946c Checks the state of the passed sneak variable 11 years ago
Thomas f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
11 years ago
Jeffrey Haines 42b879a9a5 Reworked the accusation of actors 11 years ago
Jeffrey Haines c3e08916da Sneak: Added support for state checking
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
11 years ago
graffy76 3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
11 years ago