scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
2015-07-18 03:52:48 +02:00
Stanislav Bas
1afa22f443
Add the RecordType column to the MetaData table
2015-07-01 21:36:17 +03:00
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
a4c2c75d1f
fixed overwriting of meta data when loading project file
2015-06-26 16:22:06 +02:00
Marc Zinnschlag
1e033fa8fe
added meta data dialogue sub view
2015-06-26 16:11:00 +02:00
Marc Zinnschlag
1870b087e7
ported setting of meta data for saving to the new mechanism
2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
2015-06-26 13:01:25 +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
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
2015-06-20 19:08:31 +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
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
2015-06-03 00:02:53 +03:00
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
2015-05-26 13:35:10 +10:00
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
2015-05-23 20:33:44 +02:00
cc9cii
1d0b8587a1
Use HasWater bit flag rather than mWaterInt bool.
2015-05-20 21:14:17 +10:00
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
2015-05-19 22:01:40 +10:00
cc9cii
0ecfd9119f
Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546 .
2015-05-19 06:56:38 +10:00
cc9cii
0c461f4424
Add TopicInfos special conditions table.
2015-05-09 21:21:16 +10:00
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
2015-05-04 02:41:50 +02:00
cc9cii
49884f54f7
Fix loading moved references.
2015-04-28 08:07:01 +10:00
cc9cii
b54e5714c9
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
2015-04-26 14:55:40 +10:00
cc9cii
7673be6d0f
Loading of moved refs complete.
2015-04-26 12:18:23 +10:00
cc9cii
74b98f7178
Fixed initial loading of moved refs.
2015-04-26 11:35:46 +10:00
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
2015-04-25 06:52:53 +10:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
cc9cii
e00d7f72ac
Convert magic effects ID and Range columns in the nested tables to use enum delegate
2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658
Convert magic effects Skills column in the nested tables to use enum delegates.
2015-04-18 07:15:40 +10:00
cc9cii
d6c2cff381
Convert magic effects Attribute column in the nested tables to use enum delegates.
2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6
Cleanup post merge.
2015-04-17 13:45:45 +10:00
cc9cii
ef84e553be
Renamed some stuff.
2015-04-12 13:48:23 +10:00
cc9cii
41b368a759
Moved templated code around a bit.
2015-04-12 10:52:01 +10:00
cc9cii
4b9c9bf095
Simplify and relocate nested column definitions.
2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14
Use human friendly strings in magic effects subtable.
2015-04-12 07:46:32 +10:00
cc9cii
a460409555
Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings.
2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6
Add birthsign spells table to dialogue subview.
2015-04-11 19:17:17 +10:00
cc9cii
f939648736
Add race spells table to dialogue subview.
2015-04-11 19:05:03 +10:00
cc9cii
ea9563ad92
Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible.
2015-04-11 17:51:30 +10:00
cc9cii
88bc62e054
Add Region sounds table to dialogue subview.
2015-04-11 15:55:26 +10:00
cc9cii
1220369da3
Changes as per feedback comments.
2015-04-11 11:26:29 +10:00
cc9cii
bc9dad3ff2
Add index columns and fix edge indexing for point deletion.
2015-04-10 07:31:01 +10:00
cc9cii
05210d7f21
Nested table support for Pathgrids.
2015-04-09 19:29:03 +10:00
cc9cii
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
2015-04-09 19:11:19 +10:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11: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
scrawl
99e1720980
Add SceneManager and clone utility
2015-03-26 18:02:51 +01:00
scrawl
72400747f2
OpenCS: preliminary port of cell rendering to OSG
2015-03-25 23:35:10 +01:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
Marc Zinnschlag
ba7b74217b
added original cell column to reference table
2015-01-05 15:20:47 +01:00
