Andrei Kortunov
fe71ce9cb2
Optimize custom bones search visitor
2019-08-18 10:30:21 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera
...
Rewrite messed up playerlooking switch handling (bug #5078 )
2019-08-17 23:15:21 +04:00
Andrei Kortunov
6156ab45de
[Regression] inject bones for NPC's with custom animation models
2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c
2019-08-11 12:07:49 +03:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6
2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0
Revert "Do not use a separate GlowUpdater for every arrow in quiver"
...
This reverts commit b7c214b1bc
.
2019-08-09 21:38:03 +04:00
Andrei Kortunov
fcd6e915d4
Fallback for long animation groups
2019-08-09 19:40:30 +04:00
Andrei Kortunov
afaff8231d
Use the Weapon Bone as fallback
2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
2019-08-09 19:40:27 +04:00
Andrei Kortunov
b7c214b1bc
Do not use a separate GlowUpdater for every arrow in quiver
2019-08-07 12:58:18 +04:00
Andrei Kortunov
8557346fbd
Use glow for enchanted arrows (feature #5122 )
2019-08-07 12:58:14 +04:00
Andrei Kortunov
1eed511b4e
Use enchanted glow for pulled arrows
2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1
Move getEnchantmentColor() from Animation to Class
2019-08-07 08:51:46 +04:00
Capostrophic
0b074f2211
Rewrite messed up playerlooking switch handling (bug #5078 )
2019-07-29 15:44:17 +03:00
Alexei Dobrohotov
8ebecb7584
Merge branch '7' into 'master'
...
fixes pitch black ripples in shadow
See merge request OpenMW/openmw!123
2019-06-01 12:13:14 +00:00
bzzt
403171e083
fixes pitch black ripples in shadow
2019-05-29 13:37:00 +00:00
Alexei Dobrohotov
e0fb411fc8
Merge branch '2' into 'master'
...
stop making new reflacttetures at intext change
See merge request OpenMW/openmw!116
2019-05-24 14:08:09 +00:00
bzzt
6c310c64d2
stop making new reflacttetures at intext change
2019-05-24 13:37:00 +00:00
Andrei Kortunov
fae5843347
Setup the ICO settings only once instead of every loading (bug #5025 )
2019-05-24 08:04:20 +04:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders
...
Minor water shader fixes
2019-05-11 18:07:58 +03:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map
...
Do not re-render maps for all active cells during cell transitions
2019-05-11 02:30:38 +03:00
Alexei Dobrohotov
e4ef7e8d3f
Merge pull request #2355 from akortunov/transparency
...
Use the StateSetUpdater to modify alpha for Animation objects
2019-05-04 20:24:01 +03:00
Alexei Dobrohotov
a737935748
Merge pull request #2363 from akortunov/herbalism
...
Additional herbalism-related tweaks
2019-05-04 13:57:17 +03:00
Andrei Kortunov
c01153569d
Add missing Organic flag check for herbalism
2019-05-04 12:36:58 +04:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism
...
Native graphics herbalism support
2019-05-03 20:58:22 +03:00
Andrei Kortunov
5876a417c3
Use the StateSetUpdater to modify alpha for Animation objects (bug #5001 )
2019-05-03 08:18:52 +04:00
Andrei Kortunov
861d41f4a4
Native graphics herbalism support (feature #5010 )
2019-05-02 23:03:47 +04:00
Andrei Kortunov
c3fdccac1f
Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004 )
2019-04-30 17:51:38 +04:00
Capostrophic
f2638b58c1
Tweak object VFX scaling (bug #4989 )
2019-04-22 21:27:33 +03:00
Capostrophic
0333cd2dd4
Fix frozen rain when water refractions are disabled
2019-04-12 16:43:18 +03:00
Bret Curtis
f4e113e7c1
Merge pull request #2277 from akortunov/terrain
...
Camera-related fixes
2019-04-12 11:17:20 +02:00
Capostrophic
85e99182ce
Revise light source configuration (bug #4965 )
...
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
2019-04-10 22:31:31 +03:00
bzzt
391f6faffb
Remove unused defaultViewer / defaultViewPoint
2019-04-07 11:21:09 +04:00
bzzt
e908790584
Inherit the view point from main camera for water RTT cameras
2019-04-07 11:21:07 +04:00
bzzt
ed4ce4609b
Do not re-render maps for all active cells during cell transitions
2019-03-30 09:10:48 +04:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Chris Djali
1860d720bc
Merge pull request #2263 from akortunov/actor_culling
...
Do not recreate shaders to update transparency
2019-03-26 14:13:50 +00:00
Bret Curtis
1e9eac568f
Merge pull request #2249 from akortunov/cache
...
Implement generic caching system
2019-03-25 13:32:23 +01:00
Bret Curtis
354f904a24
Merge pull request #2279 from akortunov/map
...
Optimize map window update
2019-03-24 16:45:16 +01:00
bzzt
1143985bc7
Do not update map texture if it did not change
2019-03-23 16:22:57 +04:00
bzzt
d707eaac36
Use ICO for water shader
2019-03-23 15:44:03 +04:00
bzzt
c2176945bd
Do not use the delayed map cells update
2019-03-22 18:58:34 +04:00
elsid
fa7b304e78
Use auto for map value_type in range-based for loops
...
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
2019-03-21 23:09:42 +03:00
Capostrophic
695cd5bb49
Minor NpcAnimation cleanup
2019-03-20 16:11:21 +03:00
Bret Curtis
7ccfec4d21
Merge pull request #2270 from akortunov/animfix
...
Fixes for werewolf animations
2019-03-20 12:32:11 +01:00
Andrei Kortunov
e171d34192
Init NPC type properly in the NpcAnimation
2019-03-20 12:28:03 +04:00
elsid
ccb325c663
Add override to fix warnings
2019-03-20 00:19:26 +03:00
Bret Curtis
b819690e82
Merge pull request #2264 from akortunov/optimize_terrain
...
Delete composite map layers in the background thread
2019-03-18 13:52:17 +01:00
bzzt
aa5a071aef
Delete composite map layers in the background thread
2019-03-18 14:00:50 +04:00
Bret Curtis
d56733149c
Merge pull request #2201 from akortunov/optimize_terrain
...
Optimize terrain
2019-03-18 08:59:10 +01:00
bzzt
5ec28e09c9
Do not recreate shaders to update transparency
2019-03-18 10:37:53 +04:00
Andrei Kortunov
c6cb91ce61
Limit maximum FOV value
2019-03-18 10:27:30 +04:00
bzzt
6029ed4ecc
Reject empty quad tree nodes at the cell level without land data
2019-03-18 10:27:29 +04:00
Andrei Kortunov
2ed05a5195
Implement generic caching system
2019-03-14 09:10:19 +04:00
elsid
614d5243c3
Make NavMeshCacheItem consistent
...
Move all logic related to this type into its methods.
2019-03-10 23:07:36 +03:00
elsid
ccc709a316
Store guarded navmesh cache item in shared_ptr
...
Remove useless SharedGuarded type.
2019-03-10 17:06:19 +03:00
Andrei Kortunov
08202f8185
Fix missing null check
2019-03-10 11:03:51 +04:00
Bret Curtis
e3bde5ec91
Merge pull request #2226 from akortunov/projectilefix
...
Use relative animation time only for bows and crossbows
2019-03-08 22:52:10 +01:00
bzzt
e0cf460ba3
Do not load terrain beyond the viewing distance
2019-03-08 22:15:27 +04:00
Andrei Kortunov
4c21776b94
Use relative animation time only for bows and crossbows (bug #3778 )
2019-03-08 20:16:02 +04:00
Bret Curtis
1e4bbe8997
Merge pull request #2223 from Capostrophic/animation
...
Fix raki creatures in Skyrim: Home of the Nords (bug #4810 )
2019-03-08 15:25:45 +01:00
Capostrophic
b05531818c
Fix raki creatures in Skyrim: Home of the Nords (bug #4810 )
...
Make bip01 have higher priority than 'root node' node when determining the movement accumulation root
2019-03-07 21:09:00 +03:00
Bret Curtis
c55141d18d
Merge pull request #2217 from Capostrophic/shader
...
Move forcePPL and clamp to global shader defines (task #4869 )
2019-03-07 16:56:09 +01:00
Andrei Kortunov
d23a0ce2ae
Use C++11-style loops in the game world instead of iterators
2019-03-07 12:39:57 +04:00
Capostrophic
0cdc46dfd6
Move forcePPL and clamp to global shader defines (bug #4869 )
2019-03-05 23:36:08 +03:00
Bret Curtis
cb29dc7b85
Merge pull request #2209 from akortunov/effectfix
...
[Regression] Fix magic glow update for sheathing weapons
2019-03-05 17:05:17 +01:00
Andrei Kortunov
bcf086d72d
Fix magic glow update for sheathing weapons
2019-03-05 11:51:56 +04:00
elsid
84fbb486d3
Fix switch from invalid navmesh number to valid
2019-03-04 22:59:47 +03:00
Andrei Kortunov
9398117ea7
Allow to do not reflect terrain
2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184
Add more settings to water reflections in exteriors (feature #4859 )
2019-03-02 14:26:14 +04:00
Andrei Kortunov
56fea4b062
Add setting to control composite geometry size
2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6
Allow to configure terrain vertex LOD
2019-03-01 18:02:38 +04:00
bzzt
fd94d7f7ff
Make Distant Terrain more configurable (feature #4890 )
2019-03-01 14:51:13 +04:00
bzzt
bcbee08a1b
Fix creature model instance preloading
2019-02-27 00:15:39 +03:00
Capostrophic
e70cc10305
Some more de-boosting
2019-02-24 03:20:20 +03:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Bret Curtis
ba491a8af0
Merge pull request #2069 from Capostrophic/skeleton
...
Use the skeleton from the NPC's set model (bug #4747 )
2019-02-22 15:12:24 +01:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
...
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
Andrei Kortunov
ad9412a117
Remove some redundant checks
2019-02-17 14:29:36 +04:00
elsid
1d3668cd22
Add Navigator interface
2019-02-16 15:37:06 +03:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
...
Native glowing windows support
2019-02-04 14:50:13 +01:00
Andrei Kortunov
57d8df1a05
Do not check if additional animation sources are supported for every animation object
2019-02-03 11:27:48 +04:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
Capostrophic
6660f2f8e6
Use the skeleton from the NPC's set model (bug #4747 )
2019-01-25 01:02:27 +03:00
AnyOldName3
9d84853903
Fix nodemask snafu
2019-01-24 18:56:10 +00:00
elsid
13e94ab194
Get navmesh to update osg node only if rendering is enabled
2019-01-20 21:09:06 +03:00
elsid
3572edab72
Update navmesh in a separate method
2019-01-20 19:28:23 +03:00
Andrei Kortunov
0937f02598
Get rid of unnecessary string streams
2019-01-07 21:08:16 +04:00
Bret Curtis
9d1c0d2b22
Merge pull request #2114 from Capostrophic/cleanup
...
Remove some redundant code
2019-01-07 14:59:39 +01:00
Andrei Kortunov
02a43d0b32
Do not scale player's model in the 1st-person view depending on race (bug #4383 )
2019-01-07 12:58:47 +04:00
Capostrophic
624db99bf2
Remove some redundant code
2019-01-05 01:25:52 +03:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Andrei Kortunov
880ec3ce7b
Fix visible sheaths for invisible actors
2018-11-24 14:57:41 +04:00
Andrei Kortunov
7438e20ee1
Fix shield displaying on inventory avatar (bug #4720 )
2018-11-17 22:42:29 +04:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
...
Weapon sheathing
2018-11-08 20:44:20 +01:00
Stanislaw Halik
8fd71fe4ad
fix rain delay when exiting water
...
When the particle system updates its internal state noting that it's
been culled, it stops emitting any further particles. Prevent it from
having that knowledge.
v2: Fix off-by-one-frame error following review by @AnyOldName3
2018-11-07 20:55:45 +00:00
Andrei Kortunov
92e45507d8
Weapon sheathing support, including quivers and scabbards (feature #4673 )
2018-11-05 11:18:20 +04:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00