Commit Graph

154 Commits (0.7.1-build-fixes)

Author SHA1 Message Date
Marc Zinnschlag 94ae222f0e Merge branch 'settings' 10 years ago
Marc Zinnschlag 5a1ce4943e added advance 3D rendering user settings section 10 years ago
Marc Zinnschlag 8a05c0e5c0 fixed overlay singleton 10 years ago
Marc Zinnschlag 4b921c3876 user settings cleanup 10 years ago
cc9cii 094f046087 Convert OverlaySystem to a OpenCS style singleton. 10 years ago
cc9cii aff6f6fdb2 Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation. 10 years ago
cc9cii 1d0ac3b4df Delete Ogre::OverlaySystem before Ogre::Root 10 years ago
cc9cii 809b8c6d5b Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
10 years ago
Thoronador deb6452e0d fix uninitialized pointer fields in CS::Editor class 10 years ago
cc9cii bfd10a03c0 User configuration manager's resource directory. 10 years ago
cc9cii a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 10 years ago
cc9cii a1c0ec2feb Repair collateral damage from a purging session gone out of control. 10 years ago
cc9cii 111a35bc38 More strip back. 10 years ago
cc9cii d5c8ff7d73 More removal. 10 years ago
cc9cii 61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 10 years ago
cc9cii 66852d5392 Code cleanup and revert incorrect settings. 10 years ago
cc9cii 970f3609c9 Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments. 10 years ago
cc9cii fc8d6da6a2 Added more shader settings. 10 years ago
cc9cii 02f8f54192 Fixed checkbox behaviour. Added some shader settings. 10 years ago
cc9cii 52354b14fc Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled. 10 years ago
cc9cii d9b0c81299 Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later. 10 years ago
cc9cii 62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 10 years ago
cc9cii 9dc4af69c6 Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible. 10 years ago
cc9cii cb15750e40 Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway. 10 years ago
cc9cii e3da37567b Cleaned up and got some signals going. 10 years ago
cc9cii d679e0e012 Made more progress. Grey out disabled settings. 10 years ago
cc9cii ffaca7a875 GUI added, but not yet functional. 10 years ago
cc9cii 0ec20b23aa Initial working version. Video/rendering options supported. No GUI yet. 10 years ago
Marc Zinnschlag 10fa205ced fixed --data switch (was missing composing option) 10 years ago
Marc Zinnschlag a9f9dec923 consider script blacklist in OpenCS verifier 11 years ago
Marc Zinnschlag 879ab49e9c added resources manager 11 years ago
Marc Zinnschlag 8279d307c4 text encoding configuration (was using hardcoded settings before) 11 years ago
Marc Zinnschlag 5b5bf6f37e removed a redundant (and unsufficiently configured) copy of ConfigurationManager 11 years ago
Marc Zinnschlag 6eff5ecaad Merge branch 'operations' into load
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
11 years ago
graffy76 a17cb1f389 Fixed opencs.ini formatting 11 years ago
graffy76 475214ab62 Implmented QSettings for loading / saving file definitions. Also
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
11 years ago
Marc Zinnschlag 2906ade531 string fix 11 years ago
Marc Zinnschlag ddb0496dca replaced return value of removeDocument with a signal 11 years ago
graffy76 4b607d658f Re-link user settings to editor main application 11 years ago
Marc Zinnschlag e324450118 replaced return value of DocumentManager::addDocument with a signal 11 years ago
Marc Zinnschlag fc8ae2b9b5 fixed encoding problems 11 years ago
Marc Zinnschlag c36dfef972 prewview subview 11 years ago
Marc Zinnschlag 2b17f5dde9 register resources locations on editor startup 11 years ago
Marc Zinnschlag 6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 11 years ago
Marc Zinnschlag 7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 11 years ago
Marc Zinnschlag b19b277f18 temporarily disable OGRE-integration in OpenCS (need to sort out path problem first) 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
Nikolay Kasyanov 9fabae5198 OS X: force Cocoa API for Ogre windows in OpenCS 11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
graffy76 dace904490 changed game/addon to content for writing to openmw.cfg from launcher 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
graffy76 0cb591e4f6 Fixed path problem with adjuster widget and local data path. 11 years ago
graffy76 ea7a8eb2a4 last commit 11 years ago
graffy76 9b483c3ae3 Fix for file path issues 11 years ago
graffy76 ba365ff49e Fixed merge conflicts with saving branch 11 years ago
graffy76 9ce4a04a2d merge from saving
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
11 years ago
graffy76 2ca7f24731 Fixed filedialog new / edit content path issue 11 years ago
graffy76 b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 11 years ago
graffy76 ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for"
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 11 years ago
Marc Zinnschlag 3146af34d6 some fixes for the merged filter branch 11 years ago
Marek Kochanowicz b23df42817 Removed old comment. Changed to set resources path correctly. 11 years ago
Marek Kochanowicz 184456892b Added check to load custom filters set when present. 11 years ago
Marek Kochanowicz 4e26a61db3 Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path. 11 years ago
Marek Kochanowicz a7002e8a09 Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work. 11 years ago
Marek Kochanowicz 3000386443 failed attempt on switch adding. 11 years ago
graffy76 4c72a9ffdf Fixed non-loading files 11 years ago
graffy76 00c78a4aa1 Implementing ContentSelector class in DataFilesPage
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
graffy76 24b167b755 Implemented ContentSelector as a singleton "charm" modifier for
FileDialog...
11 years ago
Marc Zinnschlag 6143ec33e0 giving Documents direct access to ConfigurationManager 11 years ago
Marc Zinnschlag 5779f799ab create project file when saving content file 11 years ago
Marc Zinnschlag 74d683b530 fixed save path for newly created addons 11 years ago
Marc Zinnschlag 63e0cf5154 fixed missing initialisation of adjuster widget in file dialogue 11 years ago
graffy76 cfdc19c427 Renamed esxSelector to contentSelector
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
Marc Zinnschlag e9f14449eb added AdjusterWidget 11 years ago
Marc Zinnschlag 25b7cd33ea added FileWidget; fixed OpenCS configuration 11 years ago
Marc Zinnschlag ecedb60169 splitting new game and new addon functions (new game currently not working) 11 years ago
Marc Zinnschlag cae5eb424d cleaned up opening the settings dialogue from a view 11 years ago
Marc Zinnschlag 0e81fb32dd hooked up edit config signal from startup window 11 years ago
Marc Zinnschlag 17bf7e59a4 added proper startup dialogue (still missing icons) 11 years ago
Marc Bouvier 784cba21f2 [Feature #881] Change Tabs to Spaces
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
11 years ago
Marc Bouvier 6b11f59ed4 [Feature #881] Rename QLocalServer
The server name should be more unique to the project so there isn't a
interprocess clash.
11 years ago
Marc Bouvier 0ae2bb2fae [Feature #881] Code Formatting
Code formatted to the OpenMW policy.
11 years ago
Marc Bouvier 563bd0b430 [Feature #881] Raise OpenCS New Window After Re-execution
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
11 years ago
Marc Bouvier 51332b86a1 [Feature #811] Only 1 Instance of OpenCS is Allowed
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
11 years ago
Marc Bouvier 2e8b0cf502 Remove Directory Paths in Qt Classes Includes
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
12 years ago
graffy76 101c147217 Final changes for record status icon feature, incl. window size user
preference

1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
12 years ago
Glorf 548f4d683f Globalization of user settings 12 years ago
graffy76 c17821e6c8 Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose 12 years ago
Pieter van der Kloet 7504ae675b Implemented a file dialog for the editor using launcher .ui 12 years ago
graffy76 6911868f2a File->close and File->exit menu items added. Exit uses
closeAllWindows() to ensure ViewManager::closeRequest is called on the
last open window.  Exit will close all open windows but the last one in
cases of active save operation or modified file.
12 years ago
Marc Zinnschlag c1cd8305bc a bit of cleanup for the previous commit 12 years ago
Marc Zinnschlag 21733e8181 hide startup dialogue when opening open dialogue 12 years ago
Marc Zinnschlag adcaea464b basic globals record loading 12 years ago
Michal Sciubidlo 347a734364 Move OpenDialog to editor and use it in startup dialogue.
Remove debug output from DataFilesList.
12 years ago
Marc Zinnschlag ba0d13fc12 moved code for creating new base content records into the Document class 12 years ago
Marc Zinnschlag 4c973a0f67 constructing documents from a file list instead of a single name 12 years ago
Marc Zinnschlag 67a1ec5166 added provisional startup dialogue 12 years ago
Marc Zinnschlag db29e411c4 added merge functions; temporarily merge on document creation 12 years ago