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 |
Ewan Higgs
|
38a2de3c51
|
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
|
7 years ago |
scrawl
|
703dba902b
|
Set the shader path in OpenCS
|
8 years ago |
Aesylwinn
|
bbda5fe634
|
Removed hints from error messages and fixed naming to match conventions
|
8 years ago |
Aesylwinn
|
1d86f705ba
|
gmst verifier
|
8 years ago |
scrawl
|
fb849014bd
|
Pass the fallback map to CSMWorld::Data
|
8 years ago |
scrawl
|
11496b8075
|
Read fallback settings in OpenCS
|
8 years ago |
Marc Zinnschlag
|
466f91db67
|
Fixed wrong GMST name for newly created game files (Fixes #3132)
|
8 years ago |
Marc Zinnschlag
|
9cf793c0b5
|
silenced a warning
|
9 years ago |
Marc Zinnschlag
|
c92898a5bc
|
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
|
9 years ago |
Marc Zinnschlag
|
47dd9505a9
|
copy meta data from game file when merging
|
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
|
904ad94952
|
added merge operation (doesn't do anything yet)
|
9 years ago |
Marc Zinnschlag
|
cdfa3006a3
|
incorrect sBribe GMSTs for new omwgame files (Fixes #2785)
|
9 years ago |
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
9 years ago |
Marc Zinnschlag
|
2dada1a162
|
Merge branch 'meta'
|
9 years ago |
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
9 years ago |
Marc Zinnschlag
|
6fbdbb11d5
|
added refrash menu item to report table (Fixes #2620)
|
9 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
|
9 years ago |
Marc Zinnschlag
|
8791832c86
|
standarised on the use of the Message struct when passing operations messages around
|
9 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
|
9 years ago |
scrawl
|
d03880fbf0
|
Compile fix for old boost versions
|
9 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
|
9 years ago |
Stanislav Bas
|
e636101725
|
Add missing new lines at the ends of files
|
9 years ago |
Stanislav Bas
|
19cc6b83e5
|
Integrate the Id completion manager into the Document class
|
9 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
|
9 years ago |
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
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 |
Marc Zinnschlag
|
f7c7aeecb3
|
fixed missing state update when starting a global search
|
9 years ago |
scrawl
|
1699759d12
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/view/render/cell.cpp
|
9 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
|
9 years ago |
Marc Zinnschlag
|
23cf859fee
|
added search stages (cell table only for now)
|
9 years ago |
scrawl
|
aedafe651a
|
OpenCS: delete physicssystem, will be replaced with OSG picking
|
9 years ago |
scrawl
|
af27a10b0c
|
OpenCS: preliminary port of PreviewWidget to OSG
|
9 years ago |
Marc Zinnschlag
|
d053c62032
|
setting up global search operation and subview
|
9 years ago |
Marc Zinnschlag
|
c0dfad23b3
|
Fixed editor operation multi-threading (Fixes #923)
|
9 years ago |
Marc Zinnschlag
|
a64b741af2
|
store hints from operations in report model
|
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 |
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 |
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
|
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
|
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 |