dteviot
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
2015-06-21 16:23:40 +12:00
Stanislav Bas
dc37aea8eb
Add missing mappings to TableMimeData
2015-06-20 21:00:15 +03:00
Stanislav Bas
7dcdd130bb
Rework Dialogue subview code according to DropLineEdit changes
2015-06-20 20:52:47 +03:00
Marc Zinnschlag
c644f15167
calm down travis
2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86
standarised on the use of the Message struct when passing operations messages around
2015-06-20 17:56:42 +02:00
Stanislav Bas
64701b273d
LineEdits for ID values accept drops with a proper type
2015-06-20 18:29:31 +03:00
Marc Zinnschlag
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
2015-06-20 16:55:34 +02:00
Stanislav Bas
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
2015-06-20 17:33:36 +03:00
Marc Zinnschlag
9a102f81c8
added setting for controlling script compiler warnings
2015-06-20 16:21:04 +02:00
Marc Zinnschlag
1ee1934053
framework for accessing user settings in operation stages
2015-06-20 16:20:31 +02:00
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
2015-06-20 12:43:53 +03:00
Marc Zinnschlag
8aba52170f
fixed a build error
2015-06-20 11:34:32 +02:00
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
2015-06-20 11:29:15 +03:00
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
2015-06-19 19:24:06 +03:00
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
2015-06-19 13:49:48 +03:00
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
2015-06-19 12:51:50 +03:00
Stanislav Bas
a6734a0ea4
Add Cell Id completion to ReferenceCreator
2015-06-19 11:50:02 +03:00
cc9cii
3b27e643b8
Merge branch 'master' into cc9cii
...
Conflicts:
apps/opencs/view/doc/view.hpp
2015-06-19 07:49:18 +10:00
Stanislav Bas
36271f25ec
Rework creator factories to accept Document as a parameter
2015-06-18 22:59:40 +03:00
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
2015-06-18 16:37:49 +02:00
Marc Zinnschlag
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
2015-06-18 16:36:27 +02:00
cc9cii
ccf840da2b
Merge branch 'master' into autocalc
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-06-18 22:08:27 +10:00
cc9cii
ad04046243
Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663 .
...
- Currently does not auto-update when race, class or skills tables change.
2015-06-18 22:02:08 +10:00
Stanislav Bas
cf487581f7
Show the pop-up of ColorEditor immediately after the editor creation in tables
2015-06-18 12:50:46 +03:00
Marc Zinnschlag
12e0873446
Merge remote-tracking branch 'smbas/feature-info-tables-sorting'
2015-06-18 10:31:44 +02:00
Marc Zinnschlag
63d46f7e66
removed an unused variable
2015-06-18 10:26:35 +02:00
Marc Zinnschlag
0b32b24d60
Merge remote-tracking branch 'smbas/fix-enumdelegates'
2015-06-18 10:21:27 +02:00
Stanislav Bas
c60fed89ac
Enable sorting for Info tables
2015-06-17 23:50:18 +03:00
Stanislav Bas
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
2015-06-17 22:47:39 +03:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
Stanislav Bas
ed09424223
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
2015-06-16 22:39:12 +03:00
Stanislav Bas
1e368de289
Adjust columns of nested tables when a dialog subview is opened
2015-06-16 21:47:27 +03:00
Stanislav Bas
6cfee630aa
Proper size hint for DataDisplayDelegate
2015-06-16 21:25:06 +03:00
Stanislav Bas
2c1ca33a20
Refactor Enum- and DataDisplayDelegate code
2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc
Proper size hint for EnumDelegate
2015-06-16 14:18:47 +03:00
Marc Zinnschlag
62c5f185d7
Merge remote-tracking branch 'cc9cii/master'
2015-06-16 12:30:21 +02:00
Marc Zinnschlag
13112c6d04
Merge remote-tracking branch 'scrawl/aiwanderfix'
2015-06-16 12:28:34 +02:00
cc9cii
6a47ea9a67
fix typo
2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
2015-06-16 00:19:51 +03:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
609e146a22
Build fixes for windows
2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
2015-06-15 16:25:11 +02:00
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
2015-06-15 16:22:48 +02:00
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
2015-06-14 12:50:10 +02:00
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-14 12:05:53 +02:00
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
2015-06-14 14:51:01 +10:00
cc9cii
0efe8f5465
Fix broken launcher build for windows.
2015-06-14 14:42:08 +10:00
dteviot
520fbd63c4
simplified pathfinding code.
...
remove mIsPathConstructed. Instead call !mPath.empty().
2015-06-14 15:14:02 +12:00
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f
replaced #include with forward class declaration, as suggested by slaugherfish.
2015-06-14 10:30:55 +12:00
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
2015-06-13 23:50:12 +02:00
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
2015-06-13 23:49:27 +02:00
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
2015-06-13 11:33:12 +02:00
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 .
2015-06-13 14:37:47 +10:00
Stanislav Bas
a294e24a85
Reset ColorEditor checked state after the popup is hidden
2015-06-13 00:37:10 +03:00
Stanislav Bas
b06d1f008f
Redraw the color editor immediately after the color is updated
2015-06-12 23:34:08 +03:00
Stanislav Bas
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
2015-06-12 23:09:31 +03:00
Stanislav Bas
650e37dba1
RegionMap uses proper colors
2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
2015-06-12 22:03:47 +03:00
Stanislav Bas
caeba1b887
Draw the frame around rect in ColorEditor and ColorPickerDelegate
2015-06-12 20:34:35 +03:00
Stanislav Bas
eb5180ba86
Save selected color in a model when picking is finished
2015-06-12 18:33:55 +03:00
scrawl
89c2a7e26b
Fix for possibly missing library on windows
2015-06-12 15:22:19 +02:00
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.
2015-06-12 15:13:42 +02:00
Stanislav Bas
4096d2851c
Remove outdated ColorEditButton files
2015-06-12 14:09:25 +03:00
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
2015-06-12 02:00:06 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0
Compile fix for old boost versions
2015-06-11 23:25:26 +02:00
Stanislav Bas
e257c915bf
Add color picker popup to choose color
2015-06-12 00:00:23 +03:00
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
2015-06-11 22:36:19 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
Marc Zinnschlag
8d22d26669
Merge remote-tracking branch 'cc9cii/scrollbar-fix'
2015-06-10 18:51:14 +02:00
Stanislav Bas
ef88b28c26
Create a custom item editor for color columns
2015-06-09 15:20:50 +03:00
cc9cii
f989bfcd42
Merge branch 'master' into cc9cii
...
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/table.cpp
apps/opencs/view/world/table.hpp
2015-06-09 19:42:37 +10:00
Stanislav Bas
d7fb497255
Color values are displayed as colored rectangles in tables
2015-06-08 21:33:23 +03:00
Marc Zinnschlag
f3e040b531
Merge remote-tracking branch 'cc9cii/filter-fix'
2015-06-08 10:42:16 +02:00
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.
2015-06-08 08:04:18 +10:00
Stanislav Bas
c9a8d53240
Merge remote-tracking branch 'upstream/master'
2015-06-07 13:14:50 +03:00
Marc Zinnschlag
211f6a39b8
Merge remote-tracking branch 'cc9cii/keep-comments'
2015-06-07 09:00:37 +02:00
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
2015-06-07 08:52:44 +02:00
cc9cii
d3b7cf44d3
Remove user preference setting option.
2015-06-07 13:29:45 +10:00
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
2015-06-06 15:41:25 +03:00
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
2015-06-06 20:35:55 +10:00
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
2015-06-05 22:00:02 +03:00
cc9cii
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
2015-06-05 12:19:21 +10:00
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
2015-06-04 23:09:40 +03:00
Stanislav Bas
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55
IdCompletionManager uses Display type instread of ColumnId for creating completers
2015-06-03 12:01:13 +03:00
Stanislav Bas
4e759370de
Change Display_String to the proper display type where appropriate
2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500
CommandDelegate: extract a display type from a model if it isn't specified
2015-06-03 00:00:39 +03:00
scrawl
adc8e0b93e
Merge branch 'smbas-master'
2015-06-02 14:35:45 +02:00
Stanislav Bas
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
2015-06-02 00:26:31 +03:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
2015-06-01 16:49:28 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +03:00
Stanislav Bas
dbe61115b2
Fix the mistyping header guard in the idcompletiondelegate.hpp
2015-05-31 18:22:43 +03:00
Stanislav Bas
e636101725
Add missing new lines at the ends of files
2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
2015-05-31 16:43:28 +03:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
Stanislav Bas
994c6833bc
Add missing columns for the ID completion
2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91
Add ColumnId role to the IdTree data methods
2015-05-30 21:30:25 +03:00
Stanislav Bas
5e8718d8b2
Add the ID completion delegate factory to the delegate factory collection
2015-05-30 18:37:13 +03:00
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02:00
Stanislav Bas
33e36ee922
Add the ID completion delegate
2015-05-30 15:51:33 +03:00
Stanislav Bas
19cc6b83e5
Integrate the Id completion manager into the Document class
2015-05-30 15:40:23 +03:00
Stanislav Bas
87a1f9f9aa
Add ID completion manager
2015-05-30 15:31:44 +03:00
cc9cii
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
2015-05-30 21:12:47 +10:00
Marc Zinnschlag
88d5aed62d
removed code that interfered with the default window size on Linux ( Fixes #2568 )
2015-05-30 12:05:35 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
cc9cii
01eba7b721
Extra check for thread affinity.
2015-05-30 19:17:42 +10:00
cc9cii
76196d815d
Update user preference setting value via an event message queue.
2015-05-30 18:58:33 +10:00
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
2015-05-30 10:23:27 +02:00
cc9cii
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
2015-05-30 08:37:58 +10:00
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
2015-05-29 22:20:43 +10:00
cc9cii
393cee406f
Use signals for user preference setting updates.
2015-05-29 19:28:25 +10:00
cc9cii
ce421b230b
Move scrollbar to newly opened subview. Should resolve Bug #2576 .
2015-05-29 14:07:41 +10:00
cc9cii
734e52d1c8
Move the user preference check to the preparation step before the running of the operation.
2015-05-29 06:40:40 +10:00
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
2015-05-29 05:44:35 +10:00
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.
2015-05-29 05:40:20 +10:00
cc9cii
00c165d3a5
Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.
2015-05-28 08:44:17 +10:00
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
2015-05-27 19:45:26 +02:00
Marc Zinnschlag
baaf801521
Merge remote-tracking branch 'cc9cii/loadcell-fix'
2015-05-27 19:31:25 +02:00
cc9cii
674a124bc6
Don't use local type as a template parameter.
2015-05-27 22:27:32 +10:00
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
2015-05-27 22:12:11 +10:00
cc9cii
6966555377
Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582 .
2015-05-27 15:55:00 +10:00
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.
2015-05-27 10:27:57 +10:00
scrawl
2f97649540
Fix for cleanup issue when exiting after a failed savegame load ( Fixes #2580 )
2015-05-27 00:30:39 +02:00
Marc Zinnschlag
99dbd82a44
Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'
2015-05-26 14:37:50 +02:00
Marc Zinnschlag
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077
Qualify the scope of Flag_Dialogue.
2015-05-26 13:58:58 +10: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
cc9cii
95f740ec40
Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578 .
2015-05-25 22:28:41 +10:00
Marc Zinnschlag
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
2015-05-25 09:15:07 +10:00
