Commit Graph

3393 Commits (master)

Author SHA1 Message Date
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
David Cernat 68837aaf4a Add OpenMW commits up to 15 Oct 2020
# Conflicts:
#   .travis.yml
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/mwgui/containeritemmodel.cpp
#   apps/openmw/mwgui/tradewindow.cpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwworld/actionteleport.cpp
#   apps/openmw/mwworld/containerstore.cpp
4 years ago
AnyOldName3 73708a6f2a Install openmw-cs.cfg on single-config generators and from the right directory on multi-config 4 years ago
David Cernat 39e429c9eb Add OpenMW commits up to 11 Jul 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
5 years ago
psi29a 8f86617262 Merge branch 'master' into 'master'
Fixed passed indexes for object deletion #5384

See merge request OpenMW/openmw!196
5 years ago
David Cernat 5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
5 years ago
Bret Curtis 0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
Replace OpenThreads by std types
5 years ago
Andrei Kortunov d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 5 years ago
elsid 40ad87bc4d
Replace OpenThreads by std types 5 years ago
Andrei Kortunov 0bb9322a69 Use default constructor for ItemFlags 5 years ago
David Cernat 3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
5 years ago
Andrei Kortunov c8d5d421d9 Do not use deprecated mouse wheel movement angle 5 years ago
Andrei Kortunov 2b4274bca8 Use modern Qt flag declarations 5 years ago
Bret Curtis 8f9c3e28d9 Handle typo 5 years ago
Bret Curtis 61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 5 years ago
David Cernat 053a5a6258 Add OpenMW commits up to 9 May 2020
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/aiextensions.cpp
5 years ago
Capostrophic 039c9a37eb Verifier: Don't check race of non-skin body parts (bug #5400)
Remove unnecessary flag field check
Remove magic numbers
5 years ago
Giovanni Bodega 8a8b4986da Fixed passed indexes for object deletion #5384 5 years ago
David Cernat a20f8e77dc Add OpenMW commits up to 25 Apr 2020
# Conflicts:
#	.travis.yml
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
5 years ago
Bret Curtis 68549828b4 create static functions to set/get hidden node mask; compromise on magic numbers to make things easier to understand 5 years ago
Bret Curtis 8a8107e837 as it says; revert vismask and uncomplicate openmw 5 years ago
Bret Curtis 4ae0bd1fae Merge branch 'helplink' into 'master'
Link to readthedocs documentation from OpenCS

See merge request OpenMW/openmw!171
5 years ago
Frederic Chardon 513ac8986d Add link to opencs documentation on readthedocs, available through
context menu.
The documentation opens in default browser.

There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page

There is also a link to the OpenCS tutorial in the help menu.
5 years ago
David Cernat 25a632c650 Add OpenMW commits up to 13 Apr 2020
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
Capostrophic ad333e88fe Handle enchantment autocalc flag as a flag (bug #5363) 5 years ago
Nelsson Huotari 42c7ec8f1c Minor fix to calculation of mLandSizeFactor (-1) 5 years ago
Andrei Kortunov 023c51ad0e Fix int/float conversions in the CSVRender::BrushDraw 5 years ago
Andrei Kortunov 9712925ba3
Merge pull request #2762 from akortunov/warnfix
Avoid a hack to initialize mIndex in the editor
5 years ago
Andrei Kortunov c7cedc4e5a Avoid a hack to initialize mIndex 5 years ago
Bret Curtis 7fda65e7bb
Merge pull request #2692 from unelsson/opencsbrushdraw
Editor: Implement brush outlines
5 years ago
Andrei Kortunov a68d9aed4c Fix issues, found by CoverityScan 5 years ago
elsid ef4a7089e4
Use template specialization for writeHNT to write raw arrays
To avoid passing explicit size argument where it's possible.
5 years ago
David Cernat 7bc3298ed4 Add OpenMW commits up to 1 Apr 2020
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
5 years ago
Nelsson Huotari 66fba7cc51 Remove unneeded constructors, only initialize in cpp, minor fixes 5 years ago
Nelsson Huotari ec2ff2a9b0 Fix if oneliners 5 years ago
Nelsson Huotari 18cdd3bd7c rebase-related fixes 5 years ago
Nelsson Huotari da0add904b Fix and simplify brush outlines and coordinate calculations 5 years ago
Nelsson Huotari 8f625474fd Hotfix terraintexturemode circle brush radius calculations 5 years ago
Nelsson Huotari e14c390a9b Fix crash 5 years ago
Nelsson Huotari 731e5b57f5 Tool outline for terraintexturemode and square shape. Various fixes. 5 years ago
Nelsson Huotari 24c8b32d4c Implement brush outline for terrainshapemode 5 years ago
Alexei Dobrohotov baff15362a
Merge pull request #2713 from unelsson/opencsdropobjects
Editor: Implement dropping objects with keypress in instancemode
5 years ago
Capostrophic 18bfc6f2c5 Fix Gender column filtering (bug #4601) and correct filter descs 5 years ago
Nelsson Huotari 793ea8566f Fix typo 5 years ago
Nelsson Huotari 17cb3414d8 clean-up, improve formatting 5 years ago
Nelsson Huotari 75f6577f61 Remove unneeded include 5 years ago
Nelsson Huotari 41aa90bfa7 Add helper class for safer mask handling 5 years ago
Nelsson Huotari af434cffba fix numeric limits min() to lowest(), fix correct drop height 5 years ago
Nelsson Huotari 035d5205d9 Use collision boxes to calculate dropping height, variable naming 5 years ago
Nelsson Huotari 54738e1e32 Handle mask disabling better 5 years ago
Nelsson Huotari 711dc59f09 Implement four different functions for dropping 5 years ago
Nelsson Huotari f063eeb36e Drop objects with a keyboard shortcut 5 years ago
Andrei Kortunov 02444add2a Support for radial fog (feature #4708) 5 years ago
David Cernat 43e7df6df8 Add OpenMW commits up to 11 Mar 2020 5 years ago
Capostrophic 4455c978df Explain the global shader define default values in editor 5 years ago
Capostrophic 6999f1fd28 Add an option to apply lighting to environment maps 5 years ago
David Cernat 85fb1d1a0b Add OpenMW commits up to 19 Feb 2020
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
5 years ago
Nelsson Huotari 198a75b8e6 Delete selected instances with a hotkey 5 years ago
Andrei Kortunov 84979fa8b7 Move VisMask to components 5 years ago
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
5 years ago
David Cernat f0f76516d8 Add OpenMW commits up to 4 Feb 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
5 years ago
Capostrophic 216a5d27c6 Avoid working with AMBI subrecord in tools unnecessarily (bug #5269) 5 years ago
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.
5 years ago
Bret Curtis 7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation
Editor: Convert radians to degrees when rotating objects
5 years ago
Bret Curtis 44a85795cf
Merge pull request #2669 from Capostrophic/wnam
Generate WNAM subrecord upon saving terrain instead of upon editing it
5 years ago
Nelsson Huotari 032513ae18 Convert radians to degrees 5 years ago
David Cernat 60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
5 years ago
Capostrophic 7659370992 Editor: Add a reset to defaults button to keybindings (feature #4068) 5 years ago
capostrophic 89055f1c6c Generate WNAM upon saving terrain 5 years ago
Andrei Kortunov 3704acf857 Unify streams usage to support non-ASCII paths (bug #5239) 5 years ago
David Cernat a58f09fd6c Add OpenMW commits up to 2 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
5 years ago
Andrei Kortunov 089548cdc4 Fix build on Qt4 5 years ago
David Cernat ca9cd90a4d Add OpenMW commits up to 20 Dec 2019
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
5 years ago
Andrei Kortunov 78450312bf Fix the last warning about deprecated Qt functions 5 years ago
Andrei Kortunov e44021b369 Fix most of deprecated API usage in the editor 5 years ago
Assumeru 737aa1e4e8 Remove FactionID editing from OpenCS (#2636)
* Remove FactionID editing

* remove useless comments

* rename FactionID to Unknown
5 years ago
Andrei Kortunov ab4b3677e3 Merge branch '16' into 'master'
perf regression fix

See merge request OpenMW/openmw!157
5 years ago
David Cernat 9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
Nikolay Kasyanov 6ef94c20b3 Fix macOS packaging on CMake 3.15
It looks like component names have become case sensitive.
5 years ago
bzzt f09125fc93 perf regression fix 5 years ago
David Cernat 0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
5 years ago
Bret Curtis 454b9f1964
Merge pull request #2597 from akortunov/coverity
CoverityScan fixes, part 2
5 years ago
Alexei Dobrohotov b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges
Allow selecting cell edges everywhere
5 years ago
Andrei Kortunov b210e99abc Avoid divizion by zero 5 years ago
Nelsson Huotari 120583f443 optimize isInCellSelection calls 5 years ago
Andrei Kortunov 238dcdbbd4 Fix copy-paste error 5 years ago
Andrei Kortunov 079c77ff22 Avoid zero division 5 years ago
David Cernat 5762a36fc2 Add OpenMW commits up to 7 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
5 years ago
Nelsson Huotari 45d43045eb Remove unused std::string 5 years ago
Nelsson Huotari aeb0ccff90 Allow selecting cell edges everywhere 5 years ago
Nelsson Huotari 8f6dc78217 Get vertex height from data, if not available in visible cells. 5 years ago
Nelsson Huotari 9677203215 Don't allow vertex selection outside visible cells 5 years ago
Nelsson Huotari d186bcb46f Update selection during transient edit, clear to a single function. 5 years ago
Alexei Dobrohotov 7328db4d6b
Fix small typo in body part record verifier 5 years ago
Andrei Kortunov 45ab6e1430 Implement UTF-8 support for script parser (bug #4598) 5 years ago
David Cernat 54301f5f89 Add OpenMW commits up to 29 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat bde9f7b817 Add OpenMW commits up to 20 Oct 2019
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
Andrei Kortunov d278e5d4af Fix warnings about variable re-declaration 5 years ago
Bret Curtis 9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit
[Review phase] Editor: Transient land shape editing
5 years ago
Bret Curtis 2040ca5637
Merge pull request #2555 from akortunov/encoding
Encode ID's in all places to UTF-8
5 years ago
Nelsson Huotari c957f0544c Remove unneeded brackets 5 years ago
Nelsson Huotari fdc73b87ba Remove includes that aren't needed any more 5 years ago
Nelsson Huotari 9e5db10288 const ref float -> float 5 years ago
Nelsson Huotari ac5b356e8d Always initialize landShapeNew 5 years ago
Nelsson Huotari 6f9f59dd58 declare cellId and cellCoords in smallest possible scope 5 years ago
Nelsson Huotari fdcc7fa1d7 0 to nullptr 5 years ago
Nelsson Huotari a13edbdb42 Bump shape calculation to function 5 years ago
Nelsson Huotari 8d3e7f2815 fix normals at cell edges, better coding standards 5 years ago
Nelsson Huotari 0f6ddfe8e6 change include, cleanup 5 years ago
Nelsson Huotari 12349f4e48 cleanup 5 years ago
Nelsson Huotari c556885d71 remove unused Qt signal 5 years ago
Nelsson Huotari deb122ffdb Add optional post-processing (smooth/rough), add/fix tooltips. 5 years ago
Nelsson Huotari 2d34b63b0b Fix logic of land loading when no cell, land or landdata. Fix also draw. 5 years ago
Nelsson Huotari 71eff60d22 Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize 5 years ago
Nelsson Huotari a1348d94f9 add missing final specifiers 5 years ago
Nelsson Huotari 16ba32ffd5 assignments to member initialization list 5 years ago
Nelsson Huotari c2de645c8c override, virtual -> final, remove unused variables, public to private. 5 years ago
Nelsson Huotari 6a3070e680 Fix shape brush setting description 5 years ago
Nelsson Huotari 8a9ca0b3ec Generate new WNAM record based on new land heights, add comments 5 years ago
Nelsson Huotari 96be82a047 Remove terrain vertex selection and brush button when exiting editMode 5 years ago
Nelsson Huotari 8acfa2600f Terrain shape editing related fixes 5 years ago
Nelsson Huotari 5b9debc554 use enum for mbrushshape initialization 5 years ago
Nelsson Huotari 4f9ec24e41 use enum for brushshape at scenetoolshapebrush 5 years ago
Nelsson Huotari bae8636ec0 Fix brusshape enum values 5 years ago
Nelsson Huotari c031543420 use enum for brush shapes 5 years ago
Nelsson Huotari 388edfd8cc change manual memory management to std::unique_ptr 5 years ago
Nelsson Huotari da4abcd7c1 std::set to std::unique and erase. 5 years ago
Nelsson Huotari 6a44cae572 white iterator loop to C++11 range-based for loop. 5 years ago
Nelsson Huotari bccf36fdbc Convert normals calculations mostly to osg::Vec3f 5 years ago
Nelsson Huotari 45b0f034c3 Split complex if-logic into multiple reasonably named functions 5 years ago
Nelsson Huotari 0ce971c1bb Revert back to less aggressive component-level changes. 5 years ago
Nelsson Huotari 69083369f8 use std::fill instead of for 5 years ago
Nelsson Huotari 3599e804e1 Fix the default value of mBrushSize 5 years ago
Nelsson Huotari dc7dc93320 Remove unused functions, improve formatting, handle terrain edit click 5 years ago
Nelsson Huotari 1046d57190 Remove unneeded forward declarations. 5 years ago
Nelsson Huotari 55b3fd4418 Use float calculations for circle brush, keep tool options in memory. 5 years ago
Nelsson Huotari 23e7c71a5a Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE. 5 years ago
Nelsson Huotari 8f3c22ccc3 Remove TerrainShapeMode::fixEdges 5 years ago
Nelsson Huotari 1a3fc435b9 Fix alterHeight bugs, don't let broken land edit pass. 5 years ago
Nelsson Huotari ff18595a86 Reduce code duplification, add bool value to limiting 5 years ago
Nelsson Huotari 60c0a25004 Fix smooth tool and flatten tool. Default tool strength to 8. 5 years ago
Nelsson Huotari 54e13954e8 Improve land steepness limiting code 5 years ago
Nelsson Huotari 4a2d8aaf97 Handle mBrushSize 1. 5 years ago
Nelsson Huotari 16138fc896 Transient land shape editing 5 years ago
elsid 045ceeac11
Replace foreach macro by for-loop 5 years ago
Andrei Kortunov 2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 5 years ago
Nelsson Huotari 78f2a5181d Default brush size to 1 5 years ago
Nelsson Huotari fbb9800e89 Better terrain texture ID handling 5 years ago
Nelsson Huotari 301c05662b assignment to memb. init. list, publics to private, virtual -> final 5 years ago
David Cernat cc25612b8d Add OpenMW commits up to 18 Sep 2019
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
5 years ago