AnyOldName3
|
52fa20fb1c
|
Merge branch 'fix-sky' into 'master'
Fix building mwrender/sky with OSG 3.6.5
See merge request OpenMW/openmw!162
|
2020-03-01 16:43:13 +00:00 |
|
Bret Curtis
|
04f2b320b9
|
Merge pull request #2673 from Capostrophic/wizard
Make Wizard less shy (bug #4493)
|
2020-02-25 21:34:49 +01:00 |
|
Capostrophic
|
4b17d5da43
|
Make search fields behave more consistently
|
2020-02-25 18:26:25 +03:00 |
|
Andrei Kortunov
|
8442446080
|
Merge pull request #2711 from Capostrophic/failsafe
Revert infinite fall failsafe addition
|
2020-02-25 19:24:19 +04:00 |
|
Capostrophic
|
d44dcc3242
|
Revert infinite fall failsafe addition
|
2020-02-25 16:46:53 +03:00 |
|
Alexei Dobrohotov
|
4928aaf3f1
|
Merge pull request #2710 from akortunov/collisionswitch
Take in account transformations of NiCollisionSwitch
|
2020-02-25 11:55:38 +03:00 |
|
Andrei Kortunov
|
8c177f0306
|
Take in account transformations of NiCollisionSwitch
|
2020-02-25 11:09:36 +04:00 |
|
Alexei Dobrohotov
|
22b4629fc6
|
Merge pull request #2678 from unelsson/deleteinstanceshotkey
Editor: Delete instances via hotkey
|
2020-02-24 22:52:16 +03:00 |
|
Capostrophic
|
21c49ca1b0
|
Make Wizard less shy (bug #4493)
|
2020-02-24 22:35:43 +03:00 |
|
Alexei Dobrohotov
|
3f64d98305
|
Merge branch 'inventorysearch' into 'master'
Item search in inventory redux
See merge request OpenMW/openmw!158
|
2020-02-24 18:14:40 +00:00 |
|
Frederic Chardon
|
78d58a344d
|
Item search in inventory (feature #4831)
|
2020-02-24 18:14:40 +00:00 |
|
Bret Curtis
|
68e734889a
|
Merge pull request #2709 from Capostrophic/torch
Switch torches to shields for hostile NPCs (bug #5300)
|
2020-02-24 17:20:23 +01:00 |
|
Capostrophic
|
1da4b31047
|
Switch torches to shields for hostile NPCs (bug #5300)
|
2020-02-24 02:20:08 +03:00 |
|
Andrei Kortunov
|
a01c44bbdd
|
Merge pull request #2707 from Capostrophic/pcskipequip
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141)
|
2020-02-23 14:08:44 +04:00 |
|
Andrei Kortunov
|
b1acb9e467
|
Merge pull request #2706 from Capostrophic/modcurrentfatigue
Make ModCurrentFatigue knock down the actor when necessary (bug #4523)
|
2020-02-22 11:17:34 +04:00 |
|
Capostrophic
|
cfa877b109
|
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141)
|
2020-02-21 21:18:54 +03:00 |
|
Alexander Olofsson
|
776c0857fa
|
Always use ref_ptr for query geometry
|
2020-02-21 07:51:50 +01:00 |
|
Capostrophic
|
f9f0299c27
|
Make ModCurrentFatigue KO the actor when necessary (bug #4523)
|
2020-02-21 00:05:13 +03:00 |
|
Bret Curtis
|
fa7af1bae8
|
Merge pull request #2705 from Capostrophic/water
Fix water ripple cleanup (bug #5246)
|
2020-02-19 22:10:39 +01:00 |
|
Capostrophic
|
3787625e61
|
Fix water ripple cleanup (bug #5246)
|
2020-02-19 23:27:45 +03:00 |
|
Bret Curtis
|
c907cd98c8
|
Merge pull request #2704 from akortunov/collisionswitch
Handle NiCollisionSwitch node
|
2020-02-19 21:24:25 +01:00 |
|
Nelsson Huotari
|
198a75b8e6
|
Delete selected instances with a hotkey
|
2020-02-19 11:44:55 +02:00 |
|
Alexei Dobrohotov
|
e1f0504557
|
Merge pull request #2703 from akortunov/masks
Fix a regression in the NiVisController
|
2020-02-19 11:50:51 +03:00 |
|
Andrei Kortunov
|
77d6fe46ca
|
Handle NiCollisionSwitch node
|
2020-02-19 12:14:21 +04:00 |
|
Andrei Kortunov
|
7b5ec76db4
|
Fix regression in the NiVisController
|
2020-02-19 11:50:59 +04:00 |
|
Alexei Dobrohotov
|
9b9769a123
|
Merge pull request #2702 from elsid/override
Add final modifier to fix warnings
|
2020-02-19 01:05:51 +03:00 |
|
elsid
|
650f429ff5
|
Add final modifier to fix warnings
|
2020-02-18 10:36:08 -08:00 |
|
Bret Curtis
|
a0902bb98e
|
Merge pull request #2700 from akortunov/masks
Move VisMask to components
|
2020-02-17 11:58:53 +01:00 |
|
Andrei Kortunov
|
84979fa8b7
|
Move VisMask to components
|
2020-02-16 16:03:35 +04:00 |
|
Alexander Olofsson
|
5de1e0fb0c
|
Use queryGeom for all query geometry accesses
|
2020-02-15 03:12:52 +01:00 |
|
Bret Curtis
|
92e6a21b53
|
Merge pull request #2701 from Capostrophic/fallthreshold
Make infinite fall failsafe logic more forgiving
|
2020-02-14 15:23:45 +01:00 |
|
Capostrophic
|
9db0bbf255
|
Make infinite failsafe logic more forgiving
|
2020-02-14 15:32:50 +03:00 |
|
Roman Siromakha
|
3ae1a208df
|
Merge pull request #2684 from Capostrophic/damagefatigue
Make uncapped Damage Fatigue optional (bug #5264)
|
2020-02-13 20:37:50 +01:00 |
|
Alexander Olofsson
|
7db58a893a
|
Ensure osg/Version is included
|
2020-02-13 19:32:17 +01:00 |
|
Alexander Olofsson
|
807f550386
|
Fix building mwrender/sky with OSG 3.6.5
OSG commit aff574b completely replaces the method of doing user-defined
query geometry, removing support for modifying the default geometry.
|
2020-02-13 19:15:33 +01:00 |
|
Bret Curtis
|
3bbd32fe98
|
Merge pull request #2667 from Capostrophic/infinitefall
Add an infinite fall failsafe (feature 1415)
|
2020-02-13 09:23:05 +01:00 |
|
Andrei Kortunov
|
7d53c6274d
|
Merge pull request #2697 from Capostrophic/shield
Don't try to attach absent (empty path) shield models to NPCs
|
2020-02-12 21:53:29 +04:00 |
|
Alexei Dobrohotov
|
36f1b632ec
|
Merge pull request #2699 from elsid/get_items_owned_by_visitor
Avoid using temporary vector to get items owned by
|
2020-02-12 11:38:56 +03:00 |
|
elsid
|
1e4565a15c
|
Avoid using temporary vector to get items owned by
|
2020-02-11 22:24:18 +01:00 |
|
Capostrophic
|
61b60c8a94
|
Add an infinite fall failsafe (feature 1415)
|
2020-02-11 18:26:58 +03:00 |
|
Andrei Kortunov
|
10fafabd7f
|
Merge pull request #2698 from Capostrophic/wander
Support movement deceleration for wander AI
|
2020-02-11 17:22:07 +04:00 |
|
Capostrophic
|
013953ec7f
|
Support Wander movement deceleration
|
2020-02-11 13:50:53 +03:00 |
|
Capostrophic
|
fcbd3b4324
|
Don't try to attach absent shield models to NPCs
|
2020-02-11 11:58:02 +03:00 |
|
Alexei Dobrohotov
|
54e7e0c718
|
Merge pull request #2696 from akortunov/intersector
Fix LineSegmentIntersector usage
|
2020-02-11 09:48:10 +03:00 |
|
elsid
|
9404b1dd72
|
Stop wandering when destination is hidden or occupied by other actor
|
2020-02-10 22:29:54 +01:00 |
|
elsid
|
4a0c056489
|
Do not wander to occupied area by other actor
|
2020-02-10 22:29:54 +01:00 |
|
elsid
|
85414e2353
|
Check for line of sight for wander destination
|
2020-02-10 22:29:54 +01:00 |
|
elsid
|
0c92a567af
|
Use distance to position since last normal state in obstacle checker
|
2020-02-10 22:29:54 +01:00 |
|
elsid
|
52945921a7
|
Print ptr by betacomment
|
2020-02-10 22:29:37 +01:00 |
|
Andrei Kortunov
|
f4291ea948
|
Fix intersector usage (bug #5283)
|
2020-02-10 22:31:20 +04:00 |
|