mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 11:26:38 +00:00
Code Issues Releases Wiki Activity
13936 commits 115 branches 76 tags 128 MiB
Commit graph

132 commits

Author SHA1 Message Date
Marc Zinnschlag
3eef192e4d create merged document and open a view for it (document is still empty at this point) 
(cherry picked from commit 1b663f01af)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
 2015-11-01 13:31:28 +11:00
Marc Zinnschlag
9423603e94 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 
(cherry picked from commit e2377396a7)
 2015-11-01 13:25:46 +11:00
Marc Zinnschlag
ef1e01639e added UI for merge tool (merge tool itself is still missing) 
(cherry picked from commit b83f9445a9)

Conflicts:
	apps/opencs/editor.cpp
	apps/opencs/editor.hpp
 2015-11-01 13:22:42 +11:00
scrawl
f8f66bffb0 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-09-08 06:40:06 +10:00
cc9cii
5bef43ac14 Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940) 
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
 2015-07-30 16:30:59 +10:00
cc9cii
3b27e643b8 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2015-06-19 07:49:18 +10:00
cc9cii
6a47ea9a67 fix typo 2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
scrawl
6051c47eef Fix for incorrect QString -> path conversion 2015-06-11 22:36:19 +02:00
cc9cii
f989bfcd42 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
 2015-06-09 19:42:37 +10:00
cc9cii
0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 2015-05-30 08:37:58 +10:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
cc9cii
60f963382b Feature #2532. Global filter shortcuts for project::added and project::modified. 
- Add a startup warning message if global filters are being used.
- Add tooltip messages for the checkbox shortcuts.
 2015-05-14 19:36:39 +10:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
Marc Zinnschlag
9603325b99 Merge remote-tracking branch 'origin/master' 2015-01-15 17:33:20 +01:00
Marc Zinnschlag
706df3f881 silenced a coverity warning 2015-01-15 12:13:53 +01:00
scrawl
f11ec653d0 Add setting for showing MRK nodes to NIF loaders 
This makes marker objects show up in OpenCS.
 2015-01-13 17:29:25 +01:00
Scott Howard
03b39435f8 place user settings window at same location as mouse pointer 2015-01-01 22:50:35 -05:00
cc9cii
ab693f1f64 Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582) 2014-12-05 07:50:03 +11:00
cc9cii
8d0cca6cfc Merge remote-tracking branch 'remotes/upstream/master' into single-instance 
Conflicts:
	apps/opencs/editor.cpp
 2014-12-05 07:38:33 +11:00
cc9cii
07f10a0140 Use append syntax compatible with older versions of boost. 2014-12-05 01:32:20 +11:00
cc9cii
e67cf96250 Allow only one instance of OpenCS. Only tested on windows x64. 2014-12-05 01:09:42 +11:00
cc9cii
64e1594b41 Move the destruction of global resources, being used by multiple documents, to the editor. 2014-12-01 14:08:27 +11:00
cc9cii
2720e5ea9d Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application. 2014-12-01 06:44:12 +11:00
cc9cii
31fdf49616 Use Qt exit function rather than system one. 2014-11-22 06:59:23 +11:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
dd9208afeb Merge remote-tracking branch 'upstream/master' into mouse-picking 2014-10-25 10:59:17 +01:00
cc9cii
cb53e714f7 Convert PhysicsSystem to a singleton. 2014-10-24 19:14:02 +10:00
Marc Zinnschlag
94ae222f0e Merge branch 'settings' 2014-10-19 13:44:15 +02:00
Marc Zinnschlag
5a1ce4943e added advance 3D rendering user settings section 2014-10-19 13:41:56 +02:00
Marc Zinnschlag
8a05c0e5c0 fixed overlay singleton 2014-10-17 14:23:27 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
cc9cii
094f046087 Convert OverlaySystem to a OpenCS style singleton. 2014-10-16 07:29:46 +11:00
cc9cii
aff6f6fdb2 Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation. 2014-10-15 18:48:01 +11:00
cc9cii
1d0ac3b4df Delete Ogre::OverlaySystem before Ogre::Root 2014-10-15 07:02:19 +11:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
Thoronador
deb6452e0d fix uninitialized pointer fields in CS::Editor class 2014-10-10 23:57:10 +02:00
cc9cii
bfd10a03c0 User configuration manager's resource directory. 2014-10-10 13:35:14 +11:00
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. 2014-09-28 10:17:54 +10:00
cc9cii
a1c0ec2feb Repair collateral damage from a purging session gone out of control. 2014-09-26 11:26:33 +10:00
cc9cii
111a35bc38 More strip back. 2014-09-26 07:16:34 +10:00
cc9cii
d5c8ff7d73 More removal. 2014-09-25 18:15:34 +10:00
cc9cii
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +10:00
cc9cii
66852d5392 Code cleanup and revert incorrect settings. 2014-09-24 22:41:49 +10:00
cc9cii
970f3609c9 Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments. 2014-09-24 09:33:19 +10:00
cc9cii
fc8d6da6a2 Added more shader settings. 2014-09-22 16:24:06 +10:00
cc9cii
02f8f54192 Fixed checkbox behaviour. Added some shader settings. 2014-09-22 07:50:35 +10:00
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. 2014-09-18 22:17:37 +10:00
cc9cii
d9b0c81299 Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later. 2014-09-18 16:05:32 +10:00
cc9cii
62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 2014-09-18 07:52:54 +10:00