Alexei Dobrohotov
4490f89a3d
Merge branch 'dontcollidewithowncollisionbox' into 'master'
...
Don't explode spell mid-air (#5745 )
See merge request OpenMW/openmw!468
2020-12-15 21:50:24 +00:00
fredzio
259d522800
When doing a ray cast to the next projectile position, ignore collisions
...
that occurs with the projectile own collision object. Otherwise a magic
bolt can explode "spontaneously".
2020-12-15 21:34:58 +01:00
psi29a
884b434ee0
Merge branch 'fixfriendlyfire' into 'master'
...
Fix projectiles friendly fire (#5744 )
See merge request OpenMW/openmw!466
2020-12-15 15:45:43 +00:00
psi29a
78e85fe011
Merge branch 'this_is_nife' into 'master'
...
More NIF stuff
See merge request OpenMW/openmw!461
2020-12-15 15:43:12 +00:00
psi29a
bc6bcda58f
Merge branch 'wizard' into 'master'
...
Wizard: fix "file is already opened" warning
See merge request OpenMW/openmw!465
2020-12-15 15:35:47 +00:00
psi29a
ecdd5f1437
Merge branch 'fixosga' into 'master'
...
Fix collada animation issues
See merge request OpenMW/openmw!467
2020-12-15 15:34:35 +00:00
Nelsson Huotari
8b2bf12e8f
Use bip01 for root bone name
2020-12-15 13:51:49 +02:00
Nelsson Huotari
6c1f6169c0
Fix root movement glitch
2020-12-15 13:50:19 +02:00
Nelsson Huotari
3195716a2c
Don't force loop textkey
2020-12-15 13:49:25 +02:00
fredzio
b39437dfb6
Don't allow projectiles to stand still when they hit an ally.
...
When an NPC fire a projectile, it should affect only its targeted actor.
To this end, after a hit is detected the target is checked against the
list of AI targets and reactivated if necessary.
Problem occurs when the hit occurs as a result of a friendly actor going
into the projectile (detected in ClosestNotMeConvexResultCallback):
while the projectile is inside the friend's collision box, it is
deactivated, just to be immediately reactivated. Effectively, the
projectile does nothing until the actor moves out.
Add a check inside the ClosestNotMeConvexResultCallback before declaring
a hit.
Since the necessary data is not safely accessible from the async thread,
maintain a copy inside the Projectile class.
2020-12-14 22:23:01 +01:00
Alexei Dobrohotov
53e1e57eef
Formatting
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
085ea44af5
Add BSShaderLightingProperty abstraction
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
c0b9823372
Read BSShaderProperty and handle NiGeometry properties
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
42226533d8
Handle BSLODTriShape
...
Its levels of detail are currently not handled
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
8fd45d85ec
Unify NiGeometry/NiGeometryData handling
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
8ca324af0a
Handle emissive TexEnv creation in one place
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
5310dd6807
Clean up particle vertex handling
2020-12-15 00:06:43 +03:00
Alexei Dobrohotov
1c83e4936d
Read BSShaderTextureSet and NiColorInterpolator
...
Accept boolean-based and 4D vector-based NiInterpolators in ValueInterpolator constructor
2020-12-15 00:06:43 +03:00
Frederic Chardon
2373f07168
Merge branch 'destination_nullptr' into 'master'
...
Make sure adjustPosition() is safe to call for any actor
Closes #5742
See merge request OpenMW/openmw!464
2020-12-14 08:03:46 +00:00
Alexei Dobrohotov
ab789e37e1
Wizard: fix "file is already opened" warning
2020-12-14 03:45:03 +03:00
Alexei Dobrohotov
201999c4a9
Make sure adjustPosition() is safe to call for any actor
2020-12-14 03:01:26 +03:00
CedricMocquillon
cc5c6fe3ad
Use data() method
2020-12-13 20:50:48 +01:00
AnyOldName3
3a10c6ae91
Merge branch 'optimizeosgaloops' into 'master'
...
Optimize osganimation for-loops
See merge request OpenMW/openmw!460
2020-12-13 15:12:52 +00:00
CedricMocquillon
112437cf28
Change crash file to dmp on window to avoid renaming it
2020-12-13 14:13:07 +01:00
CedricMocquillon
adeb4fe02f
Handle case where the log path has more that MAX_PATH characters
2020-12-13 14:10:44 +01:00
CedricMocquillon
f400116bcd
Use 32767 characters for log path
2020-12-13 14:09:44 +01:00
CedricMocquillon
3eb2b32123
Fix typpo issue on arguments
2020-12-13 14:09:14 +01:00
CedricMocquillon
e2041de969
Use the incremental approach to handle long path
2020-12-12 21:47:50 +01:00
Nelsson Huotari
256aa5e71d
Use const auto&
2020-12-12 22:23:20 +02:00
Alexei Dobrohotov
817ac4cfbd
Don't regenerate the topics list unconditionally
2020-12-12 23:07:00 +03:00
Alexei Dobrohotov
c8d85dcf30
Merge branch 'changelogcs' into 'master'
...
Editor changelog additions
See merge request OpenMW/openmw!458
2020-12-12 19:51:13 +00:00
CedricMocquillon
73afc55462
Fork the current process to monitor exe, generate minidump on crash
2020-12-12 20:17:26 +01:00
Nelsson Huotari
28c79227df
Editor changelog additions
2020-12-12 21:04:59 +02:00
Alexei Dobrohotov
264a6e0269
Merge branch 'unbreak_actors_loading' into 'master'
...
Unbreak floating corpses and spawn
Closes #5735
See merge request OpenMW/openmw!457
2020-12-12 18:00:05 +00:00
fredzio
a314f196eb
Unconditionally call actor->resetPosition in adjustPosition.
...
Revert broken change that would force adjust all actors in cell upon
loading. That break floating corpses (and probably others things).
2020-12-12 18:17:26 +01:00
psi29a
daf6c9f88f
Merge branch 'collisionbox' into 'master'
...
Make actor collision box components a struct
See merge request OpenMW/openmw!454
2020-12-11 22:09:06 +00:00
Alexei Dobrohotov
15291f15d3
Make actor collision box components a struct
2020-12-11 20:07:59 +03: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
psi29a
9a35c5815e
Merge branch 'nofallfloor' into 'master'
...
Update physics object position after spawning.
See merge request OpenMW/openmw!449
2020-12-11 11:28:29 +00:00
psi29a
789d034432
Merge branch 'skirts' into 'master'
...
Editor: Properly reserve body parts for skirts (bug #5731 )
Closes #5731
See merge request OpenMW/openmw!452
2020-12-11 11:09:32 +00:00
psi29a
acd5109897
Merge branch 'dontcopysimulationresults' into 'master'
...
explicitely use a reference for physics simulation results to avoid a copy
See merge request OpenMW/openmw!450
2020-12-11 11:08:46 +00:00
Frederic Chardon
460e5abb55
Update physics object position after spawning.
2020-12-11 08:57:08 +01:00
Frederic Chardon
899b8422fa
explicitely use a reference, auto can't infer it and make a copy
2020-12-11 08:56:54 +01:00
Alexei Dobrohotov
32601e0ae4
Properly reserve body parts for skirts (bug #5731 )
2020-12-11 10:39:57 +03:00
Alexei Dobrohotov
1d03b46422
Merge branch 'cleanup-improve-scene-colors' into 'master'
...
[OpenMW-CS][FIX] Clean up PR !442
See merge request OpenMW/openmw!451
2020-12-11 02:19:26 +00:00
Coleman Smith
3b9db41346
removing unneeded variable
2020-12-10 17:03:10 -08:00
Bret Curtis
d35715e5dc
add olcoal to authors and feature 5199 to changelog
2020-12-10 22:39:54 +01:00
psi29a
d77f122289
Merge branch 'gl-5199-improve-scene-colors' into 'master'
...
[OpenMW-CS] Issue #5199 : Improve Scene Colors
See merge request OpenMW/openmw!442
2020-12-10 21:36:46 +00:00
Coleman Smith
842ea9d6ed
simplifying a bit
...
- attaching gradient camera directly to the main camera
- using Vec4ub
2020-12-10 21:36:46 +00:00
psi29a
c8fa8cfe74
Merge branch 'herbalmenu' into 'master'
...
Add graphic herbalism to the launcher
Closes #5730
See merge request OpenMW/openmw!448
2020-12-10 21:31:53 +00:00
