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		2018-07-04 01:52:29 +03:00
..
model	Editor: limit FPS in 3D preview windows (feature #3641)	2018-07-02 12:20:34 +04:00
view	Merged pull request #1791	2018-07-03 09:37:51 +02:00
CMakeLists.txt	Select dragged texture-assets, add brush settings widget-type, fixes.	2018-05-10 11:18:54 +03:00
editor.cpp	Do the same for the CS	2017-10-18 02:04:48 +01:00
editor.hpp	VFS changes, one VFS and resource system per document.	2017-08-21 22:31:19 -04:00
main.cpp	[macOS] Move all configs & resources into app bundles	2016-11-23 22:32:54 +01:00
Networking.cpp	Add OpenMW-mp target	2016-01-04 20:15:55 +08:00