1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Commit graph

142 commits

Author SHA1 Message Date
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
Marc Zinnschlag
cf5c5cbce7 Merge remote-tracking branch 'corristo/osx-openmw-launch-fix' 2014-09-20 14:13:42 +02:00
Nikolay Kasyanov
9f7a8462d8 Fix build & OpenCS game runner code on OS X 2014-09-20 13:42:11 +04:00
Marc Zinnschlag
e93ab383ea set refnum and increment refnum counter when creating a new reference 2014-09-18 12:25:17 +02:00
Marc Zinnschlag
d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
081588f484 add project file to content file list when running OpenMW from OpenCS 2014-09-13 20:48:24 +02:00
Marc Zinnschlag
64cf0870c6 set content files when running OpenMW from OpenCS 2014-09-06 12:24:09 +02:00
Marc Zinnschlag
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
Marc Zinnschlag
5e022195b8 create startup script when running from OpenCS 2014-09-05 11:40:01 +02:00
Marc Zinnschlag
61a92da374 use --new-game/--skip-menu switches when running from OpenCS 2014-09-05 11:03:16 +02:00
Marc Zinnschlag
431abcb63a handle shutdown of OpenMW processes when shutting down OpenCS 2014-09-03 20:06:49 +02:00
Marc Zinnschlag
3fec253409 save first (if document was modified) before running OpenMW 2014-09-03 19:56:52 +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
0dff1fb816 fix for previous commit (was using wrong destination path) 2014-08-28 13:25:56 +02:00
Marek Kochanowicz
ea2feb0aa9 fix for bug 1672 2014-08-28 12:51:49 +02:00
Marc Zinnschlag
775e24d2c0 save debug profiles in project files 2014-08-15 12:08:29 +02:00
Marc Zinnschlag
fa9c6b19c2 removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on) 2014-08-10 21:03:45 +02:00
Marc Zinnschlag
0be1e3d12f removed WriteFilterStage class (functionality integrated into WriteCollectionStage) 2014-08-06 10:03:04 +02:00
gus
2092e5fe22 compile fixes 2014-07-22 11:49:45 +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
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
Marc Zinnschlag
06e89d8bd3 reduced loading batch size (making the the loading progress bars a bit more responsive 2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec display record count in loading window 2014-06-26 11:41:21 +02:00
Marc Zinnschlag
073cc3f02c fixed base flag in content file loader code 2014-06-17 11:01:17 +02:00
Marc Zinnschlag
be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
ae50632774 implemented cell and reference saving int OpenCS 2014-05-29 18:08:40 +02:00
Marc Zinnschlag
e0ba9a4bf2 added reference collection stage to saving operation (preparation for cell saving) 2014-05-27 12:39:26 +02:00
greye
130349e0cd open files in binary mode when necessary 2014-05-20 08:14:29 +04:00
greye
db16bb8983 fix OpenCS saving to Unicode path destination 2014-05-19 15:52:19 +04:00
Marc Zinnschlag
8279d307c4 text encoding configuration (was using hardcoded settings before) 2014-05-12 10:32:57 +02:00
Marc Zinnschlag
95d24492de display load error messages in loading window 2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d added load error log 2014-05-10 12:04:36 +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
492620c8cf handle exceptions thrown during loading and report them to the user 2014-05-06 09:39:39 +02:00
Marc Zinnschlag
3fdd72f204 added cancel button to loading window 2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222 record loading progress bar 2014-05-03 15:33:35 +02:00
Marc Zinnschlag
6692d2dc72 split up load function in a start and continue part 2014-05-03 15:05:02 +02:00
Marc Zinnschlag
e0e2ad8316 content file loading progress bar 2014-05-03 13:01:29 +02:00
Marc Zinnschlag
e09218f164 moved load code from Document to Loader class 2014-05-03 12:07:05 +02:00
Marc Zinnschlag
ab94e70724 more cleanup of document setup 2014-05-01 13:04:48 +02:00
Marc Zinnschlag
8dc6ad5059 moved new flag from setupData function to Document constructor 2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6 added basic loading GUI 2014-04-29 14:17:25 +02:00