mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:49:58 +00:00
Code Issues Releases Wiki Activity
23352 commits 38 branches 54 tags 122 MiB
Commit graph

3185 commits

Author SHA1 Message Date
Kyle Cooley
50d9d9f78f Get rid of some templates, exceptions instead of assert, and other small changes. 2017-09-17 20:29:51 -04:00
PlutonicOverkill
5e60fb7c10 Fix preferences pane width 2017-09-17 21:09:28 +12:00
scrawl
bd667c3847 Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir 
If CMake supports it, sets the debugger working directory for Visual …
 2017-09-11 10:30:50 +00: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
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
Kyle Cooley
2eacc2f093 Changes to land creation, add ability to specifically clear terrain cache 2017-09-08 14:37:03 -04:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01: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
d3014cf394 Temporary fix for adding new lands, cloned lands will still reference old data though 2017-09-04 15:13:45 -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
30ba1d4c25 Move touch command to creator, to allow customization and not break abstraction 2017-09-03 17:01:16 -04:00
Thunderforge
e0ffc94f3e Fix OpenMW-CS internal name 2017-09-02 18:07:12 -05: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
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Marc Zinnschlag
91f674bb6f Merge remote-tracking branch 'aesylwinn/master' 2017-08-25 10:24:17 +02:00
Kyle Cooley
a8576d78ad Change default topic info values 2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe Fix pathgrid segfault 2017-08-23 11:35:26 -04:00
Kyle Cooley
157ecb166c Fix wrong folder name 2017-08-23 00:02:02 -04:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -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
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d Reload water 2017-08-20 20:55:56 -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
Kyle Cooley
249c1ae95a Fix orbit camera jumping back to old position 2017-08-13 19:26:32 -04:00
Rob Cutmore
3f2cd9b669 Editor: Do color to int conversion in ColorEditor 2017-07-26 19:56:54 -04:00
Rob Cutmore
c7241c692f Editor: Do int to color conversion in ColorEditor 2017-07-26 19:43:37 -04:00
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
Rob Cutmore
0082f5a2dc Editor: fix handling of colour columns 
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
 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
5ec97811d8 Don't switch pages when right-clicking on list 2017-05-12 20:22:18 +12:00
PlutonicOverkill
7281e8b888 Remove C++11 features 2017-05-12 12:48:25 +12:00
PlutonicOverkill
cd75c5618c Move context menu code to PageBase 2017-05-11 19:46:51 +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
646ff72cdc Add a more elegant way of showing the context menu 2017-05-10 20:27:50 +12:00
PlutonicOverkill
bd9f657603 Show context menu when user clicks on empty space 2017-05-10 19:51:43 +12:00
PlutonicOverkill
30af92f575 Fix pointer initialisation bug 2017-05-09 20:58:32 +12:00
PlutonicOverkill
4879405097 Add reset context menu for key binding pages 2017-05-09 19:58:34 +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
a9760ec805 Fix indenting 2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f Fix tabs 2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6 Missed another one 2017-05-07 17:00:26 +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
829560719e Make name highlighting more consistent and only for variable names 2017-05-02 17:28:42 +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
Marc Zinnschlag
7919c4d672 Merge remote-tracking branch 'plutonicoverkill/master' 2017-04-28 08:40:07 +02:00
PlutonicOverkill
e685de0f84 Fix script editor undo/redo context menu actions 2017-04-27 19:48:01 +12:00
PlutonicOverkill
6063d8e31b Fix existing context menu in script editor 2017-04-27 16:31:45 +12:00
Marc Zinnschlag
61e6b0d03c improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault) 2017-04-26 15:03:30 +02:00
PlutonicOverkill
3d1e640388 Add setting to change keyboard shortcut and fix another crash 2017-04-26 19:42:03 +12:00
PlutonicOverkill
1f699552f7 Fix infinite recursion bug in uncommentSelection() 2017-04-26 15:49:39 +12:00
PlutonicOverkill
61e374fdfc Implement commentSelection() and uncommentSelection() 2017-04-25 19:12:18 +12:00
PlutonicOverkill
83ff7d162c Add comment/uncomment actions to the context menu 2017-04-25 16:12:59 +12:00
Rob Cutmore
0ff56677f6 Remove unused code 2017-04-06 19:56:18 -04:00
Rob Cutmore
84bad9316d Editor: flag orbit camera for re-initialization 
After swapping cells the orbit cam controller needs to be
re-initialized to properly center on the new cell.
 2017-04-06 19:40:26 -04:00
Rob Cutmore
f7664d4bb9 Editor: reset camera after cell drag and drop 
When replacing a viewed cell via drag and drop the camera position is
not updated to better view the new cell. This flags the camera position
as not being set so a better default is set.
 2017-04-04 18:54:58 -04:00
Marc Zinnschlag
ab8294b281 Merge remote-tracking branch 'rcutmore/bug-2838' 2017-03-31 16:47:26 +02:00
Rob Cutmore
343f2cb81d Editor: add creator for body parts 
Added creator subclass for body parts to allow adding first person
parts. IDs for first person body parts are expected to end with ".1st".
 2017-03-30 08:20:43 -04:00
scrawl
6a745cb2cc Fix text colorMode (Bug #3815) and render bin 2017-03-29 07:10:55 +02:00
Rob Cutmore
77bf1efc1a Editor: Fix labels for creator user inputs 2017-03-26 09:14:32 -04:00
Rob Cutmore
8d4441bb5e Editor: document subclasses without ID checks 
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
 2017-03-26 09:05:05 -04:00
Rob Cutmore
3714c2a0f2 Editor: add ID validator to pathgrid input 2017-03-21 08:14:04 -04:00
Rob Cutmore
207695e094 Editor: switch input for pathgrid creator 
Switched from QComboBox to DropLineEdit for pathgrid creator input.
This allows the input the use auto-complete and be a drop target from
the cells table.
 2017-03-21 07:58:01 -04:00
Rob Cutmore
0dcb6a9bd4 Editor: update pathgrid creator input on changes 
When data changes the cell input for pathgrid creator is repopulated
with valid choices. This handles the case where a cell is added or
removed, and also when a cell's pathgrid is added or completely
removed.
 2017-03-18 10:20:16 -04:00
Rob Cutmore
491fd3d0be Editor: set combo box events for pathgrid creator 
- Handles when combo box should automatically gain or lose focus.
- Checks user input when combo box selection changes.
 2017-03-18 09:20:14 -04:00
Rob Cutmore
95d164a6e6 Editor: use combo box when creating pathgrids 
Instead of using QLineEdit for user input, use a QComboBox populated
with valid choices. This prevents user from being able to create a
pathgrid for a non-existent cell.
 2017-03-18 07:49:46 -04:00
scrawl
14225a42c6 Remove unused pointer to IncrementalCompileOperation 2017-03-14 19:27:55 +01:00
scrawl
5eff286c71 Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps. 2017-03-14 19:27:55 +01:00
scrawl
5fb854036d Use a forward declaration to avoid having to workaround Qt MOC 
Don't think that guard was still needed, but a forward declaration is better anyways.
 2017-03-14 19:27:55 +01:00
scrawl
80a0398f9d Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads 2017-03-14 19:27:55 +01:00
scrawl
35d53acc65 Factor out terrain chunk loading/caching into a new resource manager 2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4 Add resource manager for ESM::Land to allow data to be unloaded when no longer required 2017-03-14 19:27:55 +01: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
scrawl
625c5040ce Fix build 2017-02-01 15:49:20 +01:00
scrawl
960d4a96c3 Reduce the number of osg::Material state by setting the default state on the graph root 2017-02-01 06:00:14 +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
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure 
[macOS] Move all resources files inside application bundles (fixes #3566)
 2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles 
Fixes #3566 (https://bugs.openmw.org/issues/3566).
 2016-11-23 22:32:54 +01:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
86b4673539 Removed math constants in openmw-cs, which are apparently not going to be used 2016-11-13 16:43:07 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06: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
scrawl
95a67bf0c2 Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads 
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 2016-10-10 18:23:06 +02:00
Marc Zinnschlag
e918474a94 Merge remote-tracking branch 'rcutmore/bug-3277' 2016-09-30 09:37:45 +02:00
Rob Cutmore
8f47ed17df Show nested tables only when they are editable 2016-09-29 20:42:44 -04:00
Rob Cutmore
b59694c4f0 Set tooltip for read-only nested tables 2016-09-25 06:31:28 -04:00
Aesylwinn
b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 2016-09-24 16:45:08 -04:00
Rob Cutmore
829345257c Allow disabled nested tables to be scrollable 2016-09-24 10:36:00 -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
Aesylwinn
ee432690e6 Make it easier to place objects in the scene editor. 
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
 2016-09-03 17:37:13 -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
Marc Zinnschlag
2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 2016-08-18 09:13:43 +02:00
Aesylwinn
7125775648 Change free axis rotation. 2016-08-15 15:07:43 -04:00
Aesylwinn
3e4ac0c662 Potential fix for context sensitive select mode issues. 2016-08-14 14:43:29 -04:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
Aesylwinn
101c3cc90d Rotate around center of selection. 2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65 Scale from center of selection. 2016-08-12 17:11:37 -04:00
Aesylwinn
388917df89 Base editor rotate/scale commit. 2016-08-10 19:31:34 -04:00
Marc Zinnschlag
a563a9d336 added missing Q_OBJECT 2016-08-09 10:21:37 +02:00
Aesylwinn
448c9d5a5b Fix globals not being initialized with a valid type. 2016-08-09 00:17:41 -04:00
Aesylwinn
0963adb2f4 Fix pointer being deleted twice. 2016-08-08 14:36:50 -04:00
Aesylwinn
16d0580ce8 Fix struct/class mismatch. 2016-08-05 15:39:08 -04:00
Aesylwinn
1f32f1eef5 Add water texture. 2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7 Use shared water geometry + state generation, 
Fix water position and render bin,
Fix passed cell parameter being ignored
 2016-08-05 13:49:44 -04:00
Aesylwinn
3904a24e6c Add missing include. 2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24 Render water in editor. 2016-08-04 23:01: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
lohikaarme
e8ef5c233f Miss info 2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf Commnent? 2016-08-03 14:22:25 +03:00
lohikaarme
48bcde8cc9 ... 2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc hups 2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c Nah 
Preview seem to not like removing mCamPositionSet and I have do other things.
 2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8 Forgot to remove line and add comment. 2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c Removed debug 2016-08-02 14:10:08 +03:00
LohikaarmeHav
c6ec473280 Camera reset now every time cell object->view is pressed. 2016-08-02 13:46:43 +03:00
Aesylwinn
f73d60cc73 Make scene controls use configurable speed modifier. 2016-07-31 16:28:03 -04: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
LohikaarmeHav
f142f9bf86 wtf 2016-07-27 21:37:52 +03: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
05888e7925 Updated more tool tips to show shortcut configs. 2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150 Fix pathgrid selection mode not being removed from toolbar. 2016-07-25 20:49:28 -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
d8fa3fd1de Added orbit "center on selection" shortcut. 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
scrawl
b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
Marc Zinnschlag
594444a85a Merge remote-tracking branch 'aesylwinn/MultipleDeletion' 2016-06-26 08:11:43 +02:00
Aesylwinn
f6c3b44cfb Fix QTimer not being stopped in right thread 2016-06-10 12:10:14 -04:00
Aesylwinn
ae50300053 Add ability to remove multiple rows in subrecords. 2016-06-09 15:42:40 -04:00
Aesylwinn
2f39a6e20d Fix camera input not being reset when focus for widget is lost. 2016-06-08 13:25:47 -04:00
Aesylwinn
7657684dad Fix mouse tracking to fix tooltip behavior. Also hide tooltips 
when the mouse is moved.
 2016-06-07 13:22:39 -04:00
Marc Zinnschlag
b079db7913 Merge remote-tracking branch 'aesylwinn/EditPathgrid' 2016-06-07 08:35:16 +02:00
Aesylwinn
3409d8a922 Change pathgrid node movement to be visually consistent, some 
renaming
 2016-06-04 12:38:17 -04:00
Aesylwinn
83c86cd1be Implement context-select functionality. 2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd Changes to color scheme, slight change to drag indicator, 
change tooltip description.
 2016-05-29 13:26:29 -04:00
Aesylwinn
90620081c7 Fix handling of deleted pathgrids. 2016-05-27 13:15:35 -04:00
Aesylwinn
bded4f86f0 Remove connection number check 2016-05-27 13:13:49 -04:00
Aesylwinn
ded8862e9d Insert nested rows after selected row, or at start if none selected. 2016-05-26 22:44:02 -04:00
Aesylwinn
d0ef95a1e1 Make adjustments to pathgrid modification code. 2016-05-26 22:13:47 -04:00
Aesylwinn
564d0db68c Move pathgrid abstraction handling to save code. 2016-05-26 22:11:27 -04:00
Aesylwinn
239727531f Revert "Fix data corruption issues." 
This reverts commit 6199663bd8.
 2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712 Revert "Fix editor undo for nested data." 
This reverts commit 774e1497b6.
 2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c Redo slight change to pathgrid editing controls, lost in revert 2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08 Revert "Cleanup and slight change to pathgrid editing controls." 
This reverts commit cc4655e9c7.
 2016-05-25 22:48:43 -04:00
Aesylwinn
cc4655e9c7 Cleanup and slight change to pathgrid editing controls. 
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
 2016-05-24 18:19:05 -04:00
Aesylwinn
5eaaed05fc Improve mouse pick culling. 2016-05-24 17:31:00 -04:00
Aesylwinn
18897348d7 Fix weapon values not being properly set in editor. 2016-05-24 01:12:46 -04:00
Aesylwinn
774e1497b6 Fix editor undo for nested data. 2016-05-23 15:51:36 -04:00
Aesylwinn
6199663bd8 Fix data corruption issues. 
- Point connection count not being set
- Nested undo not restoring table (for pathgrid scene editing, editor
    nested undo is still broken)
 2016-05-21 18:59:43 -04:00
Aesylwinn
799ed300ea Use cell coordinates class, fix undo description. 2016-05-21 14:36:07 -04:00
scrawl
703dba902b Set the shader path in OpenCS 2016-05-20 00:40:59 +02:00
Aesylwinn
b86250036c Add ability to add pathgrids. 2016-05-19 18:33:15 -04:00
Aesylwinn
1781aaaa27 Drag indicator. 2016-05-18 12:17:26 -04:00
Aesylwinn
e8e915bcde Share selection functionality with instance editing mode. 2016-05-18 10:46:25 -04:00
Aesylwinn
ae0d2c3b9c Refactor edit mode. Remove essentially duplicate function. 2016-05-17 21:24:16 -04:00
Aesylwinn
13c2161b27 Fix memory leak, remove empty if statement, change dynamic_cast 
to static_cast
 2016-05-17 16:14:23 -04:00
Aesylwinn
5a7ebab694 Fix forward declaration. 2016-05-16 23:06:36 -04:00
Aesylwinn
9d02286592 Remove unused forward declaration. 2016-05-16 22:17:03 -04:00
Aesylwinn
a3363bc098 Fix and simplify pathgrid update handling, only recreate geometry 
once per frame, and a few naming changes.
 2016-05-16 21:06:55 -04:00
Aesylwinn
d2d22e2f23 Clamp node positions in exterior cells. 2016-05-16 19:03:40 -04:00
Aesylwinn
cd3b96b3e8 Change interaction mask back to original and place required masks in 
PathgridMode.
 2016-05-16 17:59:52 -04:00
Aesylwinn
aea2380c2b Add raytrace to dragCompleted. Implement node drag connection, 
node and edge removal, and some fixes.
 2016-05-16 17:25:02 -04:00
Aesylwinn
6fbc10dbba Add ability to get cell, pathgrid, and ability to add nodes. 
Also missing include.
 2016-05-16 17:20:07 -04:00
Aesylwinn
9f7c8d559c Add focus requirement for context menu. 2016-05-16 17:16:15 -04:00
Aesylwinn
f0bbe2c633 Add context menu for pathgrid editor. 2016-05-16 17:06:40 -04:00
Aesylwinn
8b6cb73369 Add ability to invert selection. 2016-05-16 17:03:00 -04:00
Aesylwinn
55656d68ef Cleanup, put duplicated code in function 2016-05-16 17:00:58 -04:00
Aesylwinn
da6a742beb Add control description to tooltip. 2016-05-16 16:50:02 -04:00
Aesylwinn
f8b43b2a64 Rename cryptic variables. 2016-05-13 12:55:35 -04:00
Aesylwinn
32ba5bf8b8 Initial pathgrid editting, support for selection and movement. 2016-05-12 19:35:49 -04:00
Aesylwinn
9645d0cc8a Pass more mouse pick information in scene view editor. 2016-05-12 18:21:43 -04:00
Marc Zinnschlag
64fdc5a21a Merge remote-tracking branch 'rcutmore/bug-3331' 2016-05-09 09:18:48 +02:00
scrawl
a7e6219091 Merge pull request #939 from kpp/rewrite_esm_name_t 
Rewrite ESM::NAME_T
 2016-05-08 13:15:05 +02:00
Rob Cutmore
547d783eac Editor: Remove overridden configureCreateCommand 
StartScriptCreator was incorrectly overriding configureCreateCommand.
This caused issues trying to edit an uneditable column while adding a
new record.
 2016-05-08 06:09:40 -04:00
Rob Cutmore
e6863c8f79 Editor: Undo editable column check in record add 2016-05-08 06:05:52 -04:00
Marc Zinnschlag
b4e341e1e2 Merge remote-tracking branch 'aesylwinn/RenderPathgrid' 2016-05-08 10:15:12 +02:00
Roman Proskuryakov
d5dfa89060 Rewrite NAME_T into FIXED_STRING. 2016-05-07 23:27:33 +03:00
Rob Cutmore
307f04f827 Editor: Fix issue adding start script (Bug #3331) 
Updated to verify column is editable when adding a new record.
 2016-05-06 08:04:15 -04:00
Aesylwinn
14ae232938 Remove now unnecessary factory class. 
It was originally used for storing normals, but that functionality
was removed.
 2016-05-03 16:13:23 -04:00
Aesylwinn
1f902ff069 Remove code duplication. 2016-05-03 16:13:11 -04:00
Rob Cutmore
b129ff9672 Editor: Add PathgridCreator to find duplicate IDs 2016-05-03 07:24:33 -04:00
Rob Cutmore
c9ada852aa Undo including pathgrids in ID check 2016-05-03 06:19:47 -04:00
Aesylwinn
642b1d0273 Add mask. 2016-05-03 03:29:39 -04:00
Aesylwinn
8d95b63180 Add pathgrid rendering to opencs 2016-05-02 22:10:43 -04:00
Aesylwinn
7fbcc47b15 Add pathgrid modified signals. 2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0 Revert "Pathgrid rendering v2" 
This reverts commit 4dee9604bb.
 2016-05-02 15:37:08 -04:00
Rob Cutmore
5580f803fd Editor: Prevent duplicate pathgrids (Bug #3342) 2016-05-02 07:28:32 -04:00
Aesylwinn
4dee9604bb Pathgrid rendering v2 2016-05-02 06:29:56 -04:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Marc Zinnschlag
9d906a99a8 Merge remote-tracking branch 'rcutmore/bug-3286' 2016-04-18 09:40:13 +02:00
Rob Cutmore
e6ab3a4ba9 Remove unused CSVWorld::ScriptEdit::setMonoFont 2016-04-17 06:57:02 -04:00
Rob Cutmore
30493545f1 Update script editor tab width on font change 2016-04-17 06:54:31 -04:00
Rob Cutmore
25d9b77d10 Add setting for script editor tab width 2016-04-16 20:43:10 -04:00
Marc Zinnschlag
a5bc561c7d Merge remote-tracking branch 'origin/master' 2016-04-08 09:35:39 +02:00
Rob Cutmore
a3903d374f Update script editor tab width (Bug #3286) 2016-04-07 07:47:47 -04:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
Aesylwinn
7d89c82f08 Revert "Fix indentation." 
This reverts commit 9a495042cc.
 2016-04-06 10:23:12 -04:00
Aesylwinn
8c35836883 Fix misnamed identifier. 2016-04-06 03:12:10 -04:00
Aesylwinn
85005626b1 Replace usage of deprecated function. 2016-04-06 03:11:51 -04:00
Aesylwinn
94d4fb0686 Add check for region weather chances to verifier. 2016-04-06 03:11:28 -04:00
Aesylwinn
9a495042cc Fix indentation. 2016-04-06 02:39:33 -04:00
Aesylwinn
5e38fcac36 Add ability to edit region weather probabilities. 2016-04-06 02:18:19 -04:00
Marc Zinnschlag
60509875e8 Merge remote-tracking branch 'aesylwinn/editor_camera' 2016-04-05 08:54:23 +02:00
Aesylwinn
b111febfc9 Add pitch constraint for first person camera. 2016-04-04 20:56:13 -04:00
Aesylwinn
e07687ee01 Add button for camera mouse inversion in user preferences, and separate the 
sensitivity settings for orbit and free cameras.
 2016-04-04 18:42:57 -04:00
Aesylwinn
e127c691e2 Cleanup, remove some unused includes 2016-04-03 18:23:06 -04:00
Aesylwinn
ec25998b12 Cleanup, use setTraversalMask instead of setNodeMaskOverride 2016-04-03 18:19:20 -04:00
Aesylwinn
0ef7c778e0 Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode. 2016-04-03 17:26:34 -04:00
Aesylwinn
6c471349f0 Add context menu for orbit camera. 2016-04-03 16:32:07 -04:00
Aesylwinn
4ef9981544 Add ability to set orbit camera center outside of class. 2016-04-03 16:30:50 -04:00
Aesylwinn
02f991c63e Cleanup, fix comment 2016-04-02 14:02:56 -04:00
Aesylwinn
99e9017242 Cleanup, externalize mask used to pick center 2016-04-02 13:59:57 -04:00
Aesylwinn
a4cc891383 Cleanup, move setup to CameraController class 2016-04-02 13:36:12 -04:00
Aesylwinn
efa2ec21ff Cleanup, no need to inherit and override osg::ComputeBoundsVisitor 2016-04-02 13:14:46 -04:00
Marc Zinnschlag
1bb23b6c77 Merge branch 'move' 2016-04-02 10:08:27 +02:00
Marc Zinnschlag
8f699b5d39 avoid creating move tags for instances that exist only in the currently edited content file 2016-04-02 10:08:03 +02:00
Aesylwinn
1e30891891 Broaden selection mask for getting scene bounds if nothing is found. 2016-03-31 23:54:20 -04:00
Aesylwinn
7d9dddfa38 Place camera farther away, improves preview camera placement. 2016-03-31 23:34:47 -04:00
Aesylwinn
09bce73c33 Fix starting distance not being correctly set. 2016-03-26 14:42:33 -04:00
Aesylwinn
08d055ca23 Allow setting precision of double preferences. Also increase precision of camera sensitivity. 2016-03-26 14:35:03 -04:00
Aesylwinn
35ff4ec4b1 Normalize default camera controls so that is appears as if the camera is 
the object being moved. Also, allow mouse inversion for secondary movement.
 2016-03-26 14:15:07 -04:00
Marc Zinnschlag
eba8b4a518 Merge remote-tracking branch 'rcutmore/feature-3250' 2016-03-26 11:34:25 +01:00
Aesylwinn
fbe9177f5d Better center picking for the Orbit Camera. 2016-03-26 00:51:19 -04:00
Aesylwinn
a0fb242bf8 Slight improvement to camera placement. 2016-03-25 23:47:05 -04:00
Aesylwinn
bee8977e45 Add camera control customization options. 2016-03-25 22:19:44 -04:00
Aesylwinn
dede171886 Fix the secondary navigation method for OrbitCameraController. 2016-03-25 21:35:34 -04:00
Aesylwinn
3c83128abc Add more customization. 2016-03-25 20:47:18 -04:00
Aesylwinn
3a676fc456 Revert "Create a visual representation of the center of the orbit camera." 
This reverts commit 2c894acd98.

# Conflicts:
#	apps/opencs/view/render/cameracontroller.cpp
#	apps/opencs/view/render/cameracontroller.hpp
 2016-03-25 18:20:04 -04:00
Rob Cutmore
1b4c124fe8 Create record on Return key press (Feature #3250) 
Updated to create record when Return key is pressed while input has
focus. Record is only created if input has been validated (i.e. Create
button is enabled).
 2016-03-25 12:13:55 -04:00
Rob Cutmore
29078619aa Fix editor tab order when adding record 2016-03-25 06:28:11 -04:00
Marc Zinnschlag
1774f6d9bf moved ref num assingment from instance creation to save procedure 2016-03-24 11:12:05 +01:00
Aesylwinn
342d31de76 More fixes to the orbit manipulator 2016-03-18 16:56:40 -04:00
Aesylwinn
2903271331 Correct the center position for the orbit camera controller 2016-03-18 16:07:15 -04:00
Aesylwinn
2c894acd98 Create a visual representation of the center of the orbit camera. 
For debugging purposes.
 2016-03-18 16:06:35 -04:00
Aesylwinn
c8bae38a8e Remove trackball mode 2016-03-18 14:53:10 -04:00
Aesylwinn
7009355baf Remove unused variable 2016-03-18 14:46:53 -04:00
Aesylwinn
4374f69a60 Reduce mouse sensitivity 2016-03-18 14:43:13 -04:00
Aesylwinn
2b72a04e7a Update 1st person up axis ASAP. 2016-03-18 14:02:55 -04:00
Aesylwinn
999869da24 Position camera above, near, and looking at the scene. 2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa Define a constant for the World Up vector 2016-03-18 13:57:48 -04:00
pi03k
629a558e7b Fix for bug 3248 2016-03-17 22:34:45 +01:00
Aesylwinn
59f59a3385 Fix indentation 2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1 Preliminary editor camera 2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643 Remove unnecessary override. 2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581 Fix callback being skipped 2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886 Moved selectNavigationMode to SceneWidget class, centralized camera selection. 2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90 Input restructuring. 2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b Removed now unnecessary installation of event filter. 2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7 Removed workaround for OSG input handling in RenderWidget. 2016-03-14 00:41:04 -04:00
Marc Zinnschlag
d5067201d0 Merge branch 'move' 2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e changed 'not implemented' warning message for object movement 2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
scrawl
97526284f5 Allow setting the water level of an interior cell with sky (Fixes #3244) 2016-03-11 22:10:59 +01:00
Marc Zinnschlag
fa9689c5e7 delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on) 2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
Marc Zinnschlag
b2181fae20 safer handling of command macros 2016-03-08 10:48:44 +01:00
Marc Zinnschlag
b5005f7812 keep sub mode over mode changes 2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b properly clear drag mode at the end of a drag 2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind) 2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3 cancel instance move on editing lock becoming active 2016-03-05 10:44:46 +01:00
Marc Zinnschlag
b1fb64bf68 added missing drag mode resets 2016-03-04 16:25:30 +01:00
Marc Zinnschlag
dd564daba0 do not start move drags while the document is locked for editing 2016-03-04 16:24:02 +01:00
Marc Zinnschlag
1726393963 cancel instance move on edit mode change 2016-03-04 15:31:50 +01:00
Marc Zinnschlag
25effc4222 cancel instance move on sub mode change 2016-03-04 15:30:28 +01:00
Marc Zinnschlag
1240e0c716 cancel instance move on drag abort 2016-03-04 15:19:26 +01:00
Marc Zinnschlag
d57021b23c some code simplification 2016-03-04 12:02:45 +01:00
Marc Zinnschlag
c2a8be9048 confine move marker drags to a single axis 2016-03-04 12:00:05 +01:00
Marc Zinnschlag
4cd24715cb Merge remote-tracking branch 'pi03k/bug_2570' 2016-03-04 09:41:21 +01:00
pi03k
128508882a Changed some zeros to NULLs in view.cpp 2016-03-03 11:46:56 +01:00
pi03k
3bfab9c2c9 extracted creation of scroll area to separate method 2016-03-03 11:46:56 +01:00
pi03k
9539925f3e Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers. 2016-03-03 11:46:56 +01:00
pi03k
bf9aa2e131 Extracted resizing of window's width to separate method 2016-03-03 11:46:56 +01:00
Marc Zinnschlag
9c1b4c671d Merge remote-tracking branch 'aesylwinn/cell_borders' 2016-03-03 11:04:51 +01:00
Aesylwinn
9d985d883b added grid icon 2016-03-02 20:45:04 -05:00
Aesylwinn
fa1bd72bc0 fix usage of deprecated function 2016-03-02 15:48:05 -05:00
Aesylwinn
7fb6807e65 cell border markers 2016-03-02 15:02:06 -05:00
Marc Zinnschlag
a19ac72215 render marker 2016-03-01 15:48:34 +01:00
Marc Zinnschlag
6f619ea85f Merge branch 'master' into move 
Conflicts:
	apps/opencs/view/render/object.cpp
 2016-03-01 12:17:53 +01:00
Marc Zinnschlag
7d8bd56e11 create new records with basic data in the same step without updates inbetween (Fixes #3207) 2016-03-01 11:21:06 +01:00
Rob Cutmore
d60786b5da Do not show cell markers for interior cells 2016-02-26 07:42:05 -05:00
Marc Zinnschlag
01497ac8db Merge remote-tracking branch 'origin/master' 2016-02-24 13:37:34 +01:00
Marc Zinnschlag
9f14247562 Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements' 2016-02-24 13:37:16 +01:00
Aesylwinn
1ae402476d Journal verifier 2016-02-22 17:01:15 -05:00
Aesylwinn
f4ed389496 InfoCondition autocompletion 2016-02-22 15:48:25 -05:00
scrawl
a6621626aa Don't use multiple parent node paths in CSVRender::Object 2016-02-22 15:22:37 +01:00
scrawl
1c24cba46a Don't use multiple parental node paths. 2016-02-22 15:13:31 +01:00
Marc Zinnschlag
22e717161a split object base node into two node (one for position, one for everything else) 2016-02-21 15:19:31 +01:00
Aesylwinn
20942e6658 Fixes to testing if condition is always or never true 2016-02-19 14:10:47 -05:00
Aesylwinn
5315866f61 Corrections to condition ranges and several other minor fixes 2016-02-19 03:03:10 -05:00
Aesylwinn
9d392487a9 Fix names to be unique and condition values to be set to 0 2016-02-19 02:59:19 -05:00
Aesylwinn
bdc99048bb Missing header 2016-02-17 19:01:22 -05:00
Aesylwinn
8668eccd0b Topic Info verifier with fixes to InfoSelectWrapper class 2016-02-17 15:38:30 -05:00
Aesylwinn
e89609e5b0 Changes to how Info Conditions are edited 2016-02-17 14:15:57 -05:00
scrawl
c4d38bb42d Fix clang analyzer warnings 2016-02-16 19:17:04 +01:00
Marc Zinnschlag
dececf6c38 instance moving via drag in 3D scenes 2016-02-16 16:02:29 +01:00
Aesylwinn
3f40346636 Implemented a wrapper for DialInfo::SelectStruct 2016-02-15 19:49:54 -05:00
scrawl
647a5e091f Add osgQt to the repository 
Ensures that it will be built against the correct Qt version.
 2016-02-15 15:16:48 +01:00
Marc Zinnschlag
dad38d901c Merge remote-tracking branch 'rcutmore/feature-3043' 2016-02-14 17:38:20 +01:00
Rob Cutmore
25744aaadd Update cell marker appearance 
- Added bounding box around marker text. Box is black when cell exists
  otherwise it is red.

- Changed format of marker text.

- Changed marker text's pivot point to be at center of text.
 2016-02-14 10:28:41 -05:00
Rob Cutmore
61b6806a62 Allow toggling of cell markers 2016-02-09 20:23:00 -05:00
scrawl
596fe56bfd Make Land::loadData thread safe 2016-02-09 20:21:56 +01:00
scrawl
e28dc3e72f Preload instances in SceneManager 2016-02-09 18:35:26 +01:00
Rob Cutmore
a34a08c212 Render cell markers 
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
 2016-02-07 13:52:18 -05:00
scrawl
d12f24c321 Fix typo 2016-02-01 21:01:11 +01:00
Rob Cutmore
d28e7db65c Fix tooltip spelling errors in WorldspaceWidget 2016-01-31 08:45:05 -05:00
Alexander "Ace" Olofsson
b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2016-01-30 07:31:00 +01:00
Rob Cutmore
d43315fe4e Add script editor line wrapping (Feature #2926) 
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
 2016-01-28 06:28:31 -05:00
Rob Cutmore
4caf44f061 Remove unused code in apps/opencs/view/world/table files 2016-01-26 07:48:55 -05:00
Marc Zinnschlag
1b7a0e5d64 Merge branch 'buttons' 2016-01-26 11:32:26 +01:00
Marc Zinnschlag
1d0ef97bf6 added select all of same ID item to selection mode button menu 2016-01-26 11:31:37 +01:00
Marc Zinnschlag
d5ef40aeb7 minor improvements to wording of instance selection menu items 2016-01-26 10:51:47 +01:00
Marc Zinnschlag
39e1b06101 fixed deletion of objects that are selected (was leaving a node behind) 2016-01-25 16:18:55 +01:00
Marc Zinnschlag
790367b980 fixed object removal via setting state to delete 2016-01-25 16:12:20 +01:00
Marc Zinnschlag
c1f0aa7260 added delete selection item to selection mode button menu 2016-01-25 14:55:02 +01:00
Rob Cutmore
fbca094dda Fix input validation in StartScriptCreator 2016-01-24 20:15:27 -05:00
Rob Cutmore
b93b97575e Improve start script creation (Fixes #3024) 
Improved start script creation by updating input to be a drop target
and adding auto-completion.
 2016-01-24 11:54:53 -05:00
scrawl
b0431833a1 Fix some defects reported by Coverity CI 2016-01-21 16:08:04 +01:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Marc Zinnschlag
45e6974266 added select all and clear selection features 2016-01-19 14:25:20 +01:00
Marc Zinnschlag
4a02563708 Merge branch 'master' into buttons 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-19 13:59:24 +01:00
Marc Zinnschlag
ecbcd6b171 allow mode buttons to setup the context menu 2016-01-19 12:52:30 +01:00
Marc Zinnschlag
eee972a1a4 added scene tool mode context menu feature 2016-01-19 12:47:11 +01:00
Marc Zinnschlag
0305ae3693 added selection mode UI 2016-01-19 12:17:13 +01:00
Aesylwinn
bbda5fe634 Removed hints from error messages and fixed naming to match conventions 2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba gmst verifier 2016-01-17 21:55:03 -05:00
Rob Cutmore
08b469c0d0 Remove unused forward declarations in filedialog.hpp 2016-01-17 14:18:49 -05:00
scrawl
fbf07133ea Document usage of node masks 2016-01-15 16:31:24 +01:00
scrawl
18320b2cd0 Move the Button enum to WorldSpaceWidget 2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
Marc Zinnschlag
c1901069be added instance mode sub-modes 2016-01-15 12:07:25 +01:00
scrawl
091ca9743e Do not write LandData twice (Fixes #3140) 2016-01-14 16:41:50 +01:00
Marc Zinnschlag
55627c0853 handling drops into cells that do not exist or are not shown 2016-01-14 13:20:01 +01:00
Marc Zinnschlag
6eba647a9d added accessor function for cell selection in paged worldspace 2016-01-14 13:19:37 +01:00
scrawl
458a305bff OpenCS: add lighting mask 2016-01-11 23:14:43 +01:00
scrawl
7f967153ef OpenCS: create light sources 2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3 OpenCS: add a mask for particle systems 2016-01-11 23:10:16 +01:00
scrawl
ad2145b463 OpenCS: use a separate enum for the toggle buttons 2016-01-11 23:10:16 +01:00
scrawl
fb849014bd Pass the fallback map to CSMWorld::Data 2016-01-11 23:10:16 +01:00
scrawl
11496b8075 Read fallback settings in OpenCS 2016-01-11 23:10:16 +01:00
Marc Zinnschlag
5b9d6cce98 made drop distance configurable 2016-01-11 09:03:02 +01:00
Marc Zinnschlag
7dd7be7f0e make scenes drop target for referenceables 2016-01-10 08:56:15 +01:00
Marc Zinnschlag
466f91db67 Fixed wrong GMST name for newly created game files (Fixes #3132) 2016-01-06 13:10:09 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
Marc Zinnschlag
2162f21550 Merge branch 'drop' 2015-12-20 10:18:05 +01:00
Aesylwinn
9bd14215d7 Expanded inventory check to creatures and NPCs 2015-12-19 22:02:39 -05:00
Aesylwinn
4c14117761 Added checks to verifier for container inventories 2015-12-19 20:03:00 -05:00
Marc Zinnschlag
102397067c added interface for per edit-mode drop handling 2015-12-18 14:04:53 +01:00
Marc Zinnschlag
37a72d1ea6 reject unsuitable drops to WorldspaceWidget earlier 2015-12-18 12:38:45 +01:00
Marc Zinnschlag
6b626c2954 spelling fixes 2015-12-17 13:06:37 +01:00
scrawl
6ee7c61667 CSMPrefs: fix deadlock in toColor() 2015-12-15 19:33:28 +01:00
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
be19da189a fixed user settings not being saved when last document window is closed while user settings window is still open 2015-12-15 14:56:29 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Marc Zinnschlag
c646533448 removed old user settings system 2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144 final batch of changing over user settings usage to the new system 2015-12-15 12:44:04 +01:00
Marc Zinnschlag
44925e9fc8 fixed records settings (Text Only wasn't updating) 2015-12-15 12:26:08 +01:00
Marc Zinnschlag
591564566c made user settings access thread-safe 2015-12-15 12:19:48 +01:00
Marc Zinnschlag
ecbd68a19b third batch of changing over user settings usage to the new system 2015-12-15 10:40:00 +01:00
Marc Zinnschlag
a3a2c2f476 second batch of changing over user settings usage to the new system 2015-12-14 17:38:33 +01:00
scrawl
fb9f5f8fe8 Fix typo 2015-12-14 01:36:53 +01:00
Marc Zinnschlag
cf9fa0e0e9 first batch of changing over user settings usage to the new system 2015-12-12 14:49:16 +01:00
Marc Zinnschlag
0ffe4290fb workaround for MOC's lack of namespace awareness 2015-12-12 12:05:56 +01:00
Marc Zinnschlag
04a11679fb added category update function 2015-12-12 11:58:53 +01:00
Marc Zinnschlag
3a5238bebc changed the settingChanged signature to accommodate queued connections 2015-12-11 12:06:20 +01:00
Marc Zinnschlag
8245b9e439 added interface for querying settings 2015-12-11 11:50:06 +01:00
Marc Zinnschlag
31b105ad9e improved settings layout 2015-12-11 11:32:55 +01:00
Marc Zinnschlag
a907b4ab15 made Setting class non-abstract 2015-12-11 11:22:15 +01:00
Marc Zinnschlag
73ffdd5ac5 added colour settings 2015-12-11 11:15:14 +01:00
Marc Zinnschlag
590d6eba9b added enum settings 2015-12-10 17:33:14 +01:00
Marc Zinnschlag
8050eba83b added a few comments 2015-12-10 13:33:44 +01:00
Marc Zinnschlag
b0fb6d56f1 added bool settings 2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647 added double settings 2015-12-10 10:58:38 +01:00
Marc Zinnschlag
c61d717e41 added integer settings 2015-12-08 17:21:58 +01:00