Marc Zinnschlag
|
69b9eadb52
|
refactored loading of land data
|
9 years ago |
Marc Zinnschlag
|
febf611c82
|
made return type of ESMTerrain::Storage::getLand const
|
9 years ago |
Marc Zinnschlag
|
69045d7ec9
|
additional safety check for land texture listing merge stage
|
9 years ago |
Marc Zinnschlag
|
890bbb6b11
|
merge land texture tables
|
9 years ago |
Marc Zinnschlag
|
b7983d08ba
|
fixed merge stage order; added proper initialisation
|
9 years ago |
Marc Zinnschlag
|
a97a632aa7
|
merge references tables
|
9 years ago |
Marc Zinnschlag
|
845cafd61c
|
fixed record state issues after merge
|
9 years ago |
Marc Zinnschlag
|
f95950e8d8
|
merge referenceables table
|
9 years ago |
Marc Zinnschlag
|
9cf793c0b5
|
silenced a warning
|
9 years ago |
Marc Zinnschlag
|
40753aa9a3
|
simplifying merge stage
|
9 years ago |
Marc Zinnschlag
|
16dda281ce
|
made merge operation more fluent
|
9 years ago |
Marc Zinnschlag
|
103073150e
|
added info tables and pathgrid table to merge operation
|
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
|
e76401d5ea
|
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
|
9 years ago |
Stanislav Bas
|
ba4b7df99d
|
Add missing includes to columnimp.hpp
|
10 years ago |
Stanislav Bas
|
720aca8f3d
|
Inform about State change (not a whole row) when modifying a table value
|
10 years ago |
Stanislav Bas
|
4d24eff859
|
Show race only when mesh type is Skin (in BodyParts table)
|
10 years ago |
Stanislav Bas
|
6d81ca07b5
|
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
|
10 years ago |
scrawl
|
32ad8c86bf
|
Fix the ESM::LandTexture NAME being discarded on loading
|
10 years ago |
scrawl
|
031d64d0d3
|
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
|
10 years ago |
Stanislav Bas
|
b7295e2632
|
Columns with Display_Boolean use Combobox editor even for non-boolean values
|
10 years ago |
Stanislav Bas
|
aeb1acca51
|
Remove enum names for AiWanderRepeat column
|
10 years ago |
Stanislav Bas
|
e14aedc7cd
|
ModifyCommand uses a proper name of a modified nested value
|
10 years ago |
Stanislav Bas
|
d038ac2da0
|
Sort tables by ID in the ascending order initially
|
10 years ago |
Marc Zinnschlag
|
3902513e65
|
merge id collections
|
10 years ago |
scrawl
|
67bd6cd708
|
Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
|
10 years ago |
scrawl
|
d1e1c0f38b
|
Editor: fix a typo in ESM::Light flag mappings
|
10 years ago |
Marc Zinnschlag
|
47dd9505a9
|
copy meta data from game file when merging
|
10 years ago |
Marc Zinnschlag
|
1b663f01af
|
create merged document and open a view for it (document is still empty at this point)
|
10 years ago |
Marc Zinnschlag
|
5558962b14
|
Merge remote-tracking branch 'scrawl/editor_creatureflag'
|
10 years ago |
Marc Zinnschlag
|
8bb28c3236
|
Merge remote-tracking branch 'corristo/osx-hidpi'
|
10 years ago |
Nikolay Kasyanov
|
dbcce482a6
|
OS X: enable high resolution mode for OpenMW & OpenCS
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
|
10 years ago |
scrawl
|
e36ebc77d5
|
Editor: remove creature flag of unknown purpose from the UI
|
10 years ago |
scrawl
|
c07ced4c8f
|
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
|
10 years ago |
Marc Zinnschlag
|
d8655f2ff8
|
forgot to connect merge operation signals
|
10 years ago |
Marc Zinnschlag
|
e2377396a7
|
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
|
10 years ago |
Marc Zinnschlag
|
904ad94952
|
added merge operation (doesn't do anything yet)
|
10 years ago |
Marc Zinnschlag
|
708cacdec4
|
disable merge menu item when a merge is already in progress
|
10 years ago |
Marc Zinnschlag
|
23ccee0124
|
Merge remote-tracking branch 'dieho/master'
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
|
10 years ago |
Marc Zinnschlag
|
7f10a7f24f
|
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
|
10 years ago |
Stanislav Bas
|
ff2dab8d56
|
Remove check for an empty Particle from Magic effects verifier
|
10 years ago |
Marc Zinnschlag
|
4fd3097c1c
|
improved adjuster widget problem reporting
|
10 years ago |
Marc Zinnschlag
|
b83f9445a9
|
added UI for merge tool (merge tool itself is still missing)
|
10 years ago |
Marc Zinnschlag
|
469a896ca1
|
make non-editable fields in dialogue sub view selectable (Fixes #2818)
|
10 years ago |
taras.kudryavtsev
|
8ae7c63c45
|
#2730 and #2725
|
10 years ago |
Stanislav Bas
|
cbc8309289
|
Don't allow empty value of School field in Magic Effects table
|
10 years ago |
Stanislav Bas
|
8da9eecea7
|
Correct comparison of enum values in IdTableProxyModel
|
10 years ago |
Stanislav Bas
|
0ea4d1981a
|
Add magic effect verifier
|
10 years ago |
Stanislav Bas
|
6b3de5c720
|
Activate editing of nested table cells by a double click
|
10 years ago |
Stanislav Bas
|
1590a04d03
|
Close EditWidget when a proper row removed
|
10 years ago |
Stanislav Bas
|
33042c1464
|
Restore Modified status of a record when adding/removing nested rows
|
10 years ago |
Stanislav Bas
|
25b653e316
|
Inform about Modified status change when modifying a value of a model
|
10 years ago |
Stanislav Bas
|
afb36b73eb
|
Proper index for Modified column in ModifyCommand
|
10 years ago |
Marc Zinnschlag
|
6a9218ee07
|
replaced State_Compiling (not requried anymore) with State_Merging
|
10 years ago |
Marc Zinnschlag
|
2c1cee38b4
|
Merge remote-tracking branch 'smbas/feature-extended-configurator'
|
10 years ago |
Stanislav Bas
|
03c2e11961
|
Update to upstream/master. Resolve merge conflicts
|
10 years ago |
Marc Zinnschlag
|
420503d5fc
|
Merge remote-tracking branch 'smbas/fix-bug-2728'
|
10 years ago |
Marc Zinnschlag
|
bafa86d3e9
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
Stanislav Bas
|
812fffbadc
|
Don't inform about a nested row addition in proxy models for top-level tables
|
10 years ago |
Stanislav Bas
|
2471e4d67a
|
Rework Table to use rowAdded() signal of a proxy model
|
10 years ago |
Stanislav Bas
|
86b7d2a43d
|
Inform about a row addition after re-sorting in InfoTableProxyModel
|
10 years ago |
Stanislav Bas
|
37fd733deb
|
Create a custom signal to inform about a row addition in IdTableProxyModel
|
10 years ago |
Stanislav Bas
|
c088cd4fa9
|
Proper index creation for nested data
|
10 years ago |
scrawl
|
b3f5ac5dbb
|
Include cleanup
|
10 years ago |
Marc Zinnschlag
|
fcf9ae42f4
|
Merge remote-tracking branch 'smbas/fix-table-proxy-bugs'
|
10 years ago |
Rohit Nirmal
|
6d2d32485f
|
Fix building OpenCS with Qt 5.
|
10 years ago |
Stanislav Bas
|
f5b1447c92
|
IdTableProxyModel refreshes the filter when the source model data or rows changed
|
10 years ago |
Stanislav Bas
|
a7b3248ee7
|
Proper sorting of columns with enum values
|
10 years ago |
Stanislav Bas
|
daaff1284e
|
Remove unused includes
|
10 years ago |
Stanislav Bas
|
13bb6be238
|
Load methods (for ESM records) accept a deleted flag in OpenCS
|
10 years ago |
Stanislav Bas
|
1e8182220a
|
Fix build errors & warnings
|
10 years ago |
Stanislav Bas
|
8e6a7be6f5
|
Implement saving of deleted records
|
10 years ago |
Stanislav Bas
|
e04e32bcff
|
Delete infos of deleted dialogue when loading a content file
|
10 years ago |
Stanislav Bas
|
a4d3e59e5c
|
Add a separate method to check whether a record is deleted or not for IdCollection
|
10 years ago |
Marc Zinnschlag
|
cdfa3006a3
|
incorrect sBribe GMSTs for new omwgame files (Fixes #2785)
|
10 years ago |
Marc Zinnschlag
|
b2ab0122ab
|
Merge branch 'scriptbuttons'
|
10 years ago |
Marc Zinnschlag
|
f1ac440b78
|
do not allow editing of deleted scripts
|
10 years ago |
Marc Zinnschlag
|
8763a3b3c3
|
make compilation delay configurable via a user setting
|
10 years ago |
Marc Zinnschlag
|
73b6df8280
|
put script compilation in script subview behind a timer
|
10 years ago |
scrawl
|
58720e6a28
|
Fix the OpenCS rendering crash on exit (Fixes #2735)
|
10 years ago |
Marc Zinnschlag
|
5febb96012
|
do not try to jump to source location for errors that do not have a source location
|
10 years ago |
Marc Zinnschlag
|
f665919046
|
consider column when jumping to error in source text
|
10 years ago |
Marc Zinnschlag
|
0abd29a3b4
|
jump to line in source text when clicking on an error in error table
|
10 years ago |
Marc Zinnschlag
|
100af80388
|
made error table read only
|
10 years ago |
Marc Zinnschlag
|
56ed0926bd
|
improved error table layout
|
10 years ago |
Marc Zinnschlag
|
eab1ec9160
|
consider script warning settings for script subview
|
10 years ago |
Marc Zinnschlag
|
9b12b4f1e2
|
refactored mapping from message severity enum to string
|
10 years ago |
Marc Zinnschlag
|
2d8a78726d
|
improved error reporting
|
10 years ago |
Marc Zinnschlag
|
2016ff773f
|
display script errors in script subview
|
10 years ago |
Stanislav Bas
|
3ba73f5fd9
|
Handle deleted records in RefCollection
|
10 years ago |
Stanislav Bas
|
a1389b87ba
|
Return a correct index for a loaded record that was deleted
|
10 years ago |
Stanislav Bas
|
5e623a2a1d
|
Rework RefIdData code. Update the index map when a new record is loaded
|
10 years ago |
Marc Zinnschlag
|
df027b3498
|
hooked up script subview buttons to bottom box (enables add and clone)
|
10 years ago |
Marc Zinnschlag
|
cf1fb76bb4
|
fixed deleted button sensitivity state
|
10 years ago |
Marc Zinnschlag
|
0860c27b03
|
improving consistency of subview layouts
|
10 years ago |
Marc Zinnschlag
|
2202973c24
|
replaced the script subview status bar with a bottom box (including a status bar)
|
10 years ago |
Marc Zinnschlag
|
fc6c14614b
|
added user settings option to toggle toolbars in single-record subviews
|
10 years ago |
Stanislav Bas
|
71e5fc7f04
|
Remove INAM handling from InfoCollection
|
10 years ago |
Marc Zinnschlag
|
749eff5259
|
renaming a few user settings categories
|
10 years ago |
Stanislav Bas
|
74a055f3cc
|
Remove NAME and DELE handling from IdCollection
|
10 years ago |
Stanislav Bas
|
42f9136141
|
Remove DELE and NAME handling from RefIdCollection and RefIdData
|
10 years ago |
Marc Zinnschlag
|
b97a4cee44
|
added button bar to script subview
|
10 years ago |
MiroslavR
|
13f289d1a5
|
Fix calculation of selected blocks in ScriptEdit
|
10 years ago |
Stanislav Bas
|
47d21ff4b3
|
Add edit locking to ExtendedCommandConfigurator
|
10 years ago |
Stanislav Bas
|
3c6bc74062
|
Close the extended configurator when all respective records were removed outside
|
10 years ago |
Marc Zinnschlag
|
6c5dc5c7a0
|
Merge remote-tracking branch 'smbas/fix-cell-creating'
|
10 years ago |
Stanislav Bas
|
ceb3dea55c
|
Rewording of the user setting for extended configuration
|
10 years ago |
Stanislav Bas
|
6162a46fbe
|
Update to upstream/master. Resolve the merge conflict
|
10 years ago |
Marc Zinnschlag
|
ea1ddb5c9f
|
Merge remote-tracking branch 'smbas/feature-dialogue-edit-id'
|
10 years ago |
Stanislav Bas
|
3ffa0aa185
|
Count of nested columns can be retrieved for a collection with no records
|
10 years ago |
Stanislav Bas
|
4fbd24206b
|
ExtendedCommandConfigurator: layout changes
|
10 years ago |
Stanislav Bas
|
880bc31ddf
|
TableBottomBox: Creator/Configurator can be closed via Escape
|
10 years ago |
Stanislav Bas
|
c1b06538dc
|
Add Edit 'ID' action for nested fields
|
10 years ago |
Stanislav Bas
|
30fd711a47
|
TableEditIdAction: prevent creation of a UniversalId with Type_None
|
10 years ago |
Stanislav Bas
|
86dc5a2c67
|
Add Edit 'ID' action for nested tables
|
10 years ago |
Stanislav Bas
|
464e674a81
|
Rework Table (view) code to use a TableEditIdAction
|
10 years ago |
Stanislav Bas
|
6b34845168
|
Create a separate class for Edit 'ID' action to use in tables' context menus
|
10 years ago |
Stanislav Bas
|
1f826476ff
|
Fix build error
|
10 years ago |
Stanislav Bas
|
ff3c9a6fb2
|
ExtendedCommandConfigurator: the perform button is now the default for the widget
|
10 years ago |
Stanislav Bas
|
e664ef7578
|
ExtendedCommandConfigurator: the perform button takes the name of the command that is executed
|
10 years ago |
Stanislav Bas
|
05cc130212
|
The configuration panel gets a focus when opening
|
10 years ago |
Stanislav Bas
|
95d16b24c0
|
ExtendedCommandConfigurator: disable the perform button when all tables are unchecked
|
10 years ago |
Stanislav Bas
|
260f6f22ae
|
TableBottomBox adjusts its size according to the current widget size
|
10 years ago |
Stanislav Bas
|
d73fd471c3
|
IdContextMenu: don't add Edit action if it's already in the context menu
|
10 years ago |
Stanislav Bas
|
61ab0ba482
|
Prevent the Edit 'ID' action for the current ID of the dialogue subview
|
10 years ago |
Stanislav Bas
|
149cb9d004
|
IdContextMenu: if the ID field is empty show the standard context menu (if available)
|
10 years ago |
Stanislav Bas
|
e8e34f37dd
|
Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)
|
10 years ago |
Stanislav Bas
|
47b66b57ae
|
Create a context menu handler for dialogue editors with ID information
|
10 years ago |
Marc Zinnschlag
|
382cdb8c60
|
implemented sorting in report views (Fixes #2540)
|
10 years ago |
scrawl
|
2385938485
|
Fix a typo
|
10 years ago |
Stanislav Bas
|
12bf3694bd
|
Rework widget layout of ExtendedCommandConfigurator
|
10 years ago |
Stanislav Bas
|
b8772c6902
|
Add the ability to configure extended commands for tables
|
10 years ago |
Stanislav Bas
|
fcf69555f4
|
Add the user setting for enabling the configuration of extended commands
|
10 years ago |
Stanislav Bas
|
ba762ec1c1
|
Add the configuration widget to the bottom box
|
10 years ago |
Stanislav Bas
|
1949fe4bf9
|
Add the configuration widget for extended commands
|
10 years ago |
Stanislav Bas
|
1afa22f443
|
Add the RecordType column to the MetaData table
|
10 years ago |
Stanislav Bas
|
51a2d4ef5a
|
Merge remote-tracking branch 'upstream/master'
|
10 years ago |
Marc Zinnschlag
|
d3bcf0711c
|
Merge remote-tracking branch 'smbas/feature-cloning-enhancements'
|
10 years ago |
Stanislav Bas
|
e2103287aa
|
Not accepted drag event must be ignored
|
10 years ago |
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
10 years ago |
Stanislav Bas
|
e4d52ff9b0
|
Deleted records can be cloned
|
10 years ago |
Stanislav Bas
|
9d274ee156
|
Merge branch 'master' into feature-cloning-enhancements
|
10 years ago |
Stanislav Bas
|
81c7ce5b06
|
Add the proper getErrors() method to CellCreator.
Fix the impossibility of the Exterior Cell creation.
|
10 years ago |
Marc Zinnschlag
|
15bb2855a9
|
disable prev/next buttons if there is no previous/next record
|
10 years ago |
Marc Zinnschlag
|
e27a75bd10
|
added user setting for cyclic prev/next
|
10 years ago |
Marc Zinnschlag
|
95522fcad2
|
more general cleanup
|
10 years ago |
Marc Zinnschlag
|
9aa153984a
|
fixed inconsistent handling of deleted records in dialogue; general cleanup
|
10 years ago |
Marc Zinnschlag
|
a8c26ec0c1
|
moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar
|
10 years ago |
Marc Zinnschlag
|
d5e6d8a58b
|
disable dialogue subview buttons while document is locked
|
10 years ago |
Marc Zinnschlag
|
6769479358
|
moved code for initiating record cloning from DialogueSubView to RecordButtonBar
|
10 years ago |
Marc Zinnschlag
|
7f1129df3b
|
cleaned up DialogueSubView constructor; moved bottom box below button bar
|
10 years ago |
Marc Zinnschlag
|
49dc30683f
|
refactored dialogue subview button bar into a new class
|
10 years ago |
Stanislav Bas
|
cbb124ab4f
|
Close the creator when the original record is removed (in clone mode)
|
10 years ago |
Stanislav Bas
|
cad4ce4e0f
|
Cell type can be changed when cloning a cell
|
10 years ago |
Stanislav Bas
|
5761ec428d
|
Creating/cloning Cell sets the proper Interior flag
|
10 years ago |
Stanislav Bas
|
f3bb00e3d9
|
Add the ability to add nested values to the Create command
|
10 years ago |
Stanislav Bas
|
a7f31988d1
|
Add the ability to search a nested column index
|
10 years ago |
Marc Zinnschlag
|
6d5823e8aa
|
killed some tabs
|
10 years ago |
Marc Zinnschlag
|
fdf6645dbc
|
Merge remote-tracking branch 'smbas/fix-info-tables'
|
10 years ago |
Marc Zinnschlag
|
654e7428aa
|
Merge remote-tracking branch 'smbas/master'
|
10 years ago |
Marc Zinnschlag
|
2dada1a162
|
Merge branch 'meta'
|
10 years ago |
Marc Zinnschlag
|
4487bda702
|
size limits for meta data strings
|
10 years ago |
Marc Zinnschlag
|
a4c2c75d1f
|
fixed overwriting of meta data when loading project file
|
10 years ago |
Marc Zinnschlag
|
1e033fa8fe
|
added meta data dialogue sub view
|
10 years ago |
Marc Zinnschlag
|
57015f3666
|
fixed handling of numeric read-only fields in dialogue sub views
|
10 years ago |
Marc Zinnschlag
|
10fbe6aada
|
split DialogueSubView in SimpleDialogueSubView and DialogueSubView
|
10 years ago |
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 |