Mads Buvik Sandvei
3e82cae500
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr_geometryshader_feature_branch
2020-12-18 20:50:58 +01:00
psi29a
11eff02a1d
Merge branch 'Show-more-information-about-level-on-menu' into 'master'
...
Show more information about level on menu
See merge request OpenMW/openmw!437
2020-12-11 12:04:15 +00:00
Mads Buvik Sandvei
b98b4db4c1
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-09 21:11:53 +01:00
CedricMocquillon
6bfdf0e57f
Add more information on mouse over level
2020-12-07 14:57:25 +01:00
Mads Buvik Sandvei
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-12-06 15:14:53 +01:00
Alexei Dobrohotov
84e1a29700
Make AI cast self-targeted spells at the ground (bug #5695 )
2020-12-04 00:41:21 +03:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04:00
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Nelsson Huotari
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
2020-11-18 22:48:47 +02:00
Alexei Dobrohotov
8a6d3d1b4f
Minor fixes
...
Fix extra semicolon
Disable collision avoidance if AI is disabled
2020-11-13 22:53:12 +03:00
Andrei Kortunov
0e971dccf0
Rework cure effects
2020-11-04 13:51:10 +04:00
Andrei Kortunov
c1d56d94c4
Do not remove active effects in loop (bug #3789 )
2020-11-02 17:51:36 +04:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
Andrei Kortunov
64ba81ecf2
Fix some issues, found by CoverityScan
2020-10-28 18:02:31 +04:00
Bret Curtis
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
2020-10-22 23:57:53 +02:00
Mads Buvik Sandvei
4f8f0cc8ac
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
2020-10-22 20:39:53 +02:00
Alexei Dobrohotov
7da8479d25
Fix lower body blocking animation priority (bug #5656 )
2020-10-21 19:35:01 +03:00
psi29a
09373a757d
Merge branch 'radioactive' into 'master'
...
Container base record mutations
See merge request OpenMW/openmw!353
(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)
275908a0 mutate container base records
16fca11d add changelog entry
2020-10-20 16:56:22 +00:00
Andrei Kortunov
065ed5138e
Use emplace_back instead of push_back
2020-10-18 10:27:35 +04:00
psi29a
4adc689c7a
Merge branch 'summoncrash' into 'master'
...
Avoid summon spawn if actor isn't in a cell (bug #5644 )
See merge request OpenMW/openmw!351
2020-10-18 00:35:35 +00:00
Alexei Dobrohotov
f90e403bc1
Avoid summon spawn if actor isn't in a cell (bug #5644 )
2020-10-18 01:42:32 +03:00
psi29a
f513ee1f1d
Merge branch 'configurable_turning_delay' into 'master'
...
Makes the delay of turning while run configurable (part of "smooth movement")
See merge request OpenMW/openmw!349
2020-10-17 20:21:02 +00:00
Petr Mikheev
9ec6fce446
Makes the delay of turning while run configurable (part of "smooth movement").
2020-10-17 16:11:22 +02:00
Petr Mikheev
c72199155c
Use full speed in the "NPCs give way" maneuver.
2020-10-17 15:33:23 +02:00
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
Andrei Kortunov
c3d84b2c7c
Ability to attach arrows to shooter's hands (feature #5642 )
2020-10-14 10:07:42 +04:00
Assumeru
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
2020-10-13 17:46:32 +02:00
Petr Mikheev
15078f5b3c
Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat"
2020-10-10 23:06:43 +02:00
Alexei Dobrohotov
1842f546c3
Restore empty target check in spell absorption
2020-10-10 14:27:52 +03:00
Alexei Dobrohotov
e930251d92
Merge branch 'godmode' into 'master'
...
Add many more godmode checks to harmful magic (bug #5633 )
Closes #4264
See merge request OpenMW/openmw!336
2020-10-09 22:09:46 +00:00
Alexei Dobrohotov
0e8c5c5034
Merge branch 'avoid_collision_update' into 'master'
...
Update logic of "NPCs avoid collisions"
See merge request OpenMW/openmw!318
2020-10-09 18:43:43 +00:00
Alexei Dobrohotov
39678c74bf
Add many more godmode checks to harmful magic (bug #5633 )
2020-10-09 20:36:51 +03:00
Alexei Dobrohotov
0dcb8c6b69
Fix pick/probe uses decrement
2020-10-09 19:20:50 +03:00
Petr Mikheev
2835ea1e21
Update logic of "NPCs avoid collisions"
2020-10-03 22:58:00 +02:00
psi29a
aa4e6c448b
Merge branch 'spellabsorption' into 'master'
...
Support enchantment absorption
See merge request OpenMW/openmw!307
2020-09-29 15:27:52 +00:00
psi29a
d9dafbe45b
Merge branch 'master' into 'uses'
...
# Conflicts:
# CHANGELOG.md
2020-09-29 08:20:50 +00:00
Alexei Dobrohotov
e0a5c24afe
Handle 0-use items like vanilla (bug #5611 )
2020-09-25 00:20:25 +03:00
Petr Mikheev
ad51a4be2e
Changes in head tracking and greetings for "smooth movement".
2020-09-22 22:50:44 +02:00
Petr Mikheev
b838782557
Avoid collisions between actors.
2020-09-22 22:50:44 +02:00
Petr Mikheev
79a72e4b44
Slightly modify aicombat to make it more difficult to get around an enemy. The difference is visible only if turning is slow (i.e. if smooth movement enabled).
2020-09-22 22:50:44 +02:00
Petr Mikheev
6a75942907
Fix CharacterController::setAttackTypeBasedOnMovement
2020-09-22 22:50:44 +02:00
Petr Mikheev
bd6b984022
Smoothing speed in CharacterController
2020-09-22 22:50:44 +02:00
Petr Mikheev
71ba94a89a
Smooth turning; smooth stopping; combat headtracking
2020-09-22 22:50:44 +02:00
Alexei Dobrohotov
f8389c6c37
Support enchantment absorption
2020-09-22 00:33:27 +03:00
Bret Curtis
dd7e964baf
Merge pull request #2999 from akortunov/spellfix
...
Apply effects during rest before fast-forwarding spells state
2020-09-20 14:47:37 +02:00
Petr Mikheev
874c754b68
Fix #5557
2020-09-15 20:24:16 +02:00
Andrei Kortunov
753ca91556
Set a minimum 1gp cost for services (regression #5600 )
2020-09-08 17:04:31 +04:00
Alexei Dobrohotov
99ab629a03
Merge pull request #2995 from akortunov/arrows
...
Improve ammo resetting
2020-09-06 13:30:55 +03:00
Andrei Kortunov
f9ca08a984
Do not use swish sound for ranged weapons
2020-09-03 09:48:12 +04:00
Andrei Kortunov
787ca06d55
Apply effects during rest before fast-forwarding spells state
2020-09-01 19:36:59 +04:00
