Commit Graph

7 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Andrei Kortunov 5b92910829 Limit difficulty scaling, as mentioned in docs 6 years ago
David Cernat ebf7740969 [General] Repurpose GameConsole packet as GameSettings & add difficulty to it 7 years ago
David Cernat 1ae5bd19e1 [Client] Don't set difficulty based on client settings 7 years ago
Allofich b1be3596dc Cleanup of #include statements 8 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
scrawl 28a0899d2b Implement difficulty scaling (Fixes #1505) 10 years ago