mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 16:53:54 +00:00
Code Issues Releases Wiki Activity
30657 commits 108 branches 66 tags 133 MiB
Commit graph

809 commits

Author SHA1 Message Date
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
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
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
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
Nelsson Huotari
032513ae18 Convert radians to degrees 2020-01-28 11:33:44 +02:00
capostrophic
89055f1c6c Generate WNAM upon saving terrain 2020-01-11 02:42:04 +03: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
Andrei Kortunov
d278e5d4af Fix warnings about variable re-declaration 2019-10-29 13:48:08 +04: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
c2de645c8c override, virtual -> final, remove unused variables, public to private. 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
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
dc7dc93320 Remove unused functions, improve formatting, handle terrain edit click 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
Nelsson Huotari
78f2a5181d Default brush size to 1 2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b assignment to memb. init. list, publics to private, virtual -> final 2019-10-10 14:27:22 +03:00
Nelsson Huotari
4ccb951126 move check to outermost scope 2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189 Consistency for variable and header argument names. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b More readable code 2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d Don't add empty primitive sets to geometry. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1 Remove globals, const int& -> int, values to const ref. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1 Less verbose syntax 2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d Remove extra include 2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431 Only allow selection of cells in view 2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6 Make less copies 2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7 Remove empty lines 2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892 pass by const ref and other fixes 2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f Fixes, cleanup. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b Remove unused code, clarifications, optimizations 2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492 Terrain texture selection, support for vertex selection 2019-09-10 12:15:19 +03:00
Nat Meo
af1e5e01b4 Issue #5005: Instance window via Scene window 2019-07-01 23:26:05 +00:00
Capostrophic
85e99182ce Revise light source configuration (bug #4965) 
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
 2019-04-10 22:31:31 +03:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
elsid
ccb325c663
Add override to fix warnings 2019-03-20 00:19:26 +03:00
Nelsson Huotari
2b674cedaa Implement view cell from r-type hint 2019-03-16 14:38:51 +02:00
Andrei Kortunov
9e4a339ad3 Daytime node switch support (feature #4836) 2019-02-02 10:50:15 +04:00
Stomy
71be4cdd20 Ensure Unique Instance Refnum after clone, add, or move 2019-01-21 19:30:11 +00:00
mp3butcher
9de6c630f2 fix moc achieving to reach unparsable boost code 2018-12-01 21:27:43 +01:00
Andrei Kortunov
059a8fd32a Refactor dynamic casts in the editor 2018-11-15 17:50:23 +04:00
Andrei Kortunov
5ac81cfbff Throw exceptions with some info int the editor if dynamic_cast failed 2018-11-14 15:53:43 +04:00
Andrei Kortunov
4ee15ddcb9 Fix many Coverity Scan warnings 2018-11-14 11:21:49 +04:00
Andrei Kortunov
e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Capostrophic
03788edd63 Fix redundant drag call in instance dragging (bug #4593) 2018-10-05 18:48:17 +03:00
Kyle Cooley
0096951f25 cleanup 2018-09-27 13:14:59 +04:00
Kyle Cooley
676fc48855 Re-add logic for empty model 2018-09-27 13:14:59 +04:00
Kyle Cooley
f43b70d77b Centralize actor data, simplify logic 2018-09-27 13:14:59 +04:00
Kyle Cooley
031502b2ab Reorganize ActorAdapter data, use weak cache for sharing 2018-09-27 13:14:59 +04:00
Kyle Cooley
2a9ebac572 Simplify update logic, update when race parts are changed. 2018-09-27 13:14:59 +04:00
Kyle Cooley
1276e0fa9b Handle changes to race record when rendering actors 2018-09-27 13:14:59 +04:00
Kyle Cooley
6bece13a32 Use new Log class for error message 2018-09-27 13:14:59 +04:00
Kyle Cooley
97ac0a92dd Move data handling out of rendering code, equip armor/clothes 2018-09-27 13:14:59 +04:00
Kyle Cooley
6b42f37918 Handle creatures too 2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40 Move common stuff to scene util, fix errors with 1st person meshes 2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981 Start rendering npc's 2018-09-27 13:14:59 +04:00
Andrei Kortunov
ee4ca87352 Traverse child nodes of cell node in the editor (bug #4654) 2018-09-26 23:13:18 +04:00
Andrei Kortunov
70ed8fd1a9 Use constants instead of widely used magic numbers (task #4645) 2018-09-17 19:22:50 +04:00
Andrei Kortunov
c7a5548475 Use new logging system for editor 2018-08-14 20:01:09 +04:00
Andrei Kortunov
6ddf6eb885 Use editor markers for lights and creatures levelled lists 2018-07-15 17:25:18 +04:00
Andrei Kortunov
27a5da59ba Fix MSVC warnings C4456 2018-07-10 11:29:39 +04:00
Andrei Kortunov
f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) 2018-07-02 12:20:34 +04:00
Nelsson Huotari
825c331764 Remove texture filtering, better ltex importing, reindexing duplicates 2018-05-22 14:55:09 +03:00
Nelsson Huotari
8ae46519cf Fix missed worldspacehits, add linebreak to tooltip 2018-05-20 21:58:40 +03:00
Nelsson Huotari
21e8d08e69 Handle invalid texture id's 2018-05-20 21:20:40 +03:00
Nelsson Huotari
17e01ca336 Setting "Scene Drops" rename "3D Scene Editing" 2018-05-16 11:41:37 +03:00
Nelsson Huotari
758ccac75a Show texture id + filename 2018-05-16 11:34:58 +03:00
Nelsson Huotari
1c79d5311c Brush history menu 2018-05-10 21:58:36 +03:00
Nelsson Huotari
62066f01bd clean-up 2018-05-10 11:18:54 +03:00
Nelsson Huotari
d33c98c68d Revert unintended changes 2018-05-10 11:18:54 +03:00
Nelsson Huotari
5656745445 Select dragged texture-assets, add brush settings widget-type, fixes. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
baa707b5e3 User setting for selective cell editing or new land creation 2018-05-10 11:18:54 +03:00
Nelsson Huotari
24977fcc0f improve hit calculation accuracy for texture editing 2018-05-10 11:18:54 +03:00
Nelsson Huotari
e8a9bff85c Drop textures to landtextures from assets (try-method) 2018-05-10 11:18:54 +03:00
Nelsson Huotari
7139889566 Brush button window opens at modebutton, slider 1-50, doxygen comments 2018-05-10 11:18:54 +03:00
Nelsson Huotari
20d1d8ac89 Fixed brush calculations, implement undostack macro when clicked. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
5f3c8b2b99 c_str -> fromStdString, remove TextureBrushButton class 2018-05-10 11:18:54 +03:00
Nelsson Huotari
cf7a0f715e Command macro for complete drag-editing operations. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
9f742d5b1f Brush affects adjancent cells 2018-05-10 11:18:54 +03:00
Nelsson Huotari
1ca2710a2a Formatting, fixes 2018-05-10 11:18:54 +03:00
Nelsson Huotari
1c113eca9c 15 to landTextureSize-1 2018-05-10 11:18:54 +03:00
Nelsson Huotari
3327d6f7c4 Drag terrain painting, code cleanup 2018-05-10 11:18:54 +03:00
Nelsson Huotari
a54a1b9940 Command system and undo 2018-05-10 11:18:54 +03:00
Nelsson Huotari
cc415526b0 fix texture index +1, better icons 2018-05-10 11:18:54 +03:00
Nelsson Huotari
316d05bdc4 {} to () 2018-05-10 11:18:54 +03:00
Nelsson Huotari
4649d1258c Direct data terrain editing 2018-05-10 11:18:54 +03:00
Nelsson Huotari
4ae75d1d20 Terrain texture brush frame 2018-05-10 11:18:54 +03:00
Nelsson Huotari
69aacdff17 Lamoot's new icon set 2018-04-15 12:35:45 +03:00
Miloslav Číž
1f5feeddb9 CS: Change camera parameter types to int 2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242 CS: Mover object-marker-alpha under Rendering 2017-12-15 14:36:12 +01:00
Miloslav Číž
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