829560719e
Make name highlighting more consistent and only for variable names
8 years ago
cc3dfd7da0
Merge pull request #208 from OpenMW/master
...
Add OpenMW commits up to 28 Apr 2017
8 years ago
95f60d2bb3
Merge branch 'master' into mark-variable
8 years ago
cbb2b8b119
Add setting so feature can be turned off
8 years ago
a8e7628e83
Enable highlighting when cursor is placed over a name (script editor)
8 years ago
7919c4d672
Merge remote-tracking branch 'plutonicoverkill/master'
8 years ago
e685de0f84
Fix script editor undo/redo context menu actions
8 years ago
6063d8e31b
Fix existing context menu in script editor
8 years ago
752848834a
Merge pull request #207 from OpenMW/master
...
Add OpenMW commits up to 26 Apr 2017
8 years ago
61e6b0d03c
improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault)
8 years ago
3d1e640388
Add setting to change keyboard shortcut and fix another crash
8 years ago
1f699552f7
Fix infinite recursion bug in uncommentSelection()
8 years ago
61e374fdfc
Implement commentSelection() and uncommentSelection()
8 years ago
83ff7d162c
Add comment/uncomment actions to the context menu
8 years ago
6557577c03
Merge pull request #193 from OpenMW/master
...
Add OpenMW commits up to 7 March 2017
8 years ago
0ff56677f6
Remove unused code
8 years ago
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.
8 years ago
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.
8 years ago
dff52d8fbe
Merge pull request #191 from OpenMW/master
...
Add OpenMW commits up to 31 Mar 2017
8 years ago
ab8294b281
Merge remote-tracking branch 'rcutmore/bug-2838'
8 years ago
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".
8 years ago
6a745cb2cc
Fix text colorMode (Bug #3815 ) and render bin
8 years ago
77bf1efc1a
Editor: Fix labels for creator user inputs
8 years ago
8d4441bb5e
Editor: document subclasses without ID checks
...
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
8 years ago
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
8 years ago
3714c2a0f2
Editor: add ID validator to pathgrid input
8 years ago
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.
8 years ago
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.
8 years ago
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.
8 years ago
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.
8 years ago
60037e4081
Merge pull request #185 from OpenMW/master
...
Add OpenMW commits up to 14 Mar 2017
8 years ago
14225a42c6
Remove unused pointer to IncrementalCompileOperation
8 years ago
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
8 years ago
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.
8 years ago
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
8 years ago
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
8 years ago
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
8 years ago
0d6636018f
Merge pull request #166 from OpenMW/master
...
Add OpenMW commits up to 23 Feb 2017
8 years ago
e9076088ca
Another tab fix
8 years ago
4e7f7cf84f
Fixed tabs
8 years ago
370c12e78a
Verification results are ordered by Type in alphabetical order.
8 years ago
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
8 years ago
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.
8 years ago
fd4827b3a7
Merge pull request #157 from OpenMW/master
...
Add OpenMW commits up to 18 Feb 2017, part 2
8 years ago
520e82ed4f
Fix for commit "affc0eb..." in PR 1216 ( fixes #3756 )
...
Fixed use of tab character.
8 years ago
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.
8 years ago
e0bc557aa4
Merge pull request #154 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017
8 years ago
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.)
8 years ago
c32c004516
Merge pull request #151 from OpenMW/master
...
Add OpenMW commits up to 16 Feb 2017
8 years ago
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
8 years ago
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.)
8 years ago
e46fb1770c
Merge remote-tracking branch 'matahualpa/openmw-cs_booktype'
8 years ago
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.
8 years ago
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.
8 years ago
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
8 years ago
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
8 years ago
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
8 years ago
c5dcfe0794
Update refidadapterimp.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
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.
8 years ago
d9f5dfe65c
Merge pull request #138 from OpenMW/master
...
Add OpenMW commits up to 2 Feb 2017
8 years ago
625c5040ce
Fix build
8 years ago
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
8 years ago
960d4a96c3
Reduce the number of osg::Material state by setting the default state on the graph root
8 years ago
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
34389e15cd
Merge remote-tracking branch 'origin/master'
8 years ago
827c78a4cd
added text column to ref id table (books)
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
c7b4b2cdd7
Fixed multiple spelling mistakes
8 years ago
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
8 years ago
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
b028f0b51f
Merge pull request #104 from OpenMW/master
...
Add OpenMW commits up to 17 Nov
8 years ago
c18fc113e5
Changed missing library dependencies to simple fix
8 years ago
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
59eba1dede
Changed tabs to spaces, oops
8 years ago
86b4673539
Removed math constants in openmw-cs, which are apparently not going to be used
8 years ago
1861302dbd
Include various libraries for Visual Studio environment
8 years ago
cd798d5f23
Merge pull request #89 from OpenMW/master
...
Add OpenMW commits up to 30 Oct
8 years ago
e5cb7306c3
Merge pull request #1115 from Allofich/conversion
...
Fix narrowing conversion warning
8 years ago
68ed264f40
Fix narrowing conversion warning
8 years ago
125e94ef0e
Fix shadowing warnings
8 years ago
47ebd24b4a
Merge pull request #79 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
ccacad51be
Fix shadowing warnings
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
1c54f54ab8
Fix shadowing warnings
8 years ago
53b006eccb
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification ( Fixes #3564 )
8 years ago
8be8c7ca66
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564 )
8 years ago
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
8 years ago
add1a5e5b2
Merge pull request #72 from OpenMW/master
...
Add OpenMW commits up to 30 Sep
8 years ago
e918474a94
Merge remote-tracking branch 'rcutmore/bug-3277'
8 years ago
8f47ed17df
Show nested tables only when they are editable
8 years ago
b59694c4f0
Set tooltip for read-only nested tables
8 years ago
7e4543ffcb
Merge pull request #64 from OpenMW/master
...
Add OpenMW commits up to 24 Sep
8 years ago
b899d43a33
Allow base plugins to overwrite referencables made in other base plugins.
8 years ago
829345257c
Allow disabled nested tables to be scrollable
8 years ago
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
48c257b939
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
8 years ago
fab7549b42
Fix windows path issue in editor debug run.
...
- The problem was caused by spaces in the data directory
8 years ago
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.
8 years ago
9764dbb8d2
Merge pull request #52 from OpenMW/master
...
Add OpenMW commits up to 2 Sep
8 years ago
316cf40f12
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
8 years ago
c0d53a2557
Fix CellRefs being teleported from interior to exterior cells.
8 years ago
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
8 years ago
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.
8 years ago
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
8 years ago
91fd966146
Fix some issues detected by coverity for the editor.
8 years ago
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
8 years ago
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
8 years ago
7125775648
Change free axis rotation.
9 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
9 years ago
3e4ac0c662
Potential fix for context sensitive select mode issues.
9 years ago
2f6075329b
Clang warning fixes
9 years ago
101c3cc90d
Rotate around center of selection.
9 years ago
571969cd65
Scale from center of selection.
9 years ago
388917df89
Base editor rotate/scale commit.
9 years ago
a563a9d336
added missing Q_OBJECT
9 years ago
448c9d5a5b
Fix globals not being initialized with a valid type.
9 years ago
0963adb2f4
Fix pointer being deleted twice.
9 years ago
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
9 years ago
16d0580ce8
Fix struct/class mismatch.
9 years ago
1f32f1eef5
Add water texture.
9 years ago
9454f4f2e7
Use shared water geometry + state generation,
...
Fix water position and render bin,
Fix passed cell parameter being ignored
9 years ago
3904a24e6c
Add missing include.
9 years ago
5674e0da24
Render water in editor.
9 years ago
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
19c74a4d6e
Part two
9 years ago
7309be8592
First part
9 years ago
e8ef5c233f
Miss info
9 years ago
0592d1cdcf
Commnent?
9 years ago
48bcde8cc9
...
9 years ago
b0cf276cfc
hups
9 years ago
7cd991107c
Nah
...
Preview seem to not like removing mCamPositionSet and I have do other things.
9 years ago
c6bc30d6a8
Forgot to remove line and add comment.
9 years ago
2e6f80688c
Removed debug
9 years ago
c6ec473280
Camera reset now every time cell object->view is pressed.
9 years ago
f73d60cc73
Make scene controls use configurable speed modifier.
9 years ago
bf2ab4ed45
Change the way modifiers are handled so they can be shared.
9 years ago
faea33b888
Revert "Change scene controls to more closely match blender as requested"
...
This reverts commit bc7ae70f0b
9 years ago
bc7ae70f0b
Change scene controls to more closely match blender as requested
...
in the forums.
9 years ago
1cce085fa2
Remove unused headers.
9 years ago
2f97d6cffb
Move tool tip processing to ShortcutManager,
...
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
9 years ago
d7a83d80a2
Change some key binding defaults.
9 years ago
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)
9 years ago
96a3c278fd
Added shortcuts for loading a cell relative to the camera,
...
Removed Ctl+V binding for "Verify" because that is associated
with paste.
9 years ago
65201badf6
Add custom page for key bindings.
9 years ago
f142f9bf86
wtf
9 years ago
b685c0ce6c
Add ability to clear shortcut/modifier setting with right click.
9 years ago
12db6d2114
Add modifier setting.
9 years ago
b204758be1
More shortcuts.
9 years ago
3f7f75cc9d
Exclude keys not compatible with qt 4
9 years ago
PlutonicOverkill
David Cernat
Marc Zinnschlag
Rob Cutmore
scrawl
FedeWar
MAtahualpa
Leon Krieg
Nikolay Kasyanov
Phillip Andrews
Allofich
MiroslavR
Aesylwinn
LohikaarmeHAV