elsid
208a50340d
Specialize DetourNavigator::ObjectId ctor for pointers
...
To fix msvc error:
components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
with
[
T=unsigned long
]
2020-04-13 20:48:34 +02:00
Capostrophic
36d82abafd
Make book layer have lower priority than the layer for other GUI windows
2020-04-13 21:09:06 +03:00
Capostrophic
5dc8da5f67
Only disarm traps with keys when the door is locked (bug #5370 )
2020-04-13 20:26:51 +03:00
Capostrophic
4e22f03ece
Revise esmtool cell reference output
2020-04-13 20:17:16 +03:00
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
2020-04-13 19:53:42 +03:00
Andrei Kortunov
94c1672e73
Merge pull request #2770 from Capostrophic/autocalc
...
Handle enchantment autocalc flag as a flag (bug #5363 )
2020-04-13 13:53:36 +04:00
Andrei Kortunov
8d4dde7b56
Merge branch 'master' into autocalc
2020-04-13 13:53:29 +04:00
Andrei Kortunov
5df6646b06
Merge pull request #2773 from Capostrophic/dialogue
...
Only clear dialogue history if the dialogue window is closed (bug #5358 )
2020-04-13 13:51:00 +04:00
Andrei Kortunov
0bc40e1002
Merge branch 'master' into dialogue
2020-04-13 13:50:52 +04:00
Andrei Kortunov
f75417e627
Merge pull request #2772 from Capostrophic/startscript
...
Make adding non-existent global script more forgiving (bug #5364 )
2020-04-13 13:49:33 +04:00
Andrei Kortunov
844b6011bc
Merge branch 'master' into startscript
2020-04-13 13:49:25 +04:00
Andrei Kortunov
a76927023d
Merge pull request #2771 from Capostrophic/soul
...
Show the soulgem soul in count dialog (feature #5362 )
2020-04-13 13:47:25 +04:00
Andrei Kortunov
cb6707624d
Merge branch 'master' into soul
2020-04-13 13:47:13 +04:00
Andrei Kortunov
7d6962b6be
Merge pull request #2769 from Capostrophic/quickkeys
...
Don't play equip sound for reactivated quick key items (bug #5367 )
2020-04-13 13:41:41 +04:00
Andrei Kortunov
31cc1e0f66
Merge branch 'master' into quickkeys
2020-04-13 13:41:26 +04:00
Andrei Kortunov
4c8cc0e54f
Merge pull request #2774 from Capostrophic/levelledscale
...
Properly utilize creature levelled list's scale (bug #5369 )
2020-04-13 13:37:00 +04:00
Andrei Kortunov
4892172a7d
Merge pull request #2767 from Capostrophic/unlock
...
Make sure it's a crime to unlock owned doors
2020-04-13 07:46:54 +04:00
Cody
a34fe1d9b2
proper game mode detection
2020-04-12 10:18:07 -07:00
Capostrophic
07779d7fcf
Properly utilize creature levelled list's scale (bug #5369 )
2020-04-12 13:21:13 +03:00
Capostrophic
9dbdbbaea7
Only clear dialogue history if the dialogue window is closed (bug #5358 )
2020-04-12 11:59:58 +03:00
Capostrophic
96a447ee3a
Show the soulgem soul in count dialog (feature #5362 )
2020-04-12 11:55:00 +03:00
Cody
8e741a0d0b
fixed tab focus for pinned windows
2020-04-11 23:01:16 -07:00
Andrei Kortunov
b42d097739
Merge branch 'doc_copyright' into 'master'
...
Update copyright year in the doc
See merge request OpenMW/openmw!172
2020-04-12 03:29:16 +00:00
Andrei Kortunov
3f61022f80
Merge branch 'unused_var' into 'master'
...
Remove unused field from QuadTreeBuilder
See merge request OpenMW/openmw!173
2020-04-12 03:29:09 +00:00
fredzio
6d0022096d
Bump copyright year in documentation
2020-04-12 01:14:07 +02:00
Capostrophic
f79e20379b
Make sure it's a crime to unlock owned doors
2020-04-12 01:56:03 +03:00
Capostrophic
de7ecddbb8
Don't play equip sound for reactivated quick key items (bug #5367 )
2020-04-11 23:29:36 +03:00
Andrei Kortunov
74c121a69d
Merge pull request #2766 from Capostrophic/collisionswitch
...
Make extra sure groups with special behavior aren't optimized out
2020-04-11 08:48:59 +04:00
Capostrophic
ad333e88fe
Handle enchantment autocalc flag as a flag (bug #5363 )
2020-04-11 00:03:14 +03:00
fredzio
39a55318b0
Remove unused variable
2020-04-10 22:50:28 +02:00
Capostrophic
feeab8a335
Make adding non-existent global script more forgiving (bug #5364 )
2020-04-10 22:20:05 +03:00
Andrei Kortunov
7ee935db47
Merge branch 'yet-more-gitignore' into 'master'
...
Add .vs to gitignore
See merge request OpenMW/openmw!169
2020-04-10 16:04:59 +00:00
Capostrophic
e1d635cd71
Make extra sure groups with special behavior aren't optimized out
2020-04-10 18:11:21 +03:00
AnyOldName3
f1b2ab9d67
Add .vs to gitignore
...
Apparently Visual Studio puts stuff in a .vs directory now.
2020-04-10 15:47:33 +01:00
AnyOldName3
12044a607b
Only alpha-test shadows when necessary
...
Previously we always discarded shadow map fragments if the alpha channel of the output would have been low, but there were some (modded) assets that have non-one alpha but have testing or blending disabled so end up opaque anyway. This lets the shadows of those objects match.
2020-04-10 15:45:37 +01:00
Alexei Dobrohotov
f27e299025
Merge pull request #2764 from unelsson/fixtolandsize
...
Minor fix to OpenMW-CS tool outline
2020-04-07 17:30:27 +03:00
Nelsson Huotari
42c7ec8f1c
Minor fix to calculation of mLandSizeFactor (-1)
2020-04-07 16:56:47 +03:00
Bret Curtis
613189d7d9
bump to 0.47 for new dev cycle
2020-04-07 12:55:17 +02:00
Andrei Kortunov
d92af43696
Merge pull request #2763 from akortunov/warnfix
...
Fix int/float conversions in the CSVRender::BrushDraw
2020-04-07 13:57:43 +04:00
Andrei Kortunov
023c51ad0e
Fix int/float conversions in the CSVRender::BrushDraw
2020-04-07 13:56:03 +04:00
Andrei Kortunov
9712925ba3
Merge pull request #2762 from akortunov/warnfix
...
Avoid a hack to initialize mIndex in the editor
2020-04-06 12:32:33 +04:00
Andrei Kortunov
c7cedc4e5a
Avoid a hack to initialize mIndex
2020-04-06 09:43:05 +04:00
Bret Curtis
d3b898de88
Merge pull request #2749 from akortunov/sound_pause
...
Pause audio and video when the game is minimized
2020-04-05 21:04:51 +02:00
Bret Curtis
7fda65e7bb
Merge pull request #2692 from unelsson/opencsbrushdraw
...
Editor: Implement brush outlines
2020-04-05 20:52:45 +02:00
Andrei Kortunov
e444766901
Use enums for blockers IDs instead of strings
2020-04-05 19:14:23 +04:00
Bret Curtis
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream
...
add launchable type
2020-04-05 10:05:20 +02:00
Bret Curtis
328c3617b7
Merge pull request #2752 from Assumeru/parsing-errors
...
Reset errorhandler context
2020-04-05 10:03:34 +02:00
Bret Curtis
03da834bb2
Merge pull request #2760 from akortunov/explode
...
Do not try to launch magic bolt when direction to target is empty
2020-04-05 01:17:47 +02:00
Andrei Kortunov
2254256db9
Pause both audio and video playback when the game is minimized (feature #4944 )
2020-04-04 22:54:51 +04:00
Andrei Kortunov
3d6fd2818f
Support for per-type sound blockers
2020-04-04 22:54:51 +04:00
