mrcheko
82121e0401
some checks reworked
2014-04-27 16:59:21 +04:00
scrawl
e42855d522
Minor fix for spell icon
2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a
merge master
2014-04-27 13:49:31 +04:00
Marc Zinnschlag
85dbf393d2
Merge remote-tracking branch 'graffy76/master'
2014-04-27 11:44:15 +02:00
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).
2014-04-27 09:43:54 +02:00
scrawl
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
3161647809
Fix for not being able to pick up scrolls during combat
...
This is the behaviour I observed in vanilla morrowind.
2014-04-27 09:15:37 +02:00
scrawl
14757a856b
Tweak settings window size and encumbrance bar text align
2014-04-27 08:17:14 +02:00
scrawl
dd14dec8dc
Tweak loading screen progress bar positioning to match vanilla
2014-04-27 08:16:35 +02:00
scrawl
d92f95f5bf
Fix a stacking issue
2014-04-27 06:08:15 +02:00
scrawl
93b76a603b
Fixes #1100 : Looting a corpse is no longer considered stealing
2014-04-27 06:08:08 +02:00
graffy76
985af15a12
removed qdebug references
2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0
Converted SettingType enums to indicate widget type.
2014-04-26 21:32:36 -05:00
scrawl
e8210c92c6
Fixes #1240 : Don't hardcode drowning time
2014-04-27 04:27:26 +02:00
graffy76
b94466dbb4
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-04-26 21:24:02 -05:00
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.
2014-04-27 07:38:31 +10:00
Thomas
c2b692e124
getActorsFollowing/Fighting no longer returns dead actors
2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0
code refining + minor fixes
2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4
Merge remote-tracking branch 'scrawl/master'
2014-04-26 18:05:04 +02:00
scrawl
04964595ef
Fixes #1270 , Fixes #1201 : Update active weapon/spell icons every frame
2014-04-26 16:44:20 +02:00
graffy76
ab33e78b67
Added RangeView class files
2014-04-26 09:40:58 -05:00
Jeffrey Haines
13416a3501
Merge pull request #1 from OpenMW/master
...
merge into my branch
2014-04-26 10:10:17 -04:00
Jeffrey Haines
b28dfa94cd
Revert 4a4c089..f0c5d1a
...
This rolls back to commit 4a4c08946c
2014-04-26 10:07:56 -04:00
Jeffrey Haines
f0c5d1a7e1
Revert "Checks the state of the passed sneak variable"
...
This reverts commit 4a4c08946c
2014-04-26 10:03:56 -04:00
scrawl
d5dd864404
Fixes #1236 : Disable all controls while playing movie
2014-04-26 14:33:45 +02:00
Jeffrey Haines
48b2c0073b
fix, sorry for being sloppy..
2014-04-26 08:29:28 -04:00
Jeffrey Haines
afe624bd07
Cleaned up update in Actors.cpp
...
Removed unnecessary for loops
2014-04-26 08:12:57 -04:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
Marc Zinnschlag
ddb0496dca
replaced return value of removeDocument with a signal
2014-04-26 13:11:27 +02: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
scrawl
ef39b0f6ab
Fixes #1291 : Faction rank saving issue
...
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b
Fixes #1295 : Support partial matches in Cell filter
2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb
Fixes #1296 : Streamlined cellChanged detection
2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7
Fix dynamically placed objects being discarded when loading game
2014-04-26 05:01:26 +02:00
scrawl
f05606657c
Correctly insert pasted text at cursor position
2014-04-26 05:01:26 +02:00
scrawl
91e50585ff
AiWander: make sure to walk, not run
2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7
Fix a crash after loading game
2014-04-26 05:01:26 +02:00
mrcheko
f3626adc86
remake of z-moving in combat for flying/swimming enemies
2014-04-26 00:20:55 +04:00
Marc Zinnschlag
42b332775a
removed some debug statements
2014-04-25 15:30:46 +02:00
Marc Zinnschlag
c63d6437c0
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
2014-04-25 15:29:23 +02:00
Marc Zinnschlag
837fd2a4c6
Merge remote-tracking branch 'graffy76/master'
2014-04-25 15:11:19 +02:00
graffy76
2e06414b43
Fixed broken delegate display modes (Display Format settings). Moved
...
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
Marc Zinnschlag
1f6ed584c2
Merge remote-tracking branch 'digmaster/master'
...
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c
Checks the state of the passed sneak variable
2014-04-24 23:02:11 -04:00
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.
2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5
Reworked the accusation of actors
2014-04-24 22:41:05 -04:00
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
2014-04-24 20:40:17 -04:00
graffy76
3f2ae950f5
Disabled view resize for open views when user setting changes. Fixed
...
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
Marc Zinnschlag
dbb192f084
moved loading to a separate thread
2014-04-24 15:09:25 +02:00
