Mads Buvik Sandvei
14bb0f0208
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2020-03-30 01:37:29 +02:00
Mads Buvik Sandvei
6296f9f124
change gui render order based on vr vs non-vr
2020-03-30 01:25:23 +02:00
Capostrophic
99e89f23a6
Fix calculateNpcStatModifiers call for non-NPCs
2020-03-28 19:15:13 +03:00
Mads Buvik Sandvei
47ce69899d
Fixed slash vs. chop
2020-03-28 16:35:49 +01:00
Mads Buvik Sandvei
d658065fe7
Show full player body when knocked out or dead
2020-03-28 16:30:56 +01:00
Capostrophic
04ebe5c4c9
Reset skills of dead actors (bug #5328 )
2020-03-26 15:22:31 +03:00
Capostrophic
3e3f5d66b2
Don't reset dead non-werewolf vampires' vampire NPC type
2020-03-25 21:06:21 +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
Mads Buvik Sandvei
68c75f66eb
Improvements on combat
2020-03-23 23:32:47 +01:00
Alexei Dobrohotov
8d02b619fd
Merge pull request #2728 from akortunov/swimfix
...
Trace down dead persistent actors underwater
2020-03-23 21:00:42 +03:00
Andrei Kortunov
9d254aefb3
Merge pull request #2731 from Capostrophic/gender
...
Fix Gender column filtering (bug #4601 )
2020-03-23 17:27:41 +04:00
Capostrophic
18bfc6f2c5
Fix Gender column filtering (bug #4601 ) and correct filter descs
2020-03-22 22:09:38 +03:00
James Moore
a37bdfd492
Implement a refresh button on data files page
2020-03-21 19:35:20 +00:00
Andrei Kortunov
d2a2c74e08
Trace down dead persistent actors underwater (regression #5317 )
2020-03-21 10:41:35 +04:00
Andrei Kortunov
f4ace20885
Merge pull request #2726 from Assumeru/robe
...
Make robes cover the chest slot
2020-03-21 10:24:36 +04:00
Andrei Kortunov
3d20df883e
Merge pull request #2727 from akortunov/guifixes
...
Make slider control in the wait window to be a more intuitive
2020-03-21 10:11:20 +04:00
Andrei Kortunov
90508237b1
Make slider control in the wait window to be a more intuitive
2020-03-20 11:58:22 +04:00
fredzio
e1b5dd97b8
Add a filter in the alchemy window.
...
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.
The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
2020-03-20 06:35:57 +01:00
Evil Eye
4f4982545a
make robes cover the chest slot
2020-03-19 21:30:22 +01: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
Bret Curtis
79517f3f42
Merge pull request #2724 from akortunov/factions
...
Cleanup ownership for items in containers
2020-03-18 10:00:36 +01:00
Alexei Dobrohotov
e80fbf4786
Merge pull request #2721 from akortunov/radial_fog
...
Support for radial fog
2020-03-17 22:35:10 +03:00
Andrei Kortunov
02444add2a
Support for radial fog (feature #4708 )
2020-03-17 23:09:28 +04:00
Andrei Kortunov
ea30e27370
Cleanup ownership for items in containers
2020-03-17 17:22:39 +04:00
Andrei Kortunov
dea2018d9f
Do not use dynamic casts when using ObjectState
2020-03-17 15:18:40 +04:00
Mads Buvik Sandvei
893b75d767
Realistic combat, first draft
2020-03-15 15:31:38 +01:00
elsid
5168f2059f
Compare revisions by equality to support overflow
2020-03-14 09:38:24 +01:00
elsid
7ae7cb181d
Support recast mesh rendering
2020-03-14 09:38:24 +01:00
Roman Siromakha
b1ed7a433e
Merge pull request #2718 from akortunov/storage
...
Keep an AiWanderStorage when cloning an actor
2020-03-11 18:54:22 +01:00
Alexei Dobrohotov
7e6a533a29
Merge pull request #2695 from elsid/aiwander_check_destination
...
Add more destination checks for AiWander without pathgrid
2020-03-11 20:48:22 +03:00
Bret Curtis
7096ecdcf2
Merge pull request #2719 from Capostrophic/capofixes
...
Fixes of my mistakes
2020-03-11 09:05:12 +01:00
Bret Curtis
3502b28045
Merge pull request #2714 from Capostrophic/bumpmapping
...
Add bump-mapping support (feature #5304 )
2020-03-11 09:00:42 +01:00
Mads Buvik Sandvei
31f5b76394
Drop items at location
2020-03-10 22:39:11 +01:00
Capostrophic
aef6cd7006
Fix handling of empty strings in NIF string tables
2020-03-10 23:04:20 +03:00
Andrei Kortunov
9f27a0d095
Keep an AiWanderStorage when cloning an actor (bug #5267 )
2020-03-10 12:22:21 +04:00
Andrei Kortunov
8e1e4d6757
Do not copy global map texture during savegame loading (bug #5308 )
2020-03-08 22:31:38 +04:00
Mads Buvik Sandvei
08c08646cd
Fix activating objects the player is pointing at
2020-03-08 18:54:50 +01:00
Mads Buvik Sandvei
e573a260cb
Rudimentary menu interactions
2020-03-08 14:14:24 +01:00
Mads Buvik Sandvei
2ae7255fac
Pointing beam to visualize what the player is pointing at
2020-03-08 00:44:39 +01:00
Mads Buvik Sandvei
f883951629
Mipmap for GUI RTT texture
2020-03-05 20:35:53 +01:00
Mads Buvik Sandvei
5b24c5f3ce
Render menu to quad
2020-03-05 00:04:23 +01:00
Capostrophic
4455c978df
Explain the global shader define default values in editor
2020-03-04 01:00:09 +03:00
