Bret Curtis
|
c781d1f8ed
|
purge unnecessary imports
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
|
7 years ago |
Aesylwinn
|
f6c3b44cfb
|
Fix QTimer not being stopped in right thread
|
8 years ago |
scrawl
|
11496b8075
|
Read fallback settings in OpenCS
|
8 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
|
b83f9445a9
|
added UI for merge tool (merge tool itself is still missing)
|
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
|
e1f4a7f647
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
|
9 years ago |
|
cc9cii
|
f326b14604
|
Allow Qt to cleanup its signals.
|
9 years ago |
|
scrawl
|
af27a10b0c
|
OpenCS: preliminary port of PreviewWidget to OSG
|
9 years ago |
|
scrawl
|
40fc097722
|
OpenCS: use the new VFS, restored resource tables
|
9 years ago |
Scott Howard
|
e2ef8c4022
|
fix -Wnewline-eof warnings
|
9 years ago |
|
Marc Zinnschlag
|
a9f9dec923
|
consider script blacklist in OpenCS verifier
|
10 years ago |
|
Marc Zinnschlag
|
879ab49e9c
|
added resources manager
|
10 years ago |
|
Marc Zinnschlag
|
bd252d0aec
|
display record count in loading window
|
10 years ago |
|
Marc Zinnschlag
|
8279d307c4
|
text encoding configuration (was using hardcoded settings before)
|
10 years ago |
|
Marc Zinnschlag
|
95d24492de
|
display load error messages in loading window
|
10 years ago |
|
Marc Zinnschlag
|
492620c8cf
|
handle exceptions thrown during loading and report them to the user
|
10 years ago |
|
Marc Zinnschlag
|
3fdd72f204
|
added cancel button to loading window
|
10 years ago |
|
Marc Zinnschlag
|
6bc5869222
|
record loading progress bar
|
10 years ago |
|
Marc Zinnschlag
|
e0e2ad8316
|
content file loading progress bar
|
10 years ago |
|
Marc Zinnschlag
|
8dc6ad5059
|
moved new flag from setupData function to Document constructor
|
10 years ago |
|
Marc Zinnschlag
|
5f1d2f72f6
|
added basic loading GUI
|
10 years ago |
|
Marc Zinnschlag
|
ddb0496dca
|
replaced return value of removeDocument with a signal
|
10 years ago |
|
Marc Zinnschlag
|
dbb192f084
|
moved loading to a separate thread
|
10 years ago |
|
Marc Zinnschlag
|
e324450118
|
replaced return value of DocumentManager::addDocument with a signal
|
10 years ago |
|
scrawl
|
33389b9b63
|
XDG compliant paths
|
11 years ago |
Marek Kochanowicz
|
a7002e8a09
|
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
|
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
|
e9f14449eb
|
added AdjusterWidget
|
11 years ago |
|
Marc Zinnschlag
|
4c973a0f67
|
constructing documents from a file list instead of a single name
|
11 years ago |
|
Marc Zinnschlag
|
303506d24b
|
added new document function
|
12 years ago |
|
Marc Zinnschlag
|
c3cd6e8a8a
|
new attempt at the editor
|
12 years ago |