cc9cii
7561b195ab
Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes.
2015-04-18 15:28:34 +10:00
cc9cii
48a6006202
Prevent enum delegates from auto expanding when opening a dialogue subview.
2015-04-18 14:16:55 +10:00
cc9cii
5e84858c0b
Change the cell edit selection behaviour of the nested tables. Also auto-expand the enum delegate selections (both main table as well as nested table in the dialogue subview)
2015-04-18 10:07:53 +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
0aff188d8d
Fix enum delegate from adding a command to the undo stack when the value has not changed.
2015-04-18 07:13:02 +10:00
cc9cii
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
Marc Zinnschlag
38ce074a62
Merge branch 'replace'
2015-04-16 20:11:25 +02:00
cc9cii
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
2015-04-17 01:27:36 +10:00
cc9cii
ce7e2e06c1
Fix editor being created for a non-editable item.
2015-04-11 13:11:20 +10:00
cc9cii
787cef1386
DialogueSubView layout update for dialogues with nested tables only.
2015-04-09 19:39:09 +10:00
Marc Zinnschlag
3b408b6427
sorting out some Display enum mixup
2015-04-04 19:55:53 +02:00
cc9cii
745eae9c10
Tweak DialogueSubView layout for nested tables.
2015-04-03 12:44:32 +11:00
cc9cii
851effb0e3
Merge branch 'master' into NonTableFields
2015-04-02 20:43:48 +11:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
3d280a6ba5
Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.
2015-03-30 11:19:37 +11:00
scrawl
232e34bddd
OpenCS: port lighting toolbar, fix multiple context GL objects issue
2015-03-28 20:15:17 +01: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
e3bfbcb44b
OpenCS: connect navigation button to OSG camera manipulators
2015-03-26 00:55:58 +01:00
scrawl
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
2015-03-25 19:08:09 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +01:00
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01:00
scrawl
6ff2523d8a
Fix for line focus when clicking on a verifier script error
...
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
cc9cii
15b9a628ac
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
Marc Zinnschlag
26955dc6d3
Merge remote-tracking branch 'cc9cii/editor-var-edit'
2015-03-12 10:44:55 +01:00
cc9cii
418025e0a2
Add missing editor type to the dialogue. Should resolve Bug #2437 .
2015-03-12 13:10:25 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
cc9cii
6d6ff8c6a4
Resolved compile issues, but not fully working.
2015-03-06 14:36:13 +11:00
cc9cii
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
2015-03-04 11:22:42 +11:00
Marc Zinnschlag
a148b851c0
added start script table
2015-03-03 14:32:12 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
7615cbafce
create modify commands through command dispatcher
2015-01-15 14:24:33 +01:00
Marc Zinnschlag
706df3f881
silenced a coverity warning
2015-01-15 12:13:53 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
Marc Zinnschlag
e6307a5151
move cursor in scripteditor to position of error
2014-12-08 12:29:23 +01:00
cc9cii
6731afc79c
Use float for setting skill use values. Should resolve bug #2183 .
2014-12-05 03:59:16 +11:00
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.
2014-12-01 06:44:12 +11:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
cc9cii
936094ae95
Set range of spinbox types in dialogsubview.
2014-11-26 08:08:28 +11:00
Marc Zinnschlag
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
2014-11-13 11:12:20 +01:00
Marc Zinnschlag
2acf446f18
added edit mode button to scene toolbar
2014-11-11 15:58:22 +01:00
cc9cii
a3a0682138
Remove files no longer used, reverting to OEngine.
2014-11-06 11:16:17 +11:00
cc9cii
f051fb65ff
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
2014-11-06 08:35:24 +11:00
cc9cii
03abd69b4f
Include string header for gcc.
2014-11-05 07:20:20 +11:00
cc9cii
7d133d508d
Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.
2014-11-05 07:10:14 +11:00
cc9cii
37a050873c
Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.
2014-11-04 21:46:35 +11:00
