Marc Zinnschlag
5a37530c1c
added missing MetaData table UniversalId type
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
Stanislav Bas
feeb9ea8b0
Merge remote-tracking branch 'upstream/master'
10 years ago
Stanislav Bas
ea97b0a20c
Refine InfoTableProxyModel::getFirstInfoRow() code
10 years ago
Stanislav Bas
844e5c504d
Fix conversion to QString
10 years ago
Stanislav Bas
867ce686ae
Proper conversion to QString for DropLineEdit::dropEvent()
10 years ago
Marc Zinnschlag
8fbc799655
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
69db0179ca
update refresh menu item on stateChanged signal instead of when opening the menu
10 years ago
cc9cii
c0f3d70f06
Use the new severity message attribute.
10 years ago
cc9cii
71f3b7ed4f
Fix crash when user preference is missing.
10 years ago
Marc Zinnschlag
6fbdbb11d5
added refrash menu item to report table ( Fixes #2620 )
10 years ago
Stanislav Bas
d282bead23
InfoCreator accepts drops of Topic/Journal ID
10 years ago
Stanislav Bas
5b82b9d9d0
ReferenceCreator accepts drops of Cell ID
10 years ago
Stanislav Bas
21f0b586ec
Rows with the same topic but in different letter case can be reordered
10 years ago
Marc Zinnschlag
e29d9bcc8e
use a namespace instead of a class with only static functions
10 years ago
Marc Zinnschlag
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
10 years ago
Stanislav Bas
270c17faa7
Prevent drops on non-editable table cells
10 years ago
Stanislav Bas
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
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
Stanislav Bas
d606b62688
Nested tables accept drops
10 years ago
Stanislav Bas
b9882eb59a
DragRecordTable checks drag type before accepting it
10 years ago
Stanislav Bas
a23de394f8
Refine DropLineEdit code
10 years ago
Stanislav Bas
2565452052
Add some drag'n'drop utils to work with TableMimeData
10 years ago
Stanislav Bas
dc37aea8eb
Add missing mappings to TableMimeData
10 years ago
Stanislav Bas
7dcdd130bb
Rework Dialogue subview code according to DropLineEdit changes
10 years ago
Marc Zinnschlag
c644f15167
calm down travis
10 years ago
Marc Zinnschlag
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
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
Stanislav Bas
64701b273d
LineEdits for ID values accept drops with a proper type
10 years ago
Marc Zinnschlag
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
10 years ago
Stanislav Bas
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
10 years ago
Marc Zinnschlag
9a102f81c8
added setting for controlling script compiler warnings
10 years ago
Marc Zinnschlag
1ee1934053
framework for accessing user settings in operation stages
10 years ago
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
10 years ago
Marc Zinnschlag
8aba52170f
fixed a build error
10 years ago
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
10 years ago
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
10 years ago
Stanislav Bas
e212414bc7
Use an ID parent type as the collection ID in GenericCreator.
...
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
10 years ago
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
10 years ago
Stanislav Bas
a6734a0ea4
Add Cell Id completion to ReferenceCreator
10 years ago
Stanislav Bas
36271f25ec
Rework creator factories to accept Document as a parameter
10 years ago
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
Marc Zinnschlag
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
10 years ago
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
scrawl
76799982a5
Add missing include
10 years ago
Stanislav Bas
cf487581f7
Show the pop-up of ColorEditor immediately after the editor creation in tables
10 years ago
Marc Zinnschlag
12e0873446
Merge remote-tracking branch 'smbas/feature-info-tables-sorting'
10 years ago
Marc Zinnschlag
63d46f7e66
removed an unused variable
10 years ago
Marc Zinnschlag
0b32b24d60
Merge remote-tracking branch 'smbas/fix-enumdelegates'
10 years ago
Stanislav Bas
c60fed89ac
Enable sorting for Info tables
10 years ago
Stanislav Bas
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
10 years ago
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
10 years ago
Stanislav Bas
ed09424223
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
10 years ago
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
Stanislav Bas
1e368de289
Adjust columns of nested tables when a dialog subview is opened
10 years ago
Stanislav Bas
6cfee630aa
Proper size hint for DataDisplayDelegate
10 years ago
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
Stanislav Bas
2c1ca33a20
Refactor Enum- and DataDisplayDelegate code
10 years ago
Stanislav Bas
0ffb2bc6bc
Proper size hint for EnumDelegate
10 years ago
Marc Zinnschlag
62c5f185d7
Merge remote-tracking branch 'cc9cii/master'
10 years ago
cc9cii
6a47ea9a67
fix typo
10 years ago
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
10 years ago
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
10 years ago
scrawl
609e146a22
Build fixes for windows
10 years ago
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
10 years ago
scrawl
412e001edb
Fix simulation time reset in OpenCS when opening a new view
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
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
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
10 years ago
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
10 years ago
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
10 years ago
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
10 years ago
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
Stanislav Bas
a294e24a85
Reset ColorEditor checked state after the popup is hidden
10 years ago
Stanislav Bas
b06d1f008f
Redraw the color editor immediately after the color is updated
10 years ago
Stanislav Bas
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
10 years ago
Stanislav Bas
650e37dba1
RegionMap uses proper colors
10 years ago
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
10 years ago
Stanislav Bas
caeba1b887
Draw the frame around rect in ColorEditor and ColorPickerDelegate
10 years ago
Stanislav Bas
eb5180ba86
Save selected color in a model when picking is finished
10 years ago
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
Stanislav Bas
4096d2851c
Remove outdated ColorEditButton files
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
scrawl
d03880fbf0
Compile fix for old boost versions
10 years ago
Stanislav Bas
e257c915bf
Add color picker popup to choose color
10 years ago
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
10 years ago
Marc Zinnschlag
8d22d26669
Merge remote-tracking branch 'cc9cii/scrollbar-fix'
10 years ago
Stanislav Bas
ef88b28c26
Create a custom item editor for color columns
10 years ago
Stanislav Bas
d7fb497255
Color values are displayed as colored rectangles in tables
10 years ago
Alexander "Ace" Olofsson
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
10 years ago
cc9cii
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
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
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
10 years ago
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
10 years ago
cc9cii
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
10 years ago
scrawl
958b34771a
Fix clang warnings about 'typename' outside of a template
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
1ba3fa4169
Remove leftovers of the old OpenCS navigation
10 years ago
Stanislav Bas
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
10 years ago
Stanislav Bas
b25cc6bc55
IdCompletionManager uses Display type instread of ColumnId for creating completers
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
cd47dff196
Minor cleanup
10 years ago
scrawl
cdd0623009
Terrain rendering
10 years ago
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
10 years ago
Stanislav Bas
f84c36b500
CommandDelegate: extract a display type from a model if it isn't specified
10 years ago
Stanislav Bas
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
10 years ago
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
10 years ago
Stanislav Bas
dbe61115b2
Fix the mistyping header guard in the idcompletiondelegate.hpp
10 years ago
Stanislav Bas
e636101725
Add missing new lines at the ends of files
10 years ago
Stanislav Bas
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
Stanislav Bas
994c6833bc
Add missing columns for the ID completion
10 years ago
Stanislav Bas
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
10 years ago
Stanislav Bas
602f33bd91
Add ColumnId role to the IdTree data methods
10 years ago
Stanislav Bas
5e8718d8b2
Add the ID completion delegate factory to the delegate factory collection
10 years ago
Stanislav Bas
33e36ee922
Add the ID completion delegate
10 years ago
Stanislav Bas
19cc6b83e5
Integrate the Id completion manager into the Document class
10 years ago
Stanislav Bas
87a1f9f9aa
Add ID completion manager
10 years ago
cc9cii
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
10 years ago
Marc Zinnschlag
88d5aed62d
removed code that interfered with the default window size on Linux ( Fixes #2568 )
10 years ago
cc9cii
01eba7b721
Extra check for thread affinity.
10 years ago
cc9cii
76196d815d
Update user preference setting value via an event message queue.
10 years ago
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
10 years ago
cc9cii
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
10 years ago
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
10 years ago
cc9cii
393cee406f
Use signals for user preference setting updates.
10 years ago
cc9cii
ce421b230b
Move scrollbar to newly opened subview. Should resolve Bug #2576 .
10 years ago
cc9cii
734e52d1c8
Move the user preference check to the preparation step before the running of the operation.
10 years ago
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
10 years ago
cc9cii
6821cb4133
Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586 .
...
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
10 years ago
cc9cii
00c165d3a5
Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.
10 years ago
Marc Zinnschlag
baaf801521
Merge remote-tracking branch 'cc9cii/loadcell-fix'
10 years ago
cc9cii
674a124bc6
Don't use local type as a template parameter.
10 years ago
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
cc9cii
6966555377
Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582 .
10 years ago
cc9cii
b7044ac119
Fix crash loading some addon files. Should resolve Bug #2583 .
...
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
10 years ago
Marc Zinnschlag
99dbd82a44
Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'
10 years ago
Marc Zinnschlag
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
10 years ago
cc9cii
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
10 years ago
cc9cii
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
10 years ago
cc9cii
2f29c2c077
Qualify the scope of Flag_Dialogue.
10 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
10 years ago
cc9cii
95f740ec40
Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578 .
10 years ago
Marc Zinnschlag
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
10 years ago
cc9cii
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
10 years ago
cc9cii
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
10 years ago
Marc Zinnschlag
6402b82823
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
10 years ago
cc9cii
22420c3a83
Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575 .
...
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
10 years ago
cc9cii
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
cc9cii
21af1913e1
Ensure ColumnId names are unique.
10 years ago
scrawl
da24e298ee
Fix -Wreorder warnings
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
Marc Zinnschlag
53b4c15d85
Merge remote-tracking branch 'smbas/master'
10 years ago
Marc Zinnschlag
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
10 years ago
Stanislav Bas
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
Stanislav Bas
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
10 years ago
cc9cii
aecd9a275e
Remove debugging comments.
10 years ago
cc9cii
2fc964ca73
Grey out disabled entries rather than hiding them.
10 years ago
cc9cii
1d0b8587a1
Use HasWater bit flag rather than mWaterInt bool.
10 years ago
scrawl
820f4a2688
Fix light direction
10 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
10 years ago
cc9cii
aeec1be8b3
Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable.
10 years ago
cc9cii
0ecfd9119f
Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546 .
10 years ago
Marc Zinnschlag
5176e3d84b
Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar'
10 years ago
cc9cii
7494340b66
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547 .
10 years ago
cc9cii
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
10 years ago
Marc Zinnschlag
7b207a7954
added shortcut for closing subviews ( Fixes #2558 )
10 years ago
Marc Zinnschlag
93c3bb3716
fixed subview-closing related crash ( Fixes #2564 )
10 years ago
cc9cii
e9ca022162
Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549 .
...
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
Grow Only: No change to current, except the use of size hints
Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
10 years ago
Marc Zinnschlag
60a835c16d
stop script editor from eating undo/redo shortcuts ( Fixes #2506 )
10 years ago
Marc Zinnschlag
27000fb36b
don't reject single precision float values in value filters ( Fixes #2533 )
10 years ago
cc9cii
28617c8beb
Update table size status for removed rows.
10 years ago
cc9cii
f92d801faf
Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541 . Controlled by radio buttons on user preferences settings.
10 years ago
Marc Zinnschlag
c9d519f36c
focus search input field when opening search subview ( Fixes #2534 )
10 years ago
cc9cii
538e550b2b
Fix for Bug #2543 . Spells magic effect id typo.
10 years ago
scrawl
47758c11cd
Readded collision objects and movement physics
10 years ago
cc9cii
2b84598e85
Remove duplicated but reversed map.
10 years ago
cc9cii
ab21c0551c
Provide a default encoding when changing to "Function".
10 years ago
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
10 years ago
cc9cii
587efcfe9d
Use better initial value type. Fix exception while saving values.
10 years ago
cc9cii
5fb269336f
Don't use initializer list
10 years ago
cc9cii
d6ecc64168
Aggregate types can't be static - osx compiler appears to be more strict.
10 years ago
cc9cii
69317095be
For compiling with osx - try using a different syntax for initializing the static maps.
10 years ago
cc9cii
0c461f4424
Add TopicInfos special conditions table.
10 years ago
Marc Zinnschlag
1c334a01ce
one more referenceable that escaped the change into object
10 years ago
scrawl
c1edc30ad7
Dead code removal
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
scrawl
5a759f8b0d
GUI cleanup fix
10 years ago
Marc Zinnschlag
048d7be87c
Adjusted terminology for references/referenceables in OpenMW-CS user-interface ( Fixes #2516 )
10 years ago
Marc Zinnschlag
d873c2c603
focus main input widget when bringing up creator bar ( Fixes #2514 )
10 years ago
Marc Zinnschlag
0bf28a6eab
Merge remote-tracking branch 'cc9cii/leveled-list-edit'
10 years ago
Marc Zinnschlag
efde061c7c
Merge remote-tracking branch 'cc9cii/script-dialog'
10 years ago
cc9cii
b04aeb6aad
Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.
10 years ago
cc9cii
081f3ed263
Make font setting selection immediate.
10 years ago
cc9cii
7b4a9f1ea1
Moved script editor settings to its own section.
10 years ago
cc9cii
8e49ccc2f4
Added user setting options.
10 years ago
cc9cii
7f2bd01f79
Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
cc9cii
28048c0bf3
Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512 .
10 years ago
Marc Zinnschlag
f1c0847897
Merge remote-tracking branch 'cc9cii/moveref'
10 years ago
cc9cii
49884f54f7
Fix loading moved references.
10 years ago
Marc Zinnschlag
ae5de0cb2b
implemented additional check before performing replace (make sure data hasn't been changed since the search)
10 years ago
Marc Zinnschlag
6fac4c5dd9
made user settings handling in search sub view more consistent
10 years ago
Marc Zinnschlag
dab650a3d5
remove rows from result table after a successful replace (configurable via user settings)
10 years ago
cc9cii
33a8cd245a
Fix crash with gcc/linux.
10 years ago
Marc Zinnschlag
2ef8103cc7
fixed ReportModel::RemoveRows view updates
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
7673be6d0f
Loading of moved refs complete.
10 years ago
cc9cii
74b98f7178
Fixed initial loading of moved refs.
10 years ago
cc9cii
2e2d6e04fe
gcc friendly version.
10 years ago
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
10 years ago
cc9cii
932f1f9fbd
Alternative way of finding UniversalId without bloating IdTree.
10 years ago
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
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
cc9cii
8aaa74a983
Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.
10 years ago
cc9cii
a6925683c6
Off by one error - can't delete the last element of a refid collection.
10 years ago
Marc Zinnschlag
6fcf4ea9e3
In ModifyCommand replace proxy model with the source model ( Fixes #2498 )
10 years ago
cc9cii
82bc666e00
Make AI package items to be editable when a new row is added.
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
cc9cii
a836446d22
Fix assert() triggering due to bad index being passed.
10 years ago
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
10 years ago
cc9cii
cb3396643b
Back to the old layout of dialoguesubview.
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
cc9cii
8b1ac451ac
More warning fixes.
10 years ago
cc9cii
dd1e4e8b69
Remove gcc/clang warnings.
10 years ago
cc9cii
7561b195ab
Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes.
10 years ago
cc9cii
48a6006202
Prevent enum delegates from auto expanding when opening a dialogue subview.
10 years ago
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)
10 years ago
cc9cii
f88be67556
Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate
10 years ago
cc9cii
e241fb0104
Convert clothing/armour part reference type column in the nested tables to use enum delegates.
10 years ago
cc9cii
e00d7f72ac
Convert magic effects ID and Range columns in the nested tables to use enum delegate
10 years ago
cc9cii
befd6fe658
Convert magic effects Skills column in the nested tables to use enum delegates.
10 years ago
cc9cii
0aff188d8d
Fix enum delegate from adding a command to the undo stack when the value has not changed.
10 years ago
cc9cii
d6c2cff381
Convert magic effects Attribute column in the nested tables to use enum delegates.
10 years ago
cc9cii
c41b4b84a6
Cleanup post merge.
10 years ago
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
10 years ago
cc9cii
32e73c3deb
Add creature/item levelled lists (non table items) to dialogue subview.
10 years ago
Marc Zinnschlag
38ce074a62
Merge branch 'replace'
10 years ago
Marc Zinnschlag
b939fd440e
added replace all button
10 years ago
Marc Zinnschlag
36ce2d61f4
consider lock mode when replacing
10 years ago
Marc Zinnschlag
4951fc477c
added replace function
10 years ago
cc9cii
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
10 years ago