1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 17:39:40 +00:00
Commit graph

3253 commits

Author SHA1 Message Date
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
2020-04-01 19:24:11 +03: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
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02: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
David Cernat
85fb1d1a0b Add OpenMW commits up to 19 Feb 2020
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
2020-02-20 01:51:47 +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
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
David Cernat
f0f76516d8 Add OpenMW commits up to 4 Feb 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
2020-02-05 02:03:31 +02: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
David Cernat
60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +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
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
2020-01-02 22:09:54 +02:00
Andrei Kortunov
089548cdc4 Fix build on Qt4 2019-12-22 10:31:32 +04:00
David Cernat
ca9cd90a4d Add OpenMW commits up to 20 Dec 2019
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
2019-12-20 15:43:50 +02: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
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
2019-12-01 23:52:42 +02: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
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
2019-11-19 17:16:48 +02: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
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
2019-11-08 06:20:41 +02: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