Nat Meo
bcc5142b32
Issue #4202 : Open .omwaddon files without needing to open openmw-cs first.
2019-07-02 16:07:38 +00:00
Capostrophic
5cd781b3eb
Experimental folder handling rewrite
2019-05-31 20:01:46 +03:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
2018-09-25 21:39:18 +04:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Andrei Kortunov
9a5b016293
Move crashcatcher initialization to components
2018-08-14 11:17:05 +04:00
Alexander Stillich
725cc94210
Renamed cc_install to something less cryptic (crashCatcherInstall)
2018-07-09 16:25:55 +02:00
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
2018-07-09 16:25:55 +02:00
AnyOldName3
43e9e955c8
Do the same for the CS
2017-10-18 02:04:48 +01:00
AnyOldName3
654bd401fb
Switch openmw-cs to the escape versions of option types
2017-10-16 15:38:17 +01:00
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.
2017-08-21 22:31:19 -04:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
c646533448
removed old user settings system
2015-12-15 12:49:55 +01:00
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
2015-12-06 11:18:31 +01:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
2015-08-16 15:24:48 +02:00
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)
2015-08-13 12:53:00 +02:00
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
2015-08-06 12:52:10 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02: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
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
2015-06-13 21:11:24 +02:00
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
2015-06-11 22:36:19 +02:00
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.
2015-06-08 15:41:39 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02: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
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
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
5a759f8b0d
GUI cleanup fix
2015-05-03 18:35:29 +02:00
scrawl
5a582e7eb7
Reintroduce showMarkers flag
2015-03-23 01:57:14 +01:00
scrawl
40fc097722
OpenCS: use the new VFS, restored resource tables
2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01: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