Commit Graph

146 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
Alexander Stillich 725cc94210 Renamed cc_install to something less cryptic (crashCatcherInstall) 6 years ago
Doc West 467989cdd5 Moved crashcatcher to a component and also use it in CS
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
6 years ago
AnyOldName3 43e9e955c8 Do the same for the CS 7 years ago
AnyOldName3 654bd401fb Switch openmw-cs to the escape versions of option types 7 years ago
Kyle Cooley 8c4b12a603 VFS changes, one VFS and resource system per document.
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
7 years ago
scrawl 11496b8075 Read fallback settings in OpenCS 8 years ago
Marc Zinnschlag c646533448 removed old user settings system 9 years ago
Marc Zinnschlag 36ce8f97d7 basic framework for new user settings system 9 years ago
Marc Zinnschlag a445683312 Merge branch 'mergetool'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
9 years ago
Marc Zinnschlag 1b663f01af create merged document and open a view for it (document is still empty at this point) 9 years ago
Marc Zinnschlag e2377396a7 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) 9 years ago
Marc Zinnschlag b83f9445a9 added UI for merge tool (merge tool itself is still missing) 9 years ago
scrawl 3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
9 years ago
cc9cii 6a47ea9a67 fix typo 9 years ago
cc9cii cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 9 years ago
scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
9 years ago
scrawl 6051c47eef Fix for incorrect QString -> path conversion 9 years ago
Alexander "Ace" Olofsson cd42448cd6 Windows build fixes and CMakeLists cleanup
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
9 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
9 years ago
cc9cii 0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 9 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
9 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 9 years ago
scrawl 5a759f8b0d GUI cleanup fix 9 years ago
scrawl 5a582e7eb7 Reintroduce showMarkers flag 9 years ago
scrawl 40fc097722 OpenCS: use the new VFS, restored resource tables 9 years ago
scrawl 49c2da27b3 OpenCS compiles and runs again (no rendering) 9 years ago
Marc Zinnschlag 0557d45bd1 renamed opencs into openmw-cs 9 years ago
Marc Zinnschlag 9603325b99 Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag 706df3f881 silenced a coverity warning 9 years ago
scrawl f11ec653d0 Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
9 years ago
Scott Howard 03b39435f8 place user settings window at same location as mouse pointer 10 years ago
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) 10 years ago
cc9cii 8d0cca6cfc Merge remote-tracking branch 'remotes/upstream/master' into single-instance
Conflicts:
	apps/opencs/editor.cpp
10 years ago
cc9cii 07f10a0140 Use append syntax compatible with older versions of boost. 10 years ago
cc9cii e67cf96250 Allow only one instance of OpenCS. Only tested on windows x64. 10 years ago
cc9cii 64e1594b41 Move the destruction of global resources, being used by multiple documents, to the editor. 10 years ago
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. 10 years ago
cc9cii 31fdf49616 Use Qt exit function rather than system one. 10 years ago
cc9cii b328aa1fb9 Multiple document support. 10 years ago
cc9cii dd9208afeb Merge remote-tracking branch 'upstream/master' into mouse-picking 10 years ago
cc9cii cb53e714f7 Convert PhysicsSystem to a singleton. 10 years ago
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