7 commits

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	2018-08-20 14:08:44 +03:00
Andrei Kortunov	5b92910829	Limit difficulty scaling, as mentioned in docs	2018-07-31 21:14:16 +04:00
David Cernat	ebf7740969	[General] Repurpose GameConsole packet as GameSettings & add difficulty to it	2017-06-20 05:28:45 +03:00
David Cernat	1ae5bd19e1	[Client] Don't set difficulty based on client settings	2017-06-10 15:29:09 +03:00
Allofich	b1be3596dc	Cleanup of #include statements	2016-06-18 10:56:28 +09:00
dteviot	77a1d947cc	extracted MWMechanics::getPlayer()	2015-08-21 21:12:39 +12:00
scrawl	28a0899d2b	Implement difficulty scaling (Fixes #1505)	2014-07-20 16:38:20 +02:00