You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # README.md # apps/openmw/mwgui/quickkeysmenu.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/combat.cpp		7 years ago
..
dialoguemanagerimp.cpp	Merge pull request #456 from OpenMW/master while resolving conflicts	7 years ago
dialoguemanagerimp.hpp	Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts	7 years ago
filter.cpp	Allow partial matches in NotCell condition (fixes #4459)	7 years ago
filter.hpp	Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577)	8 years ago
hypertextparser.cpp	…
hypertextparser.hpp	…
journalentry.cpp	…
journalentry.hpp	…
journalimp.cpp	Merge pull request #389 from OpenMW/master	7 years ago
journalimp.hpp	[Client] Only send PlayerJournal packets for new journal entries	8 years ago
keywordsearch.cpp	…
keywordsearch.hpp	…
quest.cpp	…
quest.hpp	…
scripttest.cpp	…
scripttest.hpp	…
selectwrapper.cpp	Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577)	8 years ago
selectwrapper.hpp	…
topic.cpp	…
topic.hpp	…