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
Marc Zinnschlag
6402b82823
Merge remote-tracking branch 'cc9cii/master'
2015-05-24 21:15:36 +02:00
Marc Zinnschlag
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
2015-05-24 21:15:26 +02:00
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)
2015-05-24 23:19:06 +10:00
cc9cii
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-05-24 19:24:27 +10:00
cc9cii
21af1913e1
Ensure ColumnId names are unique.
2015-05-24 19:18:54 +10:00
Marc Zinnschlag
53b4c15d85
Merge remote-tracking branch 'smbas/master'
2015-05-23 16:02:09 +02:00
Marc Zinnschlag
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
2015-05-23 09:19:03 +02:00
Stanislav Bas
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
2015-05-22 23:53:25 +03:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
Stanislav Bas
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
2015-05-22 00:57:47 +03:00
cc9cii
aecd9a275e
Remove debugging comments.
2015-05-22 06:09:55 +10:00
cc9cii
2fc964ca73
Grey out disabled entries rather than hiding them.
2015-05-21 13:11:07 +10: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
aeec1be8b3
Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable.
2015-05-19 19:19:52 +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
Marc Zinnschlag
5176e3d84b
Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar'
2015-05-18 16:46:03 +02:00
cc9cii
7494340b66
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547 .
2015-05-18 22:08:36 +10:00
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
2015-05-18 07:12:02 +10:00
Marc Zinnschlag
7b207a7954
added shortcut for closing subviews ( Fixes #2558 )
2015-05-17 14:31:53 +02:00
Marc Zinnschlag
93c3bb3716
fixed subview-closing related crash ( Fixes #2564 )
2015-05-17 14:27:17 +02:00
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.
2015-05-17 20:45:13 +10:00
Marc Zinnschlag
60a835c16d
stop script editor from eating undo/redo shortcuts ( Fixes #2506 )
2015-05-16 10:18:11 +02:00
cc9cii
4b57f6c821
Modifying an object instance (e.g. 3D edit) triggers the instances table to scroll to the corresponding record. Should resolve Feature #2554 .
2015-05-16 08:05:12 +10:00
Marc Zinnschlag
27000fb36b
don't reject single precision float values in value filters ( Fixes #2533 )
2015-05-15 14:09:35 +02:00
cc9cii
28617c8beb
Update table size status for removed rows.
2015-05-15 12:33:31 +10:00
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.
2015-05-15 12:32:29 +10:00
Marc Zinnschlag
c9d519f36c
focus search input field when opening search subview ( Fixes #2534 )
2015-05-14 14:48:29 +02:00
cc9cii
89323d1529
Merge pull request #3 from cc9cii/global-filter-shortcut
...
Global filter shortcuts
2015-05-14 19:41:54 +10:00
cc9cii
60f963382b
Feature #2532 . Global filter shortcuts for project::added and project::modified.
...
- Add a startup warning message if global filters are being used.
- Add tooltip messages for the checkbox shortcuts.
2015-05-14 19:36:39 +10:00
cc9cii
3514dac9bc
Merge branch 'master' into cc9cii
2015-05-14 06:54:58 +10:00
cc9cii
538e550b2b
Fix for Bug #2543 . Spells magic effect id typo.
2015-05-13 10:30:44 +10:00
cc9cii
65a88aaedb
Feature #2532 . Global filter shortcuts for project::added and project::modified.
...
- Initial global filter shortcuts are set in the user preferences setting. These are applied when a table is first opened.
- Subsequent changes are done per table view via tickboxes next to the record filter box.
2015-05-12 23:47:36 +10:00
cc9cii
680e46441d
Feature #2533 . Similar but less complete implementation PR was not accepted (see https://github.com/OpenMW/openmw/pull/276#issuecomment-57612802 ).
...
- User preferences setting to save the window state (position, geometry, etc) at the time of exit.
- User preferences setting to workaround some X window managers not keeping pre-maximised state.
- Uses opencs.ini to store window states between sessions.
2015-05-12 08:21:05 +10:00
cc9cii
2b84598e85
Remove duplicated but reversed map.
2015-05-10 20:52:29 +10:00
cc9cii
ab21c0551c
Provide a default encoding when changing to "Function".
2015-05-10 13:34:45 +10:00
cc9cii
587efcfe9d
Use better initial value type. Fix exception while saving values.
2015-05-10 07:49:18 +10:00
cc9cii
5fb269336f
Don't use initializer list
2015-05-10 07:02:08 +10:00
cc9cii
d6ecc64168
Aggregate types can't be static - osx compiler appears to be more strict.
2015-05-10 06:17:57 +10:00
cc9cii
69317095be
For compiling with osx - try using a different syntax for initializing the static maps.
2015-05-10 05:55:50 +10:00
cc9cii
0c461f4424
Add TopicInfos special conditions table.
2015-05-09 21:21:16 +10:00
Marc Zinnschlag
1c334a01ce
one more referenceable that escaped the change into object
2015-05-04 19:04:06 +02:00
Marc Zinnschlag
048d7be87c
Adjusted terminology for references/referenceables in OpenMW-CS user-interface ( Fixes #2516 )
2015-05-03 16:35:10 +02:00
Marc Zinnschlag
d873c2c603
focus main input widget when bringing up creator bar ( Fixes #2514 )
2015-05-02 13:20:42 +02:00
Marc Zinnschlag
0bf28a6eab
Merge remote-tracking branch 'cc9cii/leveled-list-edit'
2015-05-01 18:44:14 +02:00
Marc Zinnschlag
efde061c7c
Merge remote-tracking branch 'cc9cii/script-dialog'
2015-05-01 09:12:39 +02:00
cc9cii
b04aeb6aad
Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.
2015-05-01 12:14:09 +10:00
cc9cii
081f3ed263
Make font setting selection immediate.
2015-05-01 06:08:04 +10:00
cc9cii
7b4a9f1ea1
Moved script editor settings to its own section.
2015-04-30 06:32:03 +10:00
cc9cii
8e49ccc2f4
Added user setting options.
2015-04-29 20:24:17 +10:00
cc9cii
7f2bd01f79
Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.
2015-04-29 12:08:11 +10:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
cc9cii
28048c0bf3
Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512 .
2015-04-28 23:07:42 +10:00
Marc Zinnschlag
f1c0847897
Merge remote-tracking branch 'cc9cii/moveref'
2015-04-28 14:07:18 +02:00
cc9cii
49884f54f7
Fix loading moved references.
2015-04-28 08:07:01 +10:00
Marc Zinnschlag
ae5de0cb2b
implemented additional check before performing replace (make sure data hasn't been changed since the search)
2015-04-27 22:43:09 +02:00
Marc Zinnschlag
6fac4c5dd9
made user settings handling in search sub view more consistent
2015-04-26 13:31:35 +02:00
Marc Zinnschlag
dab650a3d5
remove rows from result table after a successful replace (configurable via user settings)
2015-04-26 13:26:20 +02:00
cc9cii
33a8cd245a
Fix crash with gcc/linux.
2015-04-26 21:02:50 +10:00
Marc Zinnschlag
2ef8103cc7
fixed ReportModel::RemoveRows view updates
2015-04-26 12:36:05 +02:00
cc9cii
889749a493
Allow non-empty mOriginalCell (case where a moved ref is moved again)
2015-04-26 15:44:40 +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
e0d061c37b
Implemented a workaround for saving moved refs.
2015-04-26 12:32:07 +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
2e2d6e04fe
gcc friendly version.
2015-04-25 17:43:29 +10:00
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
2015-04-25 17:20:02 +10:00
cc9cii
932f1f9fbd
Alternative way of finding UniversalId without bloating IdTree.
2015-04-25 15:26:32 +10:00
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
2015-04-25 09:39:37 +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
8aaa74a983
Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.
2015-04-25 06:06:11 +10:00
cc9cii
a6925683c6
Off by one error - can't delete the last element of a refid collection.
2015-04-25 06:04:39 +10:00
cc9cii
3102a17522
Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.
2015-04-24 04:00:49 +10:00
cc9cii
b46086912c
Merge remote-tracking branch 'remotes/upstream/master' into pathgrid-edit
2015-04-24 01:38:34 +10:00
cc9cii
e7bd298739
Undo now working via signals.
2015-04-24 01:28:49 +10:00
Marc Zinnschlag
6fcf4ea9e3
In ModifyCommand replace proxy model with the source model ( Fixes #2498 )
2015-04-23 14:24:43 +02:00
cc9cii
1a31aecc2f
Undo rendering works, but not using signals yet.
2015-04-23 22:20:45 +10:00
cc9cii
27a73a25e3
Saving to document via UndoStack implemented.
2015-04-23 08:50:05 +10:00
cc9cii
82bc666e00
Make AI package items to be editable when a new row is added.
2015-04-22 09:25:55 +10:00
Marc Zinnschlag
f7c7aeecb3
fixed missing state update when starting a global search
2015-04-21 14:44:51 +02:00
cc9cii
0e3e3cbae2
Merge branch 'master' into pathgrid-edit
2015-04-21 19:44:44 +10:00
cc9cii
f326b14604
Allow Qt to cleanup its signals.
2015-04-21 10:25:19 +10:00
cc9cii
a836446d22
Fix assert() triggering due to bad index being passed.
2015-04-19 21:07:45 +10:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
cc9cii
cb3396643b
Back to the old layout of dialoguesubview.
2015-04-19 10:32:06 +10:00
cc9cii
8b1ac451ac
More warning fixes.
2015-04-19 09:42:44 +10:00
cc9cii
dd1e4e8b69
Remove gcc/clang warnings.
2015-04-19 08:58:52 +10:00
cc9cii
68dbf929a2
Add updated pathgrid marker nif file and fix merge issues.
2015-04-18 16:14:25 +10:00
cc9cii
03578129c7
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-18 15:47:45 +10:00
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
f88be67556
Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate
2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104
Convert clothing/armour part reference type column in the nested tables to use enum delegates.
2015-04-18 08:31:08 +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
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
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
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
cc9cii
32e73c3deb
Add creature/item levelled lists (non table items) to dialogue subview.
2015-04-17 11:50:19 +10:00
Marc Zinnschlag
38ce074a62
Merge branch 'replace'
2015-04-16 20:11:25 +02:00
Marc Zinnschlag
b939fd440e
added replace all button
2015-04-16 20:11:14 +02:00
Marc Zinnschlag
36ce2d61f4
consider lock mode when replacing
2015-04-16 19:02:03 +02:00
Marc Zinnschlag
4951fc477c
added replace function
2015-04-16 18:50:22 +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
1c7ed795c2
Add creature/item levelled lists to dialogue subview.
2015-04-13 22:21:27 +10:00
cc9cii
513c3a47cb
Add clothing/armor part reference table to dialogue subview.
2015-04-13 21:08:23 +10:00
cc9cii
526b53fce0
Add AI packages table to dialogue subview. Also minor bug fixes.
2015-04-13 14:14:00 +10:00
cc9cii
60e5ff8811
Remove duplicated checks and exceptions.
2015-04-13 08:03:30 +10:00
cc9cii
221c57adee
Fix template syntax and travis warnings.
2015-04-13 07:05:06 +10:00
cc9cii
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
2015-04-13 06:39:38 +10:00
cc9cii
7ccf53e750
Changed over inventory adapters. Fixed a few places where modified records were not set properly.
2015-04-12 20:03:55 +10:00
cc9cii
25261a60e5
Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.
2015-04-12 18:29:42 +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
9c75dad1ac
Why is gcc so unkind?
2015-04-11 18:21:08 +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
5da2f53bec
Code reorganisation to prepare for nested sound table in regions.
2015-04-11 13:54:05 +10:00
cc9cii
ce7e2e06c1
Fix editor being created for a non-editable item.
2015-04-11 13:11:20 +10:00
cc9cii
a632b2cfeb
Fix editing "ID" column within nested tables in dialogue subview.
2015-04-11 11:27:48 +10:00
cc9cii
1220369da3
Changes as per feedback comments.
2015-04-11 11:26:29 +10:00
Marc Zinnschlag
3f4f008c51
another fix to display type handling
2015-04-10 13:27:34 +02:00
cc9cii
7990fab708
Fix crash when exiting via window manager on some systems.
2015-04-10 18:09:33 +10:00
cc9cii
9a564f5062
Fix undo for pathgrid points add/remove.
2015-04-10 15:28:09 +10:00
cc9cii
bc9dad3ff2
Add index columns and fix edge indexing for point deletion.
2015-04-10 07:31:01 +10:00
cc9cii
330920daa8
Fix off by one error(s).
2015-04-09 21:41:46 +10:00
cc9cii
be9f94b766
Adjust edge indexes when adding/removing points. Fix some travis warnings.
2015-04-09 21:23:02 +10:00
cc9cii
23db79ebab
Fix for more gcc differences.
2015-04-09 20:53:41 +10:00
cc9cii
3a46512b7f
Attempt to account for gcc differences.
2015-04-09 20:15:38 +10:00
cc9cii
787cef1386
DialogueSubView layout update for dialogues with nested tables only.
2015-04-09 19:39:09 +10:00
cc9cii
860754e460
Minor formatting cleanup and comments.
2015-04-09 19:33:42 +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
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
8eaf6b068c
Adding missing file.
2015-04-02 21:02:17 +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
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +02:00
Marc Zinnschlag
66c866aec9
fixed search result formatting
2015-03-31 13:02:12 +02:00
Marc Zinnschlag
cb6caf5e39
added search-related user settings
2015-03-30 22:30:33 +02:00
Marc Zinnschlag
4928e3705f
highlight (bold) search string in results
2015-03-30 12:52:08 +02:00
cc9cii
ece34a1baa
Workaround for crash while exiting the application.
2015-03-30 18:14:07 +11:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75
Spelling and other consistencies nit pick.
2015-03-30 11:53:33 +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
Marc Zinnschlag
6d165dabb6
improved layout of report table
2015-03-29 18:21:18 +02:00
Marc Zinnschlag
46ccd27a6d
improved find result text
2015-03-29 18:16:43 +02:00
Marc Zinnschlag
e8091c4e7e
added field column to report table
2015-03-29 15:28:31 +02:00
Marc Zinnschlag
416b8165cd
moved getColumnId function from IdTable to IdTable base and made it virtual
2015-03-29 15:28:11 +02:00
Marc Zinnschlag
a8cdd30124
added ID column to report table
2015-03-29 13:55:31 +02:00
Marc Zinnschlag
4042b12013
changed data structure for report model
2015-03-29 13:43:11 +02:00
Marc Zinnschlag
1ec0db231c
add a separate display type for ID column
2015-03-28 14:48:06 +01:00
Marc Zinnschlag
c5f1c2127d
extend global search to all record and reference tables
2015-03-28 14:36:28 +01:00
Marc Zinnschlag
13a4fb3fdc
make return key press in search input trigger a new search
2015-03-28 13:05:18 +01:00
Marc Zinnschlag
8e9365741f
make search sub-views re-usable (clear before starting a new search)
2015-03-28 12:53:01 +01:00
Marc Zinnschlag
eaaf816dd3
simplified search rules
2015-03-28 12:05:49 +01:00
Marc Zinnschlag
128ccd8151
improved search type naming
2015-03-28 11:54:32 +01:00
Marc Zinnschlag
babefacbfa
improved message text in search results
2015-03-27 19:10:45 +01:00
Marc Zinnschlag
705ee67265
fixed hints getting mixed up with message text
2015-03-27 18:55:48 +01:00
Marc Zinnschlag
23cf859fee
added search stages (cell table only for now)
2015-03-27 16:33:54 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
Marc Zinnschlag
413b35de6c
moved search menu item from view to edit
2015-03-19 21:03:24 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
scrawl
19e8280f45
OpenCS window title unicode fixes
2015-03-16 15:45:41 +01:00
Marc Zinnschlag
fc6c9d7ff2
Merge remote-tracking branch 'scrawl/opencs-hint-fix'
2015-03-16 08:41:36 +01:00
Marc Zinnschlag
79339ebff1
Merge remote-tracking branch 'scrawl/opencs-crashfix'
2015-03-16 08:40:02 +01:00
cc9cii
76adb64e20
Compilation fix after merging commt e30f24
2015-03-16 13:21:02 +11: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
scrawl
295ca86ac1
OpenCS FileDialog crash fix
...
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
2015-03-16 02:43:02 +01:00
scrawl
4d0bb6329a
Fix incorrect reference check
...
This check was broken for exterior cells (empty cell id).
It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
2015-03-16 01:50:57 +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
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e
Merge branch 'threadfix'
2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01: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
cc9cii
fd86076db3
More warning fixes.
2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437
Fix more warnings.
2015-03-14 06:36:35 +11:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171
Add saving land and land textures. Should resolve Bug #2447 .
2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a
removed redundant functions
2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
2015-03-12 10:45:51 +01: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
cc9cii
dc9af19dcf
Don't use C++11 features.
2015-03-12 08:28:26 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
28259f914c
Remove potential memory leak.
2015-03-11 10:49:21 +11:00
cc9cii
43ec933b7b
Revert to the original clone() method. Create a new copy method for modified records.
2015-03-10 09:45:35 +11:00
cc9cii
8ac7b77d36
For RefId's, modify a copy of the base record rather than modifying the record directly.
2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec
Added a missing copy constructor.
2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b
Remove default parameters from the implementation.
2015-03-09 16:24:35 +11:00
cc9cii
6087a18c94
Implement clone() using a new Record constructor.
2015-03-09 14:58:07 +11:00
cc9cii
128371c902
Copy base data to modified.
2015-03-08 15:50:50 +11:00
cc9cii
a54ab153b0
Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429 .
2015-03-08 10:05:10 +11:00
cc9cii
ca21181483
Fix typo to get table display working.
2015-03-07 11:42:50 +11:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01: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
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
Marc Zinnschlag
0b70fdac57
added start script verifier
2015-03-05 11:24:01 +01: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
1ed606065c
save start script records
2015-03-03 16:11:00 +01:00
Marc Zinnschlag
a148b851c0
added start script table
2015-03-03 14:32:12 +01:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
Marc Zinnschlag
455684981c
Merge remote-tracking branch 'scrawl/master'
2015-03-03 11:08:15 +01:00
cc9cii
66ef9d237c
Another try to make it work with gcc/travis.
2015-03-03 10:12:40 +11:00
cc9cii
7c0f5b72c5
Add enum namespace to workaround travis.
2015-03-03 08:31:06 +11:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
cc9cii
a8427c2efb
Do not add NAME subrecords while saving magic effects or scripts.
2015-03-03 07:36:11 +11:00
Marc Zinnschlag
928bb234ce
Merge remote-tracking branch 'cc9cii/editor-gamefiles'
2015-03-02 19:57:46 +01:00
cc9cii
1ee6153940
Remove unnecessary boolean passing between objects.
2015-03-02 06:51:31 +11:00
Marc Zinnschlag
64938b3796
Merge remote-tracking branch 'cc9cii/saving-skil'
2015-03-01 10:36:26 +01:00
Marc Zinnschlag
59c7fe28d9
Merge remote-tracking branch 'naclander/master'
2015-03-01 10:23:08 +01:00
cc9cii
6d5899361e
Merge branch 'master' into pathgrid-edit
2015-03-01 16:05:35 +11:00
cc9cii
5ff66ad40b
Fix Bug #2402 . SKIL records should not have NAME subrecord.
2015-03-01 13:09:23 +11:00
cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
scrawl
3158d34abb
Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.
2015-02-25 20:25:41 +01:00
Bret Curtis
5672c86924
Rename window title for OpenMW-CS
2015-02-24 23:37:53 +01:00
Nathan Aclander
6d7e1242cc
Fixed incorrect casting
...
Only cast to strings things that are ints. Also I missed an mFactionRank to cast.
2015-02-20 20:18:31 -08:00
Nathan Aclander
539e8276c8
Silenced clang warning by converting int to string
2015-02-19 19:05:19 -08:00
cc9cii
7f7c3d57bd
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/cell.hpp
2015-02-16 16:46:52 +11:00
cc9cii
e5c1c31648
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227 .
2015-02-16 14:27:25 +11:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
Alexander "Ace" Olofsson
a61019dfa8
Update referencecheck.cpp
...
MSVC does not allow for the usage of 'and' or 'or' literals
2015-02-15 04:47:25 +01:00
Kamil Bar
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
2015-02-13 13:11:10 +01:00
Kamil Bar
9628415e21
Missing change & changed comments to represent actual code
2015-02-13 12:16:46 +01:00
Kamil Bar
52a064afc3
Fixed charges checking
2015-02-13 12:13:40 +01:00
Kamil Bar
e1314d6211
Implement OpenCS reference validation (Feature #831 )
2015-02-13 04:45:18 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
Alexander "Ace" Olofsson
b714e5211d
Redefinition of default template argument
...
Sometimes it's annoying how MSVC casually allows you to break C++ standards
2015-02-09 17:25:55 +01:00
Alexander "Ace" Olofsson
f77ae711e4
Fix template closer
2015-02-09 17:10:09 +01:00
Alexander "Ace" Olofsson
cfcaf4528f
Some more forward-declaring for OpenMW-CS
2015-02-09 16:50:34 +01:00
Nikolay Kasyanov
5534306eb3
Few rename fixes
2015-02-06 08:59:00 +02:00
scrawl
0b7b627443
CMake fix for opencs rename
2015-02-03 13:57:40 +01:00
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
2015-02-03 13:18:03 +01:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
Marc Zinnschlag
7f905470fa
fixed moved reference loading
2015-01-24 15:01:38 +01:00
Marc Zinnschlag
89998a6a03
save MVRF subrecords
2015-01-24 14:22:29 +01:00
scrawl
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044
2015-01-23 15:33:39 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
a97f599e65
fixed ref num saving in non-wide format
2015-01-22 13:41:09 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
cd62dbc5b7
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-21 15:12:04 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
Marc Zinnschlag
9670e0881d
update reference's current cell when x/y-coordinates are modified
2015-01-16 15:17:52 +01:00
Marc Zinnschlag
561ddfa0c5
make column type accessable via the regular table model
2015-01-16 11:29:44 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +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
Marc Zinnschlag
7b8e6f9dda
addressed potential 0-pointer issue
2015-01-15 12:04:23 +01:00
Marc Zinnschlag
f3c7532660
cleaned up some enum confusion
2015-01-15 12:01:59 +01:00
scrawl
b39cc0c8c8
Fix OpenCS window opening issue when config file doesn't exist
...
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
2015-01-15 02:49:54 +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
320b994aef
keep original cell field empty, if reference is in modified
2015-01-10 12:35:59 +01:00
Marc Zinnschlag
e32402a040
handle moved references on load
2015-01-09 12:05:53 +01:00
Marc Zinnschlag
ba7b74217b
added original cell column to reference table
2015-01-05 15:20:47 +01:00
Marc Zinnschlag
3b534326ff
forbid manual editing of the cell field in reference records
2015-01-05 15:04:11 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Marc Zinnschlag
bdc28c0523
Merge remote-tracking branch 'maqifrnswa/feature1325'
2015-01-02 18:14:42 +01:00
Scott Howard
f24c1845b6
remove pop-up message on load failure
2015-01-02 10:42:09 -05:00
Scott Howard
dece4e2640
remove unneeded includes
2015-01-01 22:54:32 -05:00
Scott Howard
03b39435f8
place user settings window at same location as mouse pointer
2015-01-01 22:50:35 -05:00
Scott Howard
ce7cef924e
when loading a file fails, pop-up critical window and highlight error text
2015-01-01 22:27:08 -05:00
Thoronador
44e01d0eaa
remove redundant initialization statement
...
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
2015-01-02 02:23:10 +01:00
Thoronador
91ff536460
fix uninit, #2
2015-01-02 00:26:45 +01:00
Thoronador
17fb7aa598
uninitialized stuff
2015-01-01 23:18:30 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
cc9cii
4c3c674223
Resolve merge issues.
2014-12-09 19:37:37 +11:00
cc9cii
84f0ddd51c
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/object.cpp
apps/opencs/view/render/object.hpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/unpagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
2014-12-09 14:02:26 +11:00
Marc Zinnschlag
e6307a5151
move cursor in scripteditor to position of error
2014-12-08 12:29:23 +01:00
Marc Zinnschlag
a64b741af2
store hints from operations in report model
2014-12-07 20:53:09 +01:00
Marc Zinnschlag
3a847732b4
abstracted message collection into a class
2014-12-07 18:57:47 +01:00
Marc Zinnschlag
6a67aba336
added double click with modifier actions in report table
2014-12-06 15:08:51 +01:00
Marc Zinnschlag
58f4cc882f
added remove action to report table context menu
2014-12-06 14:30:40 +01:00
Marc Zinnschlag
f2fc693325
added context menu to report table
2014-12-06 14:17:56 +01:00
Marc Zinnschlag
350b0cb93c
added hidden hint column to report model
2014-12-06 13:45:47 +01:00
Marc Zinnschlag
6c18a3b0b5
allow drags from report table
2014-12-06 13:19:43 +01:00
Marc Zinnschlag
7c59ea6296
added specialised report table
2014-12-06 13:01:55 +01:00
cc9cii
ab693f1f64
Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582 )
2014-12-05 07:50:03 +11:00
cc9cii
8d0cca6cfc
Merge remote-tracking branch 'remotes/upstream/master' into single-instance
...
Conflicts:
apps/opencs/editor.cpp
2014-12-05 07:38:33 +11:00
Marc Zinnschlag
f771b95a15
Merge remote-tracking branch 'cc9cii/master'
2014-12-04 20:04:19 +01:00
cc9cii
6731afc79c
Use float for setting skill use values. Should resolve bug #2183 .
2014-12-05 03:59:16 +11:00
cc9cii
07f10a0140
Use append syntax compatible with older versions of boost.
2014-12-05 01:32:20 +11:00
cc9cii
e67cf96250
Allow only one instance of OpenCS. Only tested on windows x64.
2014-12-05 01:09:42 +11:00
Marc Zinnschlag
f2d991505e
handle other Windows-specific path issues regarding OpenCS resources handling
2014-12-03 15:31:00 +01:00
Marc Zinnschlag
58b6e757e3
fixed another case folding problem regarding OpenCS resources handling
2014-12-03 15:24:37 +01:00
Marc Zinnschlag
406cf2b981
disable element visibility buttons that do not apply to the respective cell type
2014-12-02 11:17:39 +01:00
Marc Zinnschlag
cbcd6a26d5
memory leak fix
2014-12-01 22:57:32 +01:00
cc9cii
3b5cd286f6
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
2014-12-01 14:09:22 +11:00
cc9cii
64e1594b41
Move the destruction of global resources, being used by multiple documents, to the editor.
2014-12-01 14:08:27 +11:00
cc9cii
44b11163d1
Do not delete physics objects if it was never created (e.g. preview window)
2014-12-01 10:07:02 +11:00
cc9cii
2d229c70cb
Another missed null shared_ptr conversion for gcc.
2014-12-01 09:41:03 +11:00
cc9cii
9fb4b1f499
Initialise null shared_ptr
2014-12-01 08:15:17 +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
db17dbe324
don't store esm readers for non-base content files
2014-11-30 18:04:18 +01:00
Marc Zinnschlag
4a9d2038fa
load land for non-base content files immediately
2014-11-30 14:33:39 +01:00
Marc Zinnschlag
e177b66c1d
moved fog button from unpaged worldspace to worldspace
2014-11-28 09:16:39 +01:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f
updated run button
2014-11-27 09:27:29 +01:00
Marc Zinnschlag
d37ff8ec63
fixed missing tooltip update for toggle/mode-type buttons
2014-11-27 08:59:21 +01:00
cc9cii
936094ae95
Set range of spinbox types in dialogsubview.
2014-11-26 08:08:28 +11:00
cc9cii
6e334064d3
Merge branch 'master' into pathgrid-edit
2014-11-23 06:43:16 +11:00
cc9cii
31fdf49616
Use Qt exit function rather than system one.
2014-11-22 06:59:23 +11:00
cc9cii
911839bb91
Simplify detecting whether a universal id represents a referenceable type.
2014-11-21 06:48:42 +11:00
cc9cii
ede1b97b46
Check the type of universal id before getting its id. Should resolve bug #2137
2014-11-19 18:10:29 +10:00
scrawl
3028141815
Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)
2014-11-18 11:47:46 +01:00
cc9cii
9703fd95ac
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-11-14 18:03:53 +11:00
Marc Zinnschlag
5eb9fd81e1
use placeholder icons in OpenCS when no proper icon is available
2014-11-13 12:09:10 +01: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
b7f8f848a8
added edit modes for exteriors
2014-11-13 10:45:59 +01:00
cc9cii
0a66877cf1
Remove no longer needed code.
2014-11-13 07:47:32 +11:00
cc9cii
ba1a42ec05
Don't delete physics object if it was never created.
2014-11-13 07:41:31 +11:00
cc9cii
0e0ad97a91
Pathgrid edge resource management for editing multiple cells or multiple documents.
2014-11-13 06:36:47 +11:00
cc9cii
e430dcfd8a
Check the resource group's existence before destroying it.
2014-11-13 05:59:04 +11:00
cc9cii
12511778d1
Remove duplicate parameter.
2014-11-12 22:43:22 +11:00
cc9cii
8c6890c682
Move element filtering back out of castRay().
2014-11-12 22:28:41 +11:00
cc9cii
d65adc4376
Reduce code duplication.
2014-11-12 22:04:48 +11:00
cc9cii
b86148411b
Fix for issue #2051 . Not perfect (can get into a lock in some situations) but usable.
2014-11-12 14:02:08 +11:00
Marc Zinnschlag
2acf446f18
added edit mode button to scene toolbar
2014-11-11 15:58:22 +01:00
cc9cii
3eb556ff8a
Enhanced snap functionality for pathgrid points.
2014-11-11 19:40:04 +11:00
cc9cii
407edc770c
Added a simplistic snap to closest object or terrain.
2014-11-11 07:47:35 +11:00
cc9cii
1504119da7
Increase the sensitivity of the wheel movement.
2014-11-11 06:07:52 +11:00
cc9cii
48ecea7103
Simplistic drop-to-ground functionality for pathgrid points.
2014-11-10 22:38:29 +11:00
cc9cii
2412d127b0
Fix saving pathgrid positions when adding or moving.
2014-11-10 22:29:01 +11:00
cc9cii
d7804974e8
Better mouse cursor tracking for the third axis.
2014-11-10 20:37:07 +11:00
Marc Zinnschlag
b50fcd403b
renamed getElementMask to getVisibilityMask
2014-11-09 11:29:45 +01:00
cc9cii
1f73fae6ef
Allow adding or dragging pathgrid points over objects as well as terrain.
2014-11-09 20:03:29 +11:00
cc9cii
89eb30054b
Fix deleting physic objects.
2014-11-09 18:37:04 +11:00
cc9cii
f5ba74cd10
Suppress warnings.
2014-11-09 18:10:44 +11:00
cc9cii
895739d6bb
Visibility mask working correctly.
2014-11-09 17:53:54 +11:00
cc9cii
a5a76cadca
Adding, deleting and moving pathgrid points work. However still not saving to the document.
2014-11-09 14:36:58 +11:00
cc9cii
2c09b9ba21
Fix scene node being erased in the object reference map.
2014-11-09 12:34:26 +11:00
cc9cii
f2ff2f2988
Render pathgrid points and edges. Can move the points but the edges are not updated. Visibility mask does not work properly because pathgrid points are considered as objects by the physics engine.
2014-11-08 15:51:45 +11:00
Marc Zinnschlag
9e67a07ad4
allow externally supplied ModeButtons in SceneToolMode
2014-11-07 11:11:43 +01:00
Marc Zinnschlag
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
2014-11-06 13:26:19 +01:00
cc9cii
a3a0682138
Remove files no longer used, reverting to OEngine.
2014-11-06 11:16:17 +11:00
cc9cii
bf669a51c1
Merge branch 'master' into mouse-picking-physics
2014-11-06 09:46:48 +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
scrawl
6b88f5f33e
Use Ogre::uint8, fixes a missing include for uint8_t
2014-11-05 20:58:49 +01:00
scrawl
61d4a6b344
Merge branch 'openmw-033'
2014-11-05 20:58:42 +01:00
scrawl
ba3d2be8e3
Add missing include ( Fixes #2108 )
2014-11-05 19:45:32 +01: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
cc9cii
70b5d6857a
Add missing files.
2014-11-04 20:52:28 +11:00
cc9cii
0e70315f91
Experimental, compiles and runs but crashes in some exit scenarios.
2014-11-04 20:43:04 +11:00
Marc Zinnschlag
bf40a3bb5d
enhanced SceneToolBar tool handling (remove and insert at specific point)
2014-11-03 13:18:53 +01:00
cc9cii
bd6e54dde3
Add function to cancel drag by pressing ESC. Remove debug code.
2014-11-03 21:24:47 +11:00
cc9cii
092080c69c
Group the commands with begin/end macros.
2014-11-03 13:57:57 +11:00
cc9cii
bf5ba41223
Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once.
2014-11-03 12:46:31 +11:00
cc9cii
4556eb74fe
Fix saving position and rotation.
2014-11-03 10:07:21 +11:00
cc9cii
e3a000917c
Minor tidy up.
2014-11-03 10:04:24 +11:00
cc9cii
358cac2f0a
Fix deleting object physics again.
2014-11-03 10:03:54 +11:00
cc9cii
d9755f82c3
Position saving - work in progress.
2014-11-03 08:11:15 +11:00
cc9cii
85ef683319
Fix deleting physics object when scene node is cleared.
2014-11-03 08:10:28 +11:00
cc9cii
3796240b19
Refactor duplicate code sections.
2014-11-02 18:13:25 +11:00
cc9cii
49d416353e
Remove a redundant list.
2014-11-02 17:56:28 +11:00
cc9cii
7f54dab6ef
Fix issue where objects were sometimes unresponsive after dragging.
2014-11-02 15:34:45 +11:00
cc9cii
e174428cc5
Minor tweaks.
2014-11-02 15:03:26 +11:00
cc9cii
1eed180a5c
Fix Gcc/MSVC differences with friend class. Invert camera derived direction.
2014-11-02 11:41:11 +11:00
cc9cii
a21958d007
Add option to move the mouse against the screen frame of reference.
2014-11-02 10:30:44 +11:00
cc9cii
89bb616cbc
Remove debugging code.
2014-11-02 08:33:32 +11:00
cc9cii
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
2014-11-02 08:22:27 +11:00
cc9cii
998982b16a
Keep physics engines until physics code is moved out of OEngine.
2014-11-01 21:04:53 +11:00
cc9cii
c6a2461fbd
Delay removing physics until the document is closed. Also other general cleanup.
2014-11-01 20:51:04 +11:00
cc9cii
1ee64c7087
Add missing files for multi-document support.
2014-11-01 19:12:22 +11:00
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8
Fix Subview interface clutter by keeping a map of Scenewidgets.
2014-11-01 08:29:08 +11:00
cc9cii
e51d532795
Show drag movements of objects in multiple scene managers.
2014-11-01 07:39:58 +11:00
cc9cii
d6e67b248f
Fix deleting objects and scenewidgets.
2014-11-01 07:29:16 +11:00
cc9cii
ade7f09203
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
2014-11-01 00:03:09 +11:00
cc9cii
ac7acb2c22
Disable more debug code.
2014-10-31 22:21:24 +11:00
cc9cii
4f685092fb
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
2014-10-31 22:05:24 +11:00
cc9cii
aa7b693a13
Remove debug settings and minor cleanup.
2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee
Multiple SceneManagers per physics engine now working.
2014-10-31 21:50:57 +11:00
cc9cii
a2ac4c7650
Allow multiple scene managers per physics engine. Compiles but does not work properly.
2014-10-31 08:18:15 +11:00
cc9cii
0515159b74
Fix typo.
2014-10-29 23:38:19 +11:00
cc9cii
1741043f20
Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.
2014-10-29 23:02:38 +11:00
Alexander "Ace" Olofsson
c1ce570e37
Use the enum value from Qt::KeyboardModifiers
...
This fixes the windows build at least
2014-10-29 04:55:06 +01:00
cc9cii
792fbd119f
Resolve incorrect merge issues.
2014-10-29 10:43:55 +11:00
cc9cii
c990ed4335
Merge branch 'mouse-picking-state' into mouse-picking
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
2014-10-29 09:33:48 +11:00
