Nelsson Huotari
66fba7cc51
Remove unneeded constructors, only initialize in cpp, minor fixes
2020-03-26 18:06:33 +02:00
Nelsson Huotari
ec2ff2a9b0
Fix if oneliners
2020-03-26 14:47:40 +02:00
Nelsson Huotari
18cdd3bd7c
rebase-related fixes
2020-03-26 13:25:33 +02:00
Nelsson Huotari
da0add904b
Fix and simplify brush outlines and coordinate calculations
2020-03-26 13:25:33 +02:00
Nelsson Huotari
8f625474fd
Hotfix terraintexturemode circle brush radius calculations
2020-03-26 13:25:33 +02:00
Nelsson Huotari
e14c390a9b
Fix crash
2020-03-26 13:25:33 +02:00
Nelsson Huotari
731e5b57f5
Tool outline for terraintexturemode and square shape. Various fixes.
2020-03-26 13:25:33 +02:00
Nelsson Huotari
24c8b32d4c
Implement brush outline for terrainshapemode
2020-03-26 13:25:33 +02:00
Alexei Dobrohotov
baff15362a
Merge pull request #2713 from unelsson/opencsdropobjects
...
Editor: Implement dropping objects with keypress in instancemode
2020-03-24 03:01:07 +03:00
Capostrophic
18bfc6f2c5
Fix Gender column filtering (bug #4601 ) and correct filter descs
2020-03-22 22:09:38 +03:00
Nelsson Huotari
793ea8566f
Fix typo
2020-03-19 12:14:10 +02:00
Nelsson Huotari
17cb3414d8
clean-up, improve formatting
2020-03-19 11:18:54 +02:00
Nelsson Huotari
75f6577f61
Remove unneeded include
2020-03-18 11:26:11 +02:00
Nelsson Huotari
41aa90bfa7
Add helper class for safer mask handling
2020-03-18 11:18:18 +02:00
Nelsson Huotari
af434cffba
fix numeric limits min() to lowest(), fix correct drop height
2020-03-18 11:18:18 +02:00
Nelsson Huotari
035d5205d9
Use collision boxes to calculate dropping height, variable naming
2020-03-18 11:18:18 +02:00
Nelsson Huotari
54738e1e32
Handle mask disabling better
2020-03-18 11:17:22 +02:00
Nelsson Huotari
711dc59f09
Implement four different functions for dropping
2020-03-18 11:17:22 +02:00
Nelsson Huotari
f063eeb36e
Drop objects with a keyboard shortcut
2020-03-18 11:17:22 +02:00
Andrei Kortunov
02444add2a
Support for radial fog (feature #4708 )
2020-03-17 23:09:28 +04:00
Capostrophic
4455c978df
Explain the global shader define default values in editor
2020-03-04 01:00:09 +03:00
Capostrophic
6999f1fd28
Add an option to apply lighting to environment maps
2020-03-03 20:08:59 +03:00
Nelsson Huotari
198a75b8e6
Delete selected instances with a hotkey
2020-02-19 11:44:55 +02:00
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
AnyOldName3
3ce3f364ea
Merge branch 'AnyOldName3-master-patch-00511' into 'master'
...
Add default font releaseGLObjects workaround for OSG <3.65
Closes #4704
See merge request OpenMW/openmw!160
2020-02-05 22:46:16 +00:00
Capostrophic
216a5d27c6
Avoid working with AMBI subrecord in tools unnecessarily (bug #5269 )
2020-02-04 20:57:04 +03:00
AnyOldName3
73722eedf3
Add default font releaseGLObjects workaround for OSG <3.65
...
This resolves https://gitlab.com/OpenMW/openmw/issues/4704
I've not compiled this or anything and I'm going off my memory from
around ten or eleven months ago, so if this fails CI or causes more
problems, that's why. The most likely issue is that we'll need to make
the context current before releasing the program.
2020-01-30 23:12:54 +00:00
Bret Curtis
7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation
...
Editor: Convert radians to degrees when rotating objects
2020-01-28 11:55:56 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam
...
Generate WNAM subrecord upon saving terrain instead of upon editing it
2020-01-28 11:43:47 +01:00
Nelsson Huotari
032513ae18
Convert radians to degrees
2020-01-28 11:33:44 +02:00
Capostrophic
7659370992
Editor: Add a reset to defaults button to keybindings (feature #4068 )
2020-01-13 02:26:01 +03:00
capostrophic
89055f1c6c
Generate WNAM upon saving terrain
2020-01-11 02:42:04 +03:00
Andrei Kortunov
3704acf857
Unify streams usage to support non-ASCII paths (bug #5239 )
2020-01-03 07:10:17 +04:00
Andrei Kortunov
089548cdc4
Fix build on Qt4
2019-12-22 10:31:32 +04:00
Andrei Kortunov
78450312bf
Fix the last warning about deprecated Qt functions
2019-12-20 13:36:32 +04:00
Andrei Kortunov
e44021b369
Fix most of deprecated API usage in the editor
2019-12-20 12:59:56 +04:00
Assumeru
737aa1e4e8
Remove FactionID editing from OpenCS ( #2636 )
...
* Remove FactionID editing
* remove useless comments
* rename FactionID to Unknown
2019-12-18 20:42:54 +03:00
Andrei Kortunov
ab4b3677e3
Merge branch '16' into 'master'
...
perf regression fix
See merge request OpenMW/openmw!157
2019-12-02 05:35:19 +00:00
Nikolay Kasyanov
6ef94c20b3
Fix macOS packaging on CMake 3.15
...
It looks like component names have become case sensitive.
2019-11-30 10:37:05 +01:00
bzzt
f09125fc93
perf regression fix
2019-11-20 13:37:00 +00:00
Bret Curtis
454b9f1964
Merge pull request #2597 from akortunov/coverity
...
CoverityScan fixes, part 2
2019-11-14 21:08:03 +01:00
Alexei Dobrohotov
b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges
...
Allow selecting cell edges everywhere
2019-11-14 17:25:48 +03:00
Andrei Kortunov
b210e99abc
Avoid divizion by zero
2019-11-14 17:43:21 +04:00
Nelsson Huotari
120583f443
optimize isInCellSelection calls
2019-11-14 11:28:49 +02:00
Andrei Kortunov
238dcdbbd4
Fix copy-paste error
2019-11-13 15:14:30 +04:00
Andrei Kortunov
079c77ff22
Avoid zero division
2019-11-13 14:57:22 +04:00
Nelsson Huotari
45d43045eb
Remove unused std::string
2019-11-04 12:29:37 +02:00
Nelsson Huotari
aeb0ccff90
Allow selecting cell edges everywhere
2019-11-04 12:16:08 +02:00
Nelsson Huotari
8f6dc78217
Get vertex height from data, if not available in visible cells.
2019-11-04 00:09:23 +02:00
Nelsson Huotari
9677203215
Don't allow vertex selection outside visible cells
2019-11-04 00:09:23 +02:00
Nelsson Huotari
d186bcb46f
Update selection during transient edit, clear to a single function.
2019-11-03 13:27:27 +02:00
Alexei Dobrohotov
7328db4d6b
Fix small typo in body part record verifier
2019-10-30 17:51:36 +03:00
Andrei Kortunov
45ab6e1430
Implement UTF-8 support for script parser (bug #4598 )
2019-10-30 14:59:47 +04:00
Andrei Kortunov
d278e5d4af
Fix warnings about variable re-declaration
2019-10-29 13:48:08 +04:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit
...
[Review phase] Editor: Transient land shape editing
2019-10-25 00:26:43 +02:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding
...
Encode ID's in all places to UTF-8
2019-10-24 00:48:12 +02:00
Nelsson Huotari
c957f0544c
Remove unneeded brackets
2019-10-23 00:34:54 +03:00
Nelsson Huotari
fdc73b87ba
Remove includes that aren't needed any more
2019-10-23 00:07:41 +03:00
Nelsson Huotari
9e5db10288
const ref float -> float
2019-10-23 00:02:24 +03:00
Nelsson Huotari
ac5b356e8d
Always initialize landShapeNew
2019-10-23 00:01:23 +03:00
Nelsson Huotari
6f9f59dd58
declare cellId and cellCoords in smallest possible scope
2019-10-22 21:26:55 +03:00
Nelsson Huotari
fdcc7fa1d7
0 to nullptr
2019-10-22 21:26:55 +03:00
Nelsson Huotari
a13edbdb42
Bump shape calculation to function
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8d3e7f2815
fix normals at cell edges, better coding standards
2019-10-22 21:26:55 +03:00
Nelsson Huotari
0f6ddfe8e6
change include, cleanup
2019-10-22 21:26:55 +03:00
Nelsson Huotari
12349f4e48
cleanup
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c556885d71
remove unused Qt signal
2019-10-22 21:26:55 +03:00
Nelsson Huotari
deb122ffdb
Add optional post-processing (smooth/rough), add/fix tooltips.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
2d34b63b0b
Fix logic of land loading when no cell, land or landdata. Fix also draw.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
71eff60d22
Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize
2019-10-22 21:26:55 +03:00
Nelsson Huotari
a1348d94f9
add missing final specifiers
2019-10-22 21:26:55 +03:00
Nelsson Huotari
16ba32ffd5
assignments to member initialization list
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2de645c8c
override, virtual -> final, remove unused variables, public to private.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a3070e680
Fix shape brush setting description
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8a9ca0b3ec
Generate new WNAM record based on new land heights, add comments
2019-10-22 21:26:55 +03:00
Nelsson Huotari
96be82a047
Remove terrain vertex selection and brush button when exiting editMode
2019-10-22 21:26:55 +03:00
Nelsson Huotari
8acfa2600f
Terrain shape editing related fixes
2019-10-22 21:26:55 +03:00
Nelsson Huotari
5b9debc554
use enum for mbrushshape initialization
2019-10-22 21:26:55 +03:00
Nelsson Huotari
4f9ec24e41
use enum for brushshape at scenetoolshapebrush
2019-10-22 21:26:55 +03:00
Nelsson Huotari
bae8636ec0
Fix brusshape enum values
2019-10-22 21:26:55 +03:00
Nelsson Huotari
c031543420
use enum for brush shapes
2019-10-22 21:26:55 +03:00
Nelsson Huotari
388edfd8cc
change manual memory management to std::unique_ptr
2019-10-22 21:26:55 +03:00
Nelsson Huotari
da4abcd7c1
std::set to std::unique and erase.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a44cae572
white iterator loop to C++11 range-based for loop.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
bccf36fdbc
Convert normals calculations mostly to osg::Vec3f
2019-10-22 21:26:55 +03:00
Nelsson Huotari
45b0f034c3
Split complex if-logic into multiple reasonably named functions
2019-10-22 21:26:55 +03:00
Nelsson Huotari
0ce971c1bb
Revert back to less aggressive component-level changes.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
69083369f8
use std::fill instead of for
2019-10-22 21:26:55 +03:00
Nelsson Huotari
3599e804e1
Fix the default value of mBrushSize
2019-10-22 21:26:55 +03:00
Nelsson Huotari
dc7dc93320
Remove unused functions, improve formatting, handle terrain edit click
2019-10-22 21:26:55 +03:00
Nelsson Huotari
1046d57190
Remove unneeded forward declarations.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
55b3fd4418
Use float calculations for circle brush, keep tool options in memory.
2019-10-22 21:26:55 +03:00
Nelsson Huotari
23e7c71a5a
Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
8f3c22ccc3
Remove TerrainShapeMode::fixEdges
2019-10-22 21:25:10 +03:00
Nelsson Huotari
1a3fc435b9
Fix alterHeight bugs, don't let broken land edit pass.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
ff18595a86
Reduce code duplification, add bool value to limiting
2019-10-22 21:25:10 +03:00
Nelsson Huotari
60c0a25004
Fix smooth tool and flatten tool. Default tool strength to 8.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
54e13954e8
Improve land steepness limiting code
2019-10-22 21:25:10 +03:00
Nelsson Huotari
4a2d8aaf97
Handle mBrushSize 1.
2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896
Transient land shape editing
2019-10-22 21:25:10 +03:00