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 Číž
79527b746a
Remove unused variable
2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63
Fix orbit camera axis
2017-12-13 20:08:38 +01:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +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 Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Kyle Cooley
eb23367175
Fix rendering depth/order issues
2017-11-26 17:39:57 -05:00
Kyle Cooley
c8f79ea838
Adjust rotation markers
2017-11-25 20:46:14 -05:00
Kyle Cooley
1cd539bad2
Fix render order for markers
2017-11-10 02:06:06 -05:00
Kyle Cooley
556117f6e6
Update marker transparency when changed.
2017-11-10 01:56:06 -05:00
Kyle Cooley
de214db8d4
Use configured transparency.
2017-11-09 13:45:32 -05:00
Kyle Cooley
197ea95646
Prevent arrows for move/scale markers from intersecting.
2017-11-09 13:04:46 -05:00
Kyle Cooley
492b99b008
Transparent object markers
2017-11-07 00:41:27 -05: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
137ea872d3
Hide base land textures.
2017-10-02 15:56:22 -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
PlutonicOverkill
5e60fb7c10
Fix preferences pane width
2017-09-17 21:09:28 +12: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
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
2017-09-08 14:37:03 -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
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
30ba1d4c25
Move touch command to creator, to allow customization and not break abstraction
2017-09-03 17:01:16 -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
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
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -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
5950b26912
Update scene assets
2017-08-19 19:36:45 -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
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
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
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
cd75c5618c
Move context menu code to PageBase
2017-05-11 19:46:51 +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
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
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
370c12e78a
Verification results are ordered by Type in alphabetical order.
2017-02-21 11:15:53 +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
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
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
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
Leon Krieg
c7b4b2cdd7
Fixed multiple spelling mistakes
2016-12-14 16:39:33 +01: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
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
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
Rob Cutmore
829345257c
Allow disabled nested tables to be scrollable
2016-09-24 10:36:00 -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
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
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
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
