Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
7 years ago
MAtahualpa
fb8a2093cd
Replace "Female" check box with a combo box, part 2/2 ( fixes #3757 )
...
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.
Related issue:
- Fixes #3757 : Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
7 years ago
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
7 years ago
Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
8 years ago
Aesylwinn
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
8 years ago
scrawl
703dba902b
Set the shader path in OpenCS
8 years ago
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
8 years ago
Rob Cutmore
c9ada852aa
Undo including pathgrids in ID check
8 years ago
Rob Cutmore
5580f803fd
Editor: Prevent duplicate pathgrids (Bug #3342 )
8 years ago
Aesylwinn
5e38fcac36
Add ability to edit region weather probabilities.
8 years ago
Aesylwinn
f4ed389496
InfoCondition autocompletion
8 years ago
scrawl
fb849014bd
Pass the fallback map to CSMWorld::Data
8 years ago
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
9 years ago
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
9 years ago
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
9 years ago
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
9 years ago
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
9 years ago
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
9 years ago
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
9 years ago
Marc Zinnschlag
890bbb6b11
merge land texture tables
9 years ago
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
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
47dd9505a9
copy meta data from game file when merging
9 years ago
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
9 years ago
Stanislav Bas
13bb6be238
Load methods (for ESM records) accept a deleted flag in OpenCS
9 years ago
Stanislav Bas
e04e32bcff
Delete infos of deleted dialogue when loading a content file
9 years ago
scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
9 years ago
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
9 years ago
Stanislav Bas
1afa22f443
Add the RecordType column to the MetaData table
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
a4c2c75d1f
fixed overwriting of meta data when loading project file
9 years ago
Marc Zinnschlag
1e033fa8fe
added meta data dialogue sub view
9 years ago
Marc Zinnschlag
1870b087e7
ported setting of meta data for saving to the new mechanism
9 years ago
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
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
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
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
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
9 years ago
scrawl
cdd0623009
Terrain rendering
9 years ago
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
9 years ago
cc9cii
ec808843c3
Do not rebuild the dialogue subview unless required. Should resolve Bug #2581 .
...
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
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
cc9cii
1d0b8587a1
Use HasWater bit flag rather than mWaterInt bool.
9 years ago
cc9cii
b27a879352
Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551 .
...
- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus
9 years ago
cc9cii
0ecfd9119f
Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546 .
9 years ago
cc9cii
0c461f4424
Add TopicInfos special conditions table.
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
49884f54f7
Fix loading moved references.
9 years ago
cc9cii
b54e5714c9
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
9 years ago