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
..
utils	Add autocomplete to the "Start default character at" field	2018-04-07 21:27:36 -05:00
advancedpage.cpp	Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"	2018-06-28 20:13:18 -05:00
advancedpage.hpp	Fixing bug with autocomplete not loading correctly during startup	2018-06-03 16:58:18 -05:00
CMakeLists.txt	Merged pull request #1623	2018-06-09 10:49:04 +02:00
datafilespage.cpp	Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged	2018-06-08 19:18:23 -05:00
datafilespage.hpp	Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged	2018-06-08 19:18:23 -05:00
graphicspage.cpp	Moving csignal import from main to graphicspage	2018-06-14 22:16:35 -05:00
graphicspage.hpp	Move SDL initialization from main.cpp to graphicspage.cpp	2018-06-14 19:39:24 -05:00
main.cpp	Moving csignal import from main to graphicspage	2018-06-14 22:16:35 -05:00
maindialog.cpp	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00
maindialog.hpp	Adding panel for advanced settings.cfg options	2018-01-28 22:49:49 -06:00
playpage.cpp	OS X: remove QPlastiqueStyle usage	2015-11-14 13:50:01 +01:00
playpage.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
settingspage.cpp	Moving testing options to Advanced page	2018-03-15 22:11:54 -05:00
settingspage.hpp	Moving testing options to Advanced page	2018-03-15 22:11:54 -05:00
textslotmsgbox.cpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
textslotmsgbox.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00