Commit Graph

72 Commits (0.7.1-build-fixes)

Author SHA1 Message Date
David Cernat b57c0bcafe Add OpenMW commits up to 6 June 2019
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
Andrei Kortunov f775f7977b Fix RaiseRank/LowerRank script functions (feature #4316) 6 years ago
David Cernat 4b30a44816 [Client] Compare crimeTime and deathTime when NPCs forgive player crimes
Previously, all crime witnesses stopped being hostile to a respawning player for as long as the player's diedSinceArrestAttempt was true. That meant that, in an area with no guards to arrest the player, crime witnesses did not enage in combat with the player at all ever again until diedSinceArrestAttempt became false.

This commit makes it so the time of the last crime is recorded for each witness, and that is then compared with the time of the LocalPlayer's last death for a one-time crime forgiveness during that player's current life.

This is essentially a gameplay adjustment for "singleplayer with respawns," and will have to be reworked to make sense for every player in multiplayer, though that requires reworking the crime system as a whole and is thus on hold.
7 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
7 years ago
Capostrophic 4f64ba7b7f Implement sBookSkillMessage GMST 7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 8 years ago
David Cernat 15a4602482 Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats 8 years ago
David Cernat 8fbc6f31f1 Add setLevelProgress function to OpenMW's NpcStats 8 years ago
MiroslavR dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 9 years ago
scrawl 44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves
Still need to deal with save files.
10 years ago
Alexander "Ace" Olofsson d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 10 years ago
scrawl f0b1d889c0 ESSImport: import player skill progress 10 years ago
scrawl ae77eacd7e Skill progress refactoring 10 years ago
scrawl 2346c3528d Remove NpcStats::mProfit and store it in the script instead
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
10 years ago
scrawl 431f540791 ESSImport: fix NPC factions 10 years ago
scrawl eede2c8e55 ESSImport: convert breath meter and skill increases 10 years ago
scrawl 14aacf9a72 Add comment 10 years ago
scrawl 1869d37cfc Remove unused mLastDrowningHit 10 years ago
scrawl c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 10 years ago
scrawl 40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
10 years ago
scrawl 7714192e28 Remove wrong comment 11 years ago
scrawl 4138c3e966 Reuse health of previous level rather than recalculating initial health (Fixes #1787) 11 years ago
scrawl 1dc9e151cb Count werewolf kills (Fixes #1525) 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
Jeffrey Haines 940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
11 years ago
Marc Zinnschlag b0532e0c85 store NPC state in saved game files 11 years ago
scrawl cc40cec395 Move levelup to NpcStats
The code came from back in the days where NpcStats did not derive from CreatureStats.
11 years ago
scrawl 13646a651b Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats. 11 years ago
scrawl 69ca03c308 Issue #777: Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons. 11 years ago
scrawl da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 11 years ago
scrawl 19d63f392f Clean up the NpcStats expelled interface. Show message box when expelled. 11 years ago
scrawl f4517c8221 For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire 11 years ago
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. 11 years ago
scrawl 32ff3b530c Change all instances of skill/attribute values to use an appropriate typedef. 11 years ago
Chris Robinson 39af9a13fa Remove some unused functions 12 years ago
Chris Robinson ae183cb3e4 Handle werewolf stats 12 years ago
Chris Robinson 46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
12 years ago
Chris Robinson 75b6515915 Inherit NpcStats from CreatureStats 12 years ago
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.
12 years ago
Chris Robinson cc8e8c1272 Use the attack strength as determined by how long the attack was held 12 years ago
scrawl b0199c703c Companion UI 12 years ago
Marc Zinnschlag 9669eed083 Issue #219: added last missing function filters 12 years ago
Marc Zinnschlag 77ba8c5117 Issue #219: implemented rank requirement filter 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago
Marc Zinnschlag 7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 12 years ago
Marc Zinnschlag e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 12 years ago
Marc Zinnschlag a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
Marc Zinnschlag 0727d943b1 Merge branch 'next' into bountydisease
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
12 years ago