1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
Commit graph

1734 commits

Author SHA1 Message Date
Capostrophic
85dc1e4ef2 Revert unnecessary universalid changes in Journal record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
e1ae7a9b0e Avoid duplicate duplicate pathgrid point warnings 2018-09-14 21:06:50 +03:00
Capostrophic
1e5330d9da Use Messages::add in skill record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
35281d7c38 Use Messages::add in race, soundgen, spell and start script record verifiers 2018-09-14 21:06:50 +03:00
Capostrophic
b2b9bd94f0 Fix bolt object type 2018-09-14 21:06:50 +03:00
Capostrophic
8dcb58d745 Use Messages::add in Faction, Sound, Bodypart and Class record verifiers 2018-09-14 21:06:50 +03:00
Capostrophic
d433929194 Use Messages::add in birthsign record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
6b226eef8f Use Messages::add in magic effect record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
5b8880c6fa Update cell reference record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
dc847dce09 Add item icon checks to object record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
34077a6987 Purge unnecessary namespaces 2018-09-14 21:06:50 +03:00
Capostrophic
d90940011f Add model checks to object record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
38ea7928f5 Add sound file checks to sound record verifier 2018-09-14 21:06:50 +03:00
Capostrophic
1f717def35 Update journal, start script and spell verifiers messages 2018-09-14 21:06:50 +03:00
Capostrophic
a6d3cd9190 Update topic info verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
14ef145b3b Update region and pathgrid record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
a9ce155a7b Update faction and body part record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
7535daa94d Update class and race record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
fd1a3ad88d Update object and script record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
cf7a8c5775 Update soundgen record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
5249492a31 Update skill record verifier messages 2018-09-14 21:06:50 +03:00
Capostrophic
51fdb94e34 Add texture check to birthsign verifier 2018-09-14 21:06:50 +03:00
Capostrophic
d3aa5840ec Refactor magic effect record verifying 2018-09-14 21:06:50 +03:00
Andrei Kortunov
6066f02010 Do not use universal IDs for menu items 2018-09-13 22:15:59 +04:00
Andrei Kortunov
275d10e1f7 Add missing icons for UniversalId tables and use them in the editor menu (feature #912) 2018-09-12 22:37:19 +04:00
Andrei Kortunov
6529883527 Fix MSVC warning C4389 2018-09-04 18:14:51 +04:00
Andrei Kortunov
c7a5548475 Use new logging system for editor 2018-08-14 20:01:09 +04:00
Alexander Stillich
1177e5ac79 Issue a single dataChanged() when the modified column changes 2018-07-09 16:23:50 +02:00
Doc West
d26b5a13ef Fixed comment 2018-07-09 16:23:50 +02:00
Doc West
01b8ce5f70 Notify views of changes in all columns when updating the ColumnId_Modification column 2018-07-09 16:23:50 +02:00
Doc West
4a6457c346 Changed the way the revert command works: it now clones the changed record and uses the new RecordBase::revert() method to restore the previous value
Added Flag_Dialogue_Refresh to var type and var value columns so that sub views update properly
2018-07-09 16:23:50 +02:00
Doc West
143eadb58e Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates. 2018-07-09 16:21:53 +02:00
Doc West
4780f1b2bd Notify views of changes of all cells in a row to properly update the row after revert 2018-07-09 16:21:53 +02:00
Marc Zinnschlag
7ba512b389 Merged merge request !17 2018-07-06 11:27:35 +02:00
Doc West
414f626309 Implemented search case sensitivity 2018-07-04 21:03:54 +02:00
Andrei Kortunov
f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) 2018-07-02 12:20:34 +04:00
Atahualpa
c0fc615cd6 Adds the option to ignore "Base" records when running the verifier. (fixes #4466)
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
2018-06-20 11:29:38 +02:00
Atahualpa
9d61d76e92 Adds the option to ignore "Base" records when running the verifier. (fixes #4466)
Adds a boolean setting to the user preferences. This setting is locally saved to all OpenMW-CS check stages. When a verification is done, the setting is updated on setup for each check stage. If set to true, the boolean value is then used to skip the verification process for every base record - minus some special cases where, e.g., counters are to be set first.

Related issue:
- Fixes #4466: Editor: Add option to ignore base records when running verifier (https://gitlab.com/OpenMW/openmw/issues/4466)

Tests:
The changes were successfully tested in OpenMW-CS by creating faulty "Base" and "Modified" records for every record type (if possible) and, then, running the verifier with and without the option respectively.
2018-06-20 00:20:03 +02:00
Marc Zinnschlag
7ca56ccd29 set search status bar to 'no results' message when search yields no results 2018-06-13 15:48:24 +02:00
Marc Zinnschlag
97773697a9 Merge remote-tracking branch 'florianjw/precise-rotations' 2018-06-12 19:05:52 +02:00
Capostrophic
7e38bb8513 Verifier: improve handling of class name and description 2018-05-26 22:37:02 +03:00
Marc Zinnschlag
e30ade81be Merged pull request #1680 2018-05-26 11:21:34 +02:00
Nelsson Huotari
825c331764 Remove texture filtering, better ltex importing, reindexing duplicates 2018-05-22 14:55:09 +03:00
Marc Zinnschlag
ec900ef4ad Merged pull request #1710) 2018-05-18 12:34:16 +02:00
Nelsson Huotari
c2cddc91e4 Brush maximum size to a custom setting 2018-05-18 11:32:42 +03:00
Capostrophic
4e485dbd44 Rename Original Creature column to Parent Creature (fixes #2897) 2018-05-17 13:00:48 +03:00
Nelsson Huotari
17e01ca336 Setting "Scene Drops" rename "3D Scene Editing" 2018-05-16 11:41:37 +03:00
Bret Curtis
e410c47660
Merge pull request #1706 from akortunov/refidfix
Fix compiler warning in getNestedData()
2018-05-16 09:00:25 +02:00
Andrei Kortunov
6a3ff5ed81 Fix compiler warning in getNestedData 2018-05-16 10:10:42 +04:00
Marc Zinnschlag
b7cce1a665 Merged pull request #1702 2018-05-11 10:11:17 +02:00
Nelsson Huotari
baa707b5e3 User setting for selective cell editing or new land creation 2018-05-10 11:18:54 +03:00
Alf Henrik Sauge
feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
Marc Zinnschlag
3197ebd8e7 Merged pull request #1694 2018-05-08 12:19:14 +02:00
Andrei Kortunov
2f89080b36 Load default markers definitions in editor 2018-05-07 22:32:04 +04:00
Marc Zinnschlag
e661e3cf74 Merged pull request #1677 2018-05-07 09:42:41 +02:00
Bret Curtis
c44f87afd1
Merge pull request #1699 from Capostrophic/editorwarnings
Editor verifier updates
2018-05-06 10:57:24 +02:00
Bret Curtis
0fc198be52
Merge pull request #1698 from Capostrophic/c++11
A bunch of C++11-related updates
2018-05-06 10:44:11 +02:00
Capostrophic
2502d53816
Object record verifier updates
Removed light 0 duration warning
Spelling fixes
2018-05-06 00:23:05 +03:00
Capostrophic
91b97a27ea
Remove empty class description warning 2018-05-06 00:14:14 +03:00
Capostrophic
e22409c266
Fix sound range warning message 2018-05-06 00:13:09 +03:00
Bret Curtis
c219c89603
Merge pull request #1696 from Capostrophic/feature-2694
Rename "Model" column to "Model/Animation" (feature #2694)
2018-05-05 08:14:03 +02:00
Capostrophic
9ac9f94638
Rename "Model" column to "Model/Animation" (feature #2694) 2018-05-04 20:00:58 +03:00
Capostrophic
8be93b4a12
Initialize mandatoryIds vector C++11-way 2018-05-03 19:56:01 +03:00
Nelsson Huotari
e4e225f4e7 Add topic, journal and related -info icons. 2018-05-03 14:32:15 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.

PVS-Studio:
apps/opencs/model/filter/parser.cpp  582  warn  V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp  67  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp  74  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp  32  err  V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp  1376  err  V547 Expression 'subColIndex < 3' is always true.

apps/openmw/mwgui/widgets.hpp  318  warn  V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp  319  warn  V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp  320  warn  V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp  1425  warn  V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp  2155  err  V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp  1192  warn  V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp  521  warn  V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp  317  err  V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp  409  warn  V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp  28  warn  V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp  561  warn  V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp  18  warn  V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp  463  warn  V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp  409  err  V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp  691  warn  V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp  1125  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp  1137  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.

apps/wizard/unshield/unshieldworker.cpp  475  warn  V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp  163  warn  V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.

components/fontloader/fontloader.cpp  427  err  V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp  282  warn  V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp  119  err  V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp  178  warn  V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp  235  warn  V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp  237  warn  V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
Nelsson Huotari
af558e07a3 implement +6 icons 2018-04-15 12:47:52 +03:00
Nelsson Huotari
69aacdff17 Lamoot's new icon set 2018-04-15 12:35:45 +03:00
Florian Weber
10fe334247
add more precise float-spinbox and use it for rotations 2018-03-02 15:05:00 +01:00
Miloslav Číž
01f9d90315 CS: Reorder 3D input menu 2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e CS: Add tooltip to camera-ortho-size preference 2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9 CS: Change camera parameter types to int 2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242 CS: Mover object-marker-alpha under Rendering 2017-12-15 14:36:12 +01:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam 2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3 CS: Add fixed roll setting, plus ortho fix 2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62 CS: Add ortho camera setting 2017-12-08 18:18:27 +01:00
Miloslav Číž
360d786ff2 CS: Add rendering prefs and camera FOV 2017-12-07 23:48:34 +01:00
Kyle Cooley
492b99b008 Transparent object markers 2017-11-07 00:41:27 -05:00
Marc Zinnschlag
0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 2017-10-19 14:24:58 +02:00
Kyle Cooley
6d8666d80d Force new project file when creating new project 2017-10-18 20:21:44 -04:00
Kyle Cooley
6d7a24224b Add documentation. 2017-10-16 12:52:13 -04:00
Kyle Cooley
11eae16645 Get rid of duplicate function, fix flag checking 2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a Fix LTEX import bug. 2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1 Merge cleanup. 2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c Merge Land/LandTextures 2017-10-14 11:32:42 -04:00
Kyle Cooley
b14404e9cc Fix region colors 2017-10-06 20:05:06 -04:00
Marc Zinnschlag
dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
Kyle Cooley
2f5449a68c Remove now unnecessary overrides. 2017-10-02 16:13:40 -04:00
Kyle Cooley
137ea872d3 Hide base land textures. 2017-10-02 15:56:22 -04:00
Kyle Cooley
dfcbee3ab1 Ignore case when comparing textures, also add new textures to lookup map. 2017-09-30 00:04:52 -04:00
Kyle Cooley
1fe1ec63c4 Fix Qt4 build 2017-09-22 23:33:50 -04:00
Kyle Cooley
3981f79d38 Change flag for base land textures 2017-09-22 22:59:50 -04:00
Kyle Cooley
054e6a780e Use map for texture lookup. 2017-09-22 22:43:45 -04:00
Kyle Cooley
4921e7f5c1 Get rid of reinterpret cast. 2017-09-22 22:42:09 -04:00
Kyle Cooley
50d9d9f78f Get rid of some templates, exceptions instead of assert, and other small changes. 2017-09-17 20:29:51 -04:00
Marc Zinnschlag
9a8a4c744f Merge remote-tracking branch 'capostrophic/controlplus' 2017-09-11 10:46:34 +02:00
Capostrophic
97ff24b8d6 Change ctl to ctrl in OpenMW-CS shortcut manager 2017-09-10 20:48:09 +03:00
Kyle Cooley
25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. 2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8 Fix potential segfault, cleanup, get rid of warnings. 2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2 Some bug fixes, changes to land load code. 2017-09-08 21:03:52 -04:00
Kyle Cooley
ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling 2017-09-08 00:51:46 -04:00
Kyle Cooley
99e90ef808 Cleanup. Also modify ltex index generation. 2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a LTEX importing 2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88 Fix includes 2017-09-04 15:14:42 -04:00
Kyle Cooley
90c485104a Land creator 2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4 Add more land table columns 2017-09-03 20:00:19 -04:00
Kyle Cooley
1d480015b4 Add ability to touch records, LAND records in particular 2017-08-31 22:09:49 -04:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
Kyle Cooley
5d14a2afcc Initial LTEX/LAND tables 2017-08-31 22:09:49 -04:00
Kyle Cooley
157ecb166c Fix wrong folder name 2017-08-23 00:02:02 -04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document.
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -04:00
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
PlutonicOverkill
16be1e1a84 Fix occurrence highlighting preferences panel 2017-07-23 20:29:42 +12:00
Bret Curtis
c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required
put boost system back in, clean others up

revert Qt

add back boost fstream
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
PlutonicOverkill
7281e8b888 Remove C++11 features 2017-05-12 12:48:25 +12:00
PlutonicOverkill
16f8341de3 Prevent context menu appearing for modifier settings 2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d Prevent context menu appearing when right-clicking shortcut setting 2017-05-10 20:43:52 +12:00
PlutonicOverkill
30af92f575 Fix pointer initialisation bug 2017-05-09 20:58:32 +12:00
PlutonicOverkill
3545cfa00a Rewrite feature to reset options to default 2017-05-09 19:50:16 +12:00
PlutonicOverkill
f30d1a3075 Revert everything 2017-05-08 17:24:28 +12:00
PlutonicOverkill
418aeb65f1 Remove unneeded dependencies 2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8 Forgot to remove debugging code 2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710 Keep the settings page in sync with the real settings 2017-05-07 16:51:11 +12:00
PlutonicOverkill
64879c03e4 Add option to reset settings to default 2017-05-06 20:18:31 +12:00
PlutonicOverkill
95f60d2bb3 Merge branch 'master' into mark-variable 2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119 Add setting so feature can be turned off 2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83 Enable highlighting when cursor is placed over a name (script editor) 2017-04-28 19:28:05 +12:00
PlutonicOverkill
3d1e640388 Add setting to change keyboard shortcut and fix another crash 2017-04-26 19:42:03 +12:00
FedeWar
e9076088ca Another tab fix 2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f Fixed tabs 2017-02-21 11:49:04 +01:00
FedeWar
370c12e78a Verification results are ordered by Type in alphabetical order. 2017-02-21 11:15:53 +01:00
MAtahualpa
fb8a2093cd Replace "Female" check box with a combo box, part 2/2 (fixes #3757)
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.

Related issue:
- Fixes #3757: Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
2017-02-18 15:40:07 +01:00
MAtahualpa
520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756)
Fixed use of tab character.
2017-02-17 17:54:38 +01:00
MAtahualpa
affc0eb37f Replace "Female" check box with a combo box, part 1/2 (fixes #3756)
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.

Related issue:
- Fixes #3756: Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
2017-02-17 17:05:46 +01:00
MAtahualpa
dab8b328c4 Replace light emitter check boxes with a combo box (fixes #3752)
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.

Related issue:
- Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
2017-02-16 12:48:47 +01:00
MAtahualpa
7be46eb1f0 Fix for commit "d4972ab..." in PR 1208 (fixes #3751)
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166 Replace "Xyz blood" check boxes with a combo box (fixes #3751)
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Related issue:
- Fixes #3751: OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
2017-02-15 23:06:36 +01:00
Marc Zinnschlag
e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 2017-02-15 19:47:39 +01:00
MAtahualpa
2c34a8706b Replace "Scroll" check box with a combo box (fixes #3748)
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-15 18:59:55 +01:00
MAtahualpa
607bd8b853 Replace "Scroll" check box with a combo box (fixes #3748)
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-14 11:48:37 +01:00
scrawl
ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 2017-02-14 07:58:16 +01:00
MAtahualpa
c5dcfe0794 Update refidadapterimp.cpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:50:58 +01:00
MAtahualpa
6587880171 Update refidcollection.cpp
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746: OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
2017-02-12 13:03:37 +01:00
Marc Zinnschlag
34389e15cd Merge remote-tracking branch 'origin/master' 2016-12-16 12:28:22 +01:00
Marc Zinnschlag
827c78a4cd added text column to ref id table (books) 2016-12-16 12:28:09 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
scrawl
e5cb7306c3 Merge pull request #1115 from Allofich/conversion
Fix narrowing conversion warning
2016-10-30 19:26:51 +01:00
Allofich
68ed264f40 Fix narrowing conversion warning 2016-10-31 00:53:17 +09:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Allofich
ccacad51be Fix shadowing warnings 2016-10-16 01:34:54 +09:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
MiroslavR
53b006eccb OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564) 2016-10-11 19:36:44 +02:00
MiroslavR
8be8c7ca66 OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564) 2016-10-11 02:55:17 +02:00
Aesylwinn
b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 2016-09-24 16:45:08 -04:00
Marc Zinnschlag
48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
Aesylwinn
fab7549b42 Fix windows path issue in editor debug run.
- The problem was caused by spaces in the data directory
2016-09-03 17:49:49 -04:00
Marc Zinnschlag
316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 2016-09-01 11:51:34 +02:00
Aesylwinn
c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 2016-08-31 11:02:04 -04:00
Aesylwinn
b2ddd3c259 Initialize with correct content file number instead of correcting at save stage. 2016-08-30 16:42:38 -04:00
Aesylwinn
3ae2fc17c6 Fix some issues with content file numbers in the editor.
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
2016-08-29 18:06:56 -04:00
Aesylwinn
91fd966146 Fix some issues detected by coverity for the editor. 2016-08-18 12:42:35 -04:00
Aesylwinn
7125775648 Change free axis rotation. 2016-08-15 15:07:43 -04:00
LohikaarmeHAV
19c74a4d6e Part two 2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592 First part 2016-08-03 20:20:55 +03:00
LohikaarmeHav
c6ec473280 Camera reset now every time cell object->view is pressed. 2016-08-02 13:46:43 +03:00
Aesylwinn
bf2ab4ed45 Change the way modifiers are handled so they can be shared. 2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888 Revert "Change scene controls to more closely match blender as requested"
This reverts commit bc7ae70f0b.
2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b Change scene controls to more closely match blender as requested
in the forums.
2016-07-30 09:53:45 -04:00
Aesylwinn
1cce085fa2 Remove unused headers. 2016-07-29 16:35:43 -04:00
Aesylwinn
2f97d6cffb Move tool tip processing to ShortcutManager,
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2 Change some key binding defaults. 2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90 Clean up modifier/shortcut class and handle focus out event,
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
2016-07-29 15:00:35 -04:00
Aesylwinn
96a3c278fd Added shortcuts for loading a cell relative to the camera,
Removed Ctl+V binding for "Verify" because that is associated
with paste.
2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6 Add custom page for key bindings. 2016-07-27 19:15:24 -04:00
Aesylwinn
b685c0ce6c Add ability to clear shortcut/modifier setting with right click. 2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114 Add modifier setting. 2016-07-27 13:53:33 -04:00
Aesylwinn
b204758be1 More shortcuts. 2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d Exclude keys not compatible with qt 4 2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b Remove QShortcut usage,
Add a lot of shortcuts,
Remove debug messages
2016-07-27 00:24:16 -04:00
Aesylwinn
08af82e1bd Switched to an interactive method for key input,
Redid text representation for shortcuts
2016-07-26 21:22:31 -04:00
Aesylwinn
051aec2729 Added methods to keep text mentioning shortcuts up to date,
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
2016-07-25 20:49:09 -04:00
Aesylwinn
f251c3867d Redesigned shortcut handler to be capable of dealing with child and
parent widgets. This should be the final design change. Also, some
various bug fixes.
2016-07-23 21:23:02 -04:00
Aesylwinn
acdb636935 Qt4 protected signal workaround and signed/unsigned mismatch. 2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c Changed shortcut design to allow a configurable second output. Also
re-added shift for temporarily changing camera speed.
2016-07-22 01:58:17 -04:00
Aesylwinn
1b5273f2b7 Finally re-added rendering stats, refactored some functions
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
2016-07-20 15:00:00 -04:00
Aesylwinn
faa84e0a35 - Further extended usage of new shortcut class
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a Changes in shortcut design.
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839 Remove use of c++11 feature and add some missing headers. 2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0 Base key config/shortcut implementation 2016-07-20 08:25:11 -04:00