Commit Graph

7349 Commits (0c2843b0f7e081bfe64c9362f4101462f1223a2d)

Author SHA1 Message Date
Marc Zinnschlag 0c2843b0f7 some missing cleanup 11 years ago
Marc Zinnschlag 9a1b5dc1c6 a bit of cleanup 11 years ago
Marc Zinnschlag f6a876bc3d added actor ID 11 years ago
Marc Zinnschlag 2906ade531 string fix 11 years ago
Marc Zinnschlag 4eeed4e2c7 Merge remote-tracking branch 'scrawl/return' 11 years ago
scrawl 28ef236f0e Don't allow setting a new return position if there already is one and we haven't reached it yet 11 years ago
Marc Zinnschlag 8fea2cfa2a Merge remote-tracking branch 'mrcheko/master' 11 years ago
scrawl 1fd7a07b5e Merge branch 'master' of https://github.com/OpenMW/openmw into return
Conflicts:
	apps/openmw/mwmechanics/aisequence.cpp
	apps/openmw/mwmechanics/aiwander.cpp
11 years ago
scrawl 9b36a13821 Feature #1289: NPCs return to default position
Make stationary NPCs return to their previous position once combat/crime AI finishes.
11 years ago
scrawl 3780503275 Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar 11 years ago
Marc Zinnschlag 3013c34d9b Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 7a0aeeaa38 Allow to delete savegames (shift + click) 11 years ago
scrawl 7f37f2c2be Fixes #1187: Make GetDistance handle actors in remote cells gracefully 11 years ago
Marc Zinnschlag 2e7b4e798e Merge remote-tracking branch 'digmaster/master' 11 years ago
scrawl a35f7c73ae Fixes #1286 (Dialogue topic list clips with window frame)
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
11 years ago
scrawl 518a32c19d Fixes #1195: Make NPCs equip torches in interiors under certain conditions 11 years ago
Thomas 885228ec02 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
11 years ago
Lars Söderberg 04e5b9c72c Right aligned version/revision
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
11 years ago
scrawl 84961d7843 Fixes #1254: PcRank should return first rank if not in the faction 11 years ago
scrawl b2119441b9 Fix bug in PcRank / PcNextRank
It was using the first faction instead of the actor's faction.
11 years ago
Marc Zinnschlag 421679b319 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 7e4a0c2478 Removed asserts 11 years ago
mrcheko 35c1724d39 unblock vertical aiming for combatants 11 years ago
scrawl 0796815da0 Ignore dead actors in getActorsFollowing/Fighting
Prevents dead enemies from disallowing resting near them
11 years ago
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.
11 years ago
Marc Zinnschlag 0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 11 years ago
Marc Zinnschlag af322a9f77 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 1da99d9fc7 Remove unused variable 11 years ago
scrawl b89463db09 Fix #1207: Remember previous choice in class creation dialog 11 years ago
scrawl 1da19585dc Remove some unneeded includes 11 years ago
Thomas dc54bd5a5f Merge remote-tracking branch 'upstream/master' 11 years ago
Thomas c2127845af Added onKnockdown command 11 years ago
Thoronador f69d61976e minor performance improvements in other apps subdirectories 11 years ago
mrcheko 22cdb166f2 warning fix, vars renaming 11 years ago
Thoronador 1b8c975d5b minor performance improvements in apps/openmw
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
11 years ago
Marc Zinnschlag ca097e146b Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
Jeffrey Haines edbc319c42 fixed logic. || 11 years ago
Jeffrey Haines 52bb7c3f69 fixed logic. ! 11 years ago
Jeffrey Haines 7599b26d30 Fixed: creatures won't witness crimes
and potential crash.
11 years ago
Jeffrey Haines 0409e18a0e revert 11 years ago
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 d92f95f5bf Fix a stacking issue 11 years ago