scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
2015-06-28 00:38:39 +02:00 |
|
Marc Zinnschlag
|
6fbdbb11d5
|
added refrash menu item to report table (Fixes #2620)
|
2015-06-25 12:03:40 +02:00 |
|
scrawl
|
a5670b5133
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
|
2015-06-22 20:09:02 +02:00 |
|
Marc Zinnschlag
|
8791832c86
|
standarised on the use of the Message struct when passing operations messages around
|
2015-06-20 17:56:42 +02:00 |
|
scrawl
|
e66e9916db
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
|
2015-06-07 15:23:54 +02:00 |
|
Stanislav Bas
|
19cc6b83e5
|
Integrate the Id completion manager into the Document class
|
2015-05-30 15:40:23 +03:00 |
|
scrawl
|
1699759d12
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/view/render/cell.cpp
|
2015-04-19 02:29:16 +02:00 |
|
scrawl
|
236d628884
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
|
2015-03-27 17:30:48 +01:00 |
|
Marc Zinnschlag
|
23cf859fee
|
added search stages (cell table only for now)
|
2015-03-27 16:33:54 +01:00 |
|
scrawl
|
aedafe651a
|
OpenCS: delete physicssystem, will be replaced with OSG picking
|
2015-03-25 19:08:09 +01:00 |
|
scrawl
|
af27a10b0c
|
OpenCS: preliminary port of PreviewWidget to OSG
|
2015-03-20 16:22:33 +01:00 |
|
Marc Zinnschlag
|
d053c62032
|
setting up global search operation and subview
|
2015-03-17 12:30:47 +01:00 |
|
Marc Zinnschlag
|
cf077dcf5d
|
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
|
2015-03-14 14:25:49 +01:00 |
|
Marc Zinnschlag
|
c0dfad23b3
|
Fixed editor operation multi-threading (Fixes #923)
|
2015-03-14 12:00:24 +01:00 |
|
cc9cii
|
fd86076db3
|
More warning fixes.
|
2015-03-14 08:09:19 +11:00 |
|
Marc Zinnschlag
|
a64b741af2
|
store hints from operations in report model
|
2014-12-07 20:53:09 +01: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 |
|
Marc Zinnschlag
|
aa89370db6
|
make sure magic effects added by expansions are available
|
2014-09-27 12:38:42 +02:00 |
|
Marc Zinnschlag
|
cf05d3c69f
|
added run log
|
2014-09-05 13:49:34 +02:00 |
|
Marc Zinnschlag
|
a06133a50e
|
added failed flag to operation done signal
|
2014-09-03 19:14:27 +02:00 |
|
Marc Zinnschlag
|
c88b3a1520
|
track state of OpenMW process and enable/disable run/stop actions accordingly
|
2014-09-02 11:56:35 +02:00 |
|
Marc Zinnschlag
|
1b4ab6e130
|
added OpenMW runner
|
2014-09-02 10:21:17 +02:00 |
|
Marc Zinnschlag
|
a9f9dec923
|
consider script blacklist in OpenCS verifier
|
2014-07-21 12:15:21 +02:00 |
|
Marc Zinnschlag
|
879ab49e9c
|
added resources manager
|
2014-07-04 12:46:57 +02:00 |
|
Marc Zinnschlag
|
8279d307c4
|
text encoding configuration (was using hardcoded settings before)
|
2014-05-12 10:32:57 +02:00 |
|
Marc Zinnschlag
|
6eff5ecaad
|
Merge branch 'operations' into load
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
|
2014-05-08 13:17:24 +02:00 |
|
Marc Zinnschlag
|
205306ee3d
|
changed message passing format from QString to a UniversalId/std::string pair
|
2014-05-08 12:42:29 +02:00 |
|
Marc Zinnschlag
|
e09218f164
|
moved load code from Document to Loader class
|
2014-05-03 12:07:05 +02:00 |
|
Marc Zinnschlag
|
8dc6ad5059
|
moved new flag from setupData function to Document constructor
|
2014-04-29 14:27:44 +02:00 |
|
Marc Zinnschlag
|
dbb192f084
|
moved loading to a separate thread
|
2014-04-24 15:09:25 +02:00 |
|
Marek Kochanowicz
|
37d262b147
|
Splited very long line.
|
2014-02-14 15:12:34 +01:00 |
|
Marek Kochanowicz
|
70602c2c36
|
Removed changes in the unimplemented copy ctor.
|
2013-10-21 18:24:16 +02:00 |
|
Marek Kochanowicz
|
5e1bdd605b
|
Corrected formatting in document.hpp
|
2013-10-21 18:15:26 +02:00 |
|
Marek Kochanowicz
|
a7002e8a09
|
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
|
2013-10-17 18:21:41 +02:00 |
|
Marc Zinnschlag
|
6143ec33e0
|
giving Documents direct access to ConfigurationManager
|
2013-09-27 15:24:58 +02:00 |
|
Marc Zinnschlag
|
6f2c418a5c
|
(slightly) improved error reporting during save operations
|
2013-09-27 13:54:51 +02:00 |
|
Marc Zinnschlag
|
5779f799ab
|
create project file when saving content file
|
2013-09-27 11:36:06 +02:00 |
|
Marc Zinnschlag
|
6d9ff39390
|
set dependencies when saving (requires further refinements)
|
2013-09-23 12:16:56 +02:00 |
|
Marc Zinnschlag
|
8326ac9b6f
|
replaced dummy save implementation with a threaded dummy save implementation
|
2013-09-15 12:53:59 +02:00 |
|
Marc Zinnschlag
|
e9f14449eb
|
added AdjusterWidget
|
2013-09-10 16:45:01 +02:00 |
|
mckibbenta
|
5803726233
|
modified gmst addition during creation of new base file
|
2013-06-23 15:19:08 -04:00 |
|
mckibbenta
|
16a27e28f7
|
inluded gmsts with default values to creation of new base files
|
2013-06-22 21:01:27 -04:00 |
|
graffy76
|
50abb22162
|
Fix to allow application closing from multiple views and a single view.
|
2013-03-12 06:28:13 -05:00 |
|
Marc Zinnschlag
|
868916a9a2
|
added add-on global variables in the same way add-on GMSTs were added
|
2013-02-23 12:51:45 +01:00 |
|
Marc Zinnschlag
|
475f4f9311
|
implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified
|
2013-02-17 20:03:39 +01:00 |
|
Marc Zinnschlag
|
7d112e4d5c
|
rewrote logic of content file loading
|
2013-02-07 11:33:08 +01:00 |
|
Marc Zinnschlag
|
4c973a0f67
|
constructing documents from a file list instead of a single name
|
2013-02-04 13:46:54 +01:00 |
|
Marc Zinnschlag
|
c75563c184
|
report model and view
|
2012-12-11 15:35:47 +01:00 |
|
Marc Zinnschlag
|
9fe7ff9690
|
added mandatory ID check stage
|
2012-12-08 23:27:59 +01:00 |
|
Marc Zinnschlag
|
8b7f342641
|
removed last remains of old verify implementation
|
2012-12-08 17:00:58 +01:00 |
|