scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
10 years ago |
Marc Zinnschlag
|
2dada1a162
|
Merge branch 'meta'
|
10 years ago |
Marc Zinnschlag
|
1870b087e7
|
ported setting of meta data for saving to the new mechanism
|
10 years ago |
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
10 years ago |
Marc Zinnschlag
|
6fbdbb11d5
|
added refrash menu item to report table (Fixes #2620)
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
c644f15167
|
calm down travis
|
10 years ago |
Marc Zinnschlag
|
197b8ec731
|
added severity attribute for operation messages (Fixes #2717)
|
10 years ago |
Marc Zinnschlag
|
8791832c86
|
standarised on the use of the Message struct when passing operations messages around
|
10 years ago |
Marc Zinnschlag
|
0e21c61297
|
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
|
10 years ago |
Marc Zinnschlag
|
1ee1934053
|
framework for accessing user settings in operation stages
|
10 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
|
10 years ago |
scrawl
|
d03880fbf0
|
Compile fix for old boost versions
|
10 years ago |
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
|
10 years ago |
scrawl
|
974fda5bde
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
|
10 years ago |
Stanislav Bas
|
e636101725
|
Add missing new lines at the ends of files
|
10 years ago |
Stanislav Bas
|
19cc6b83e5
|
Integrate the Id completion manager into the Document class
|
10 years ago |
cc9cii
|
0aaac59cc3
|
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588.
|
10 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
|
10 years ago |
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
10 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
|
10 years ago |
cc9cii
|
33a8cd245a
|
Fix crash with gcc/linux.
|
10 years ago |
cc9cii
|
889749a493
|
Allow non-empty mOriginalCell (case where a moved ref is moved again)
|
10 years ago |
cc9cii
|
b54e5714c9
|
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
|
10 years ago |
cc9cii
|
e0d061c37b
|
Implemented a workaround for saving moved refs.
|
10 years ago |
cc9cii
|
f1a58994c6
|
Merge branch 'master' into moveref
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
|
10 years ago |
Marc Zinnschlag
|
f7c7aeecb3
|
fixed missing state update when starting a global search
|
10 years ago |
cc9cii
|
f326b14604
|
Allow Qt to cleanup its signals.
|
10 years ago |
scrawl
|
1699759d12
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/view/render/cell.cpp
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
23cf859fee
|
added search stages (cell table only for now)
|
10 years ago |
scrawl
|
aedafe651a
|
OpenCS: delete physicssystem, will be replaced with OSG picking
|
10 years ago |
scrawl
|
af27a10b0c
|
OpenCS: preliminary port of PreviewWidget to OSG
|
10 years ago |
scrawl
|
40fc097722
|
OpenCS: use the new VFS, restored resource tables
|
10 years ago |
Marc Zinnschlag
|
d053c62032
|
setting up global search operation and subview
|
10 years ago |
Marc Zinnschlag
|
cf077dcf5d
|
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
|
10 years ago |
Marc Zinnschlag
|
55bd0c728e
|
Merge branch 'threadfix'
|
10 years ago |
Marc Zinnschlag
|
c0dfad23b3
|
Fixed editor operation multi-threading (Fixes #923)
|
10 years ago |
cc9cii
|
fd86076db3
|
More warning fixes.
|
10 years ago |
cc9cii
|
488bc76da5
|
Fix saving land data.
|
10 years ago |
cc9cii
|
589b0b9171
|
Add saving land and land textures. Should resolve Bug #2447.
|
10 years ago |
Scott Howard
|
e2ef8c4022
|
fix -Wnewline-eof warnings
|
10 years ago |
Marc Zinnschlag
|
1ed606065c
|
save start script records
|
10 years ago |
cc9cii
|
66ef9d237c
|
Another try to make it work with gcc/travis.
|
10 years ago |
cc9cii
|
7c0f5b72c5
|
Add enum namespace to workaround travis.
|
10 years ago |
cc9cii
|
a8427c2efb
|
Do not add NAME subrecords while saving magic effects or scripts.
|
10 years ago |
cc9cii
|
5ff66ad40b
|
Fix Bug #2402. SKIL records should not have NAME subrecord.
|
10 years ago |
Marc Zinnschlag
|
89998a6a03
|
save MVRF subrecords
|
10 years ago |
Marc Zinnschlag
|
a97f599e65
|
fixed ref num saving in non-wide format
|
10 years ago |
Marc Zinnschlag
|
a64b741af2
|
store hints from operations in report model
|
10 years ago |
Marc Zinnschlag
|
3a847732b4
|
abstracted message collection into a class
|
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 |
Thoronador
|
a799353f60
|
fix uninitialized fields in CSMDoc::Operation class
|
10 years ago |
Marc Zinnschlag
|
23e969eae7
|
fixed pathgrid saving again (previous fix was incomplete)
|
10 years ago |
Marc Zinnschlag
|
2d3ffc4483
|
fixed pathgrid saving
|
10 years ago |
Marc Zinnschlag
|
f4c9897bbd
|
Merge branch 'master' into tables
|
10 years ago |
Marc Zinnschlag
|
d64127106b
|
load and save pathgrid records
|
10 years ago |
Marc Zinnschlag
|
aa89370db6
|
make sure magic effects added by expansions are available
|
10 years ago |
Marc Zinnschlag
|
25a1112627
|
add magic effect records for newly created games
|
10 years ago |
scrawl
|
7252cb63a6
|
Fix cppcheck issues
|
10 years ago |
Marc Zinnschlag
|
c321f2c252
|
load and save magic effect records
|
10 years ago |
Marc Zinnschlag
|
02247fe712
|
load and save sound gen records
|
10 years ago |
Marc Zinnschlag
|
cf5c5cbce7
|
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
|
10 years ago |
Nikolay Kasyanov
|
9f7a8462d8
|
Fix build & OpenCS game runner code on OS X
|
10 years ago |
Marc Zinnschlag
|
e93ab383ea
|
set refnum and increment refnum counter when creating a new reference
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
bf6150d009
|
allow project scope scripts
|
10 years ago |
Marc Zinnschlag
|
081588f484
|
add project file to content file list when running OpenMW from OpenCS
|
10 years ago |
Marc Zinnschlag
|
64cf0870c6
|
set content files when running OpenMW from OpenCS
|
10 years ago |
Marc Zinnschlag
|
cf05d3c69f
|
added run log
|
10 years ago |
Marc Zinnschlag
|
5e022195b8
|
create startup script when running from OpenCS
|
10 years ago |
Marc Zinnschlag
|
61a92da374
|
use --new-game/--skip-menu switches when running from OpenCS
|
10 years ago |
Marc Zinnschlag
|
431abcb63a
|
handle shutdown of OpenMW processes when shutting down OpenCS
|
10 years ago |
Marc Zinnschlag
|
3fec253409
|
save first (if document was modified) before running OpenMW
|
10 years ago |
Marc Zinnschlag
|
a06133a50e
|
added failed flag to operation done signal
|
10 years ago |
Marc Zinnschlag
|
c88b3a1520
|
track state of OpenMW process and enable/disable run/stop actions accordingly
|
10 years ago |
Marc Zinnschlag
|
1b4ab6e130
|
added OpenMW runner
|
10 years ago |
Marc Zinnschlag
|
0dff1fb816
|
fix for previous commit (was using wrong destination path)
|
11 years ago |
Marek Kochanowicz
|
ea2feb0aa9
|
fix for bug 1672
|
11 years ago |
Marc Zinnschlag
|
775e24d2c0
|
save debug profiles in project files
|
11 years ago |
Marc Zinnschlag
|
fa9c6b19c2
|
removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)
|
11 years ago |
Marc Zinnschlag
|
0be1e3d12f
|
removed WriteFilterStage class (functionality integrated into WriteCollectionStage)
|
11 years ago |
Marc Zinnschlag
|
a9f9dec923
|
consider script blacklist in OpenCS verifier
|
11 years ago |
Marc Zinnschlag
|
879ab49e9c
|
added resources manager
|
11 years ago |
Marc Zinnschlag
|
d96ed38d49
|
added body part table
|
11 years ago |
Marc Zinnschlag
|
e97fd35ae6
|
added enchantments table
|
11 years ago |
Marc Zinnschlag
|
06e89d8bd3
|
reduced loading batch size (making the the loading progress bars a bit more responsive
|
11 years ago |
Marc Zinnschlag
|
bd252d0aec
|
display record count in loading window
|
11 years ago |
Marc Zinnschlag
|
073cc3f02c
|
fixed base flag in content file loader code
|
11 years ago |
Marc Zinnschlag
|
be7f344eca
|
Merge branch 'refs'
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
|
11 years ago |
Marc Zinnschlag
|
ae50632774
|
implemented cell and reference saving int OpenCS
|
11 years ago |
Marc Zinnschlag
|
e0ba9a4bf2
|
added reference collection stage to saving operation (preparation for cell saving)
|
11 years ago |
greye
|
130349e0cd
|
open files in binary mode when necessary
|
11 years ago |
greye
|
db16bb8983
|
fix OpenCS saving to Unicode path destination
|
11 years ago |
Marc Zinnschlag
|
8279d307c4
|
text encoding configuration (was using hardcoded settings before)
|
11 years ago |
Marc Zinnschlag
|
95d24492de
|
display load error messages in loading window
|
11 years ago |
Marc Zinnschlag
|
aadaf7827d
|
added load error log
|
11 years ago |
Marc Zinnschlag
|
6eff5ecaad
|
Merge branch 'operations' into load
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
|
11 years ago |
Marc Zinnschlag
|
205306ee3d
|
changed message passing format from QString to a UniversalId/std::string pair
|
11 years ago |
Marc Zinnschlag
|
492620c8cf
|
handle exceptions thrown during loading and report them to the user
|
11 years ago |