Commit Graph

3344 Commits (59cb31e0a788c8a9b7071a63d321da29fbb72ffd)

Author SHA1 Message Date
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
Nelsson Huotari 4ccb951126 move check to outermost scope 5 years ago
Nelsson Huotari 0880923189 Consistency for variable and header argument names. 5 years ago
Nelsson Huotari 6dc3d8b44b More readable code 5 years ago
Nelsson Huotari 780055899d Don't add empty primitive sets to geometry. 5 years ago
Nelsson Huotari 3becacf6d1 Remove globals, const int& -> int, values to const ref. 5 years ago
Nelsson Huotari 1dcee833a1 Less verbose syntax 5 years ago
Nelsson Huotari 5a143fe99d Remove extra include 5 years ago
Nelsson Huotari 39ab449431 Only allow selection of cells in view 5 years ago
Nelsson Huotari dc8de6c6e6 Make less copies 5 years ago
Nelsson Huotari 001ca68cc7 Remove empty lines 5 years ago
Nelsson Huotari 46ee639892 pass by const ref and other fixes 5 years ago
Nelsson Huotari 20ab7df19f Fixes, cleanup. 5 years ago
Nelsson Huotari 1a08944a8b Remove unused code, clarifications, optimizations 5 years ago
Nelsson Huotari d6722c7492 Terrain texture selection, support for vertex selection 5 years ago
David Cernat ed05125f6a Add OpenMW commits up to 2 Aug 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
5 years ago
David Cernat b57c0bcafe Add OpenMW commits up to 6 June 2019
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat f671c0bddc Add OpenMW commits up to 1 Apr 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat 8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat 95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat 6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat 6fdef4fd0a Add OpenMW commits up to 1 Jan 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
5 years ago
David Cernat cbba81df03 Add OpenMW commits up to 14 Nov 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 056591b957 Add OpenMW commits up to 14 Sep 2018
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 889bcec7f8 Add OpenMW commits up to 1 Sep 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/difficultyscaling.cpp
#	apps/openmw/mwscript/transformationextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 84cab59057 Add OpenMW commits up to 19 Aug 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
5 years ago
capostrophic 5341ca4e22 [Regression] Avoid locale-related conversion issues in editor 6 years ago
Axel Vestin c0f66ac70c Fixes Albemic typo in OpenMW-CS 6 years ago
Nat Meo bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 6 years ago
Nat Meo af1e5e01b4 Issue #5005: Instance window via Scene window 6 years ago
Capostrophic 5cd781b3eb Experimental folder handling rewrite 6 years ago
Alexei Dobrohotov 44a07efc27
Fix trapped soul object verifier warning 6 years ago
Capostrophic 548d336933 Editor: Don't accept overflowing input in NPC fields 6 years ago
Capostrophic 05d94d35f9 Make disabled shadow defines map static 6 years ago
Capostrophic 9f9b7cb0ae Init shadow defines in the editor too for a good measure 6 years ago
Capostrophic 158f4e23cb Make sure forcePPL and clamp are defined in the editor 6 years ago
Nat Meo a3b7a12fe7 Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians 6 years ago
Capostrophic 7814bd1b76 Support eight possible blood types (feature #4958) 6 years ago
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
6 years ago
Bret Curtis 7808cbbfe8
Merge pull request #2292 from akortunov/fallback
Make fallback map static to simplify constructors
6 years ago
Nelsson Huotari 4c4fb0d955 Add include 6 years ago
Nelsson Huotari 69f900349c Remove unnecessary include 6 years ago
Nelsson Huotari ee4a8d2166 Add various coordinate conversion functions 6 years ago
Andrei Kortunov a302ec9c65 Make fallback map static to simplify constructors 6 years ago
elsid fa7b304e78
Use auto for map value_type in range-based for loops
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
6 years ago
Chris Djali e14682e353
Merge pull request #2273 from AnyOldName3/conformant-comparator
Use irreflexive, asymmetric comparator as required by the spec.
6 years ago
AnyOldName3 32da9a8ab1 Use irreflexive, asymmetric comparator as required by the spec. 6 years ago