madsbuvi
51a37ec6d2
Merge remote-tracking branch 'remotes/origin/master' into stereo_friendly_water
2021-01-29 18:16:47 +01:00
madsbuvi
9f0a8f0c7b
Merge branch 'master' into stereo_friendly_water
2021-01-29 17:58:31 +01:00
Andrei Kortunov
b286397dd4
Merge pull request #3045 from akortunov/revert
...
Revert fix for 5379
2021-01-29 17:17:28 +04:00
Andrei Kortunov
7b727e4d70
Revert "Remove physics dependency on basenode"
...
This reverts commit 165c731492
2021-01-29 16:51:13 +04:00
Andrei Kortunov
165af1c365
Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell."
...
This reverts commit f031a191b8
2021-01-29 16:51:05 +04:00
Andrei Kortunov
8019fd594d
Revert "Add changelog"
...
This reverts commit f219c5992b
2021-01-29 16:50:56 +04:00
Andrei Kortunov
f8e8496d36
Revert "Revert a wrong change introduced in MR 546"
...
This reverts commit 23137d0c54
2021-01-29 16:50:39 +04:00
Bret Curtis
9f168eab88
Merge pull request #3044 from akortunov/master
...
Avoid null dereference for objects without cells
2021-01-29 13:15:04 +01:00
psi29a
faa800464f
Merge branch 'cs_fix_separate_drop' into 'master'
...
OpenMW-CS: Fix separate drop, refactor for code reuse
See merge request OpenMW/openmw!574
2021-01-29 11:39:40 +00:00
uramer
ee2f0e7eb3
Fix inconsistent argument name
2021-01-28 23:47:38 +01:00
uramer
eca0d8b7ea
Fix typo in DropMode enum
2021-01-28 22:40:44 +01:00
uramer
edc6d5c3e7
Fix a typo in separate drop binds
2021-01-28 22:22:48 +01:00
uramer
36cd818155
Fix separate drop, refactor for code reuse
2021-01-28 22:10:33 +01:00
Andrei Kortunov
3b9f8b5fa2
Avoid null dereference for objects without cells
2021-01-28 18:37:47 +04:00
Andrei Kortunov
d984d13b1c
Merge branch 'animate_animated_objects' into 'master'
...
Unbreak animated objects (regression from !546 )
See merge request OpenMW/openmw!570
2021-01-28 14:12:24 +00:00
Andrei Kortunov
5382d38b9b
Merge branch 'hit_target_object' into 'master'
...
Unbreak targetted spell on objects (#5811 )
See merge request OpenMW/openmw!569
2021-01-28 14:09:45 +00:00
Andrei Kortunov
74fba6df36
Merge branch 'revert-f917037e' into 'master'
...
Revert "Merge branch 'movement_fix2' into 'master'"
See merge request OpenMW/openmw!572
2021-01-28 12:58:21 +00:00
elsid
a3ab8dfbb4
Revert "Merge branch 'movement_fix2' into 'master'"
...
This reverts merge request !496
2021-01-28 12:48:19 +00:00
fredzio
23137d0c54
Revert a wrong change introduced in MR 546
...
A prerequisite to create physics objects for statics was to remove the
dependency on base node (since it doesn't yet exists) for object
position. It is still necessary for animation though.
Restore the basenode (and the associated FIXME) so that animated objects works properly.
2021-01-27 16:24:11 +01:00
Bret Curtis
b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
...
Grass instancing
2021-01-27 12:21:24 +01:00
psi29a
699bd257ef
Merge branch 'camera_stats' into 'master'
...
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to a valid file.
See merge request OpenMW/openmw!526
2021-01-27 08:04:33 +00:00
Frederic Chardon
7cd7fa2f08
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
...
a valid file.
2021-01-27 08:04:33 +00:00
fredzio
64475ebedb
Remove a brainfart from precise projectile handling: all non-actor
...
non-projectile objects were treated as ground.
2021-01-27 07:15:09 +01:00
Andrei Kortunov
5225ec9e50
Add changelog entry
2021-01-26 22:32:06 +04:00
Andrei Kortunov
e3490c8606
Remove dead code
2021-01-26 22:29:41 +04:00
Andrei Kortunov
24e1dfcddc
Use default argument
2021-01-26 22:29:41 +04:00
Andrei Kortunov
f40e227686
Remove redundant formatting changes
2021-01-26 22:29:41 +04:00
Andrei Kortunov
b975f16e6b
Remove redundant check - groundcover is not present in the CellStore
2021-01-26 22:29:41 +04:00
Andrei Kortunov
d12a0fdcb3
Mark only instances from groundcover files as groundcover objects
2021-01-26 22:29:41 +04:00
Andrei Kortunov
8874e88ff1
Drop fading setting
2021-01-26 22:29:41 +04:00
Andrei Kortunov
1a6c06f7b5
Do not allow to set distance to non-positive values
2021-01-26 22:29:41 +04:00
Andrei Kortunov
859cd0fd0c
Do not use display lists for instanced meshes
2021-01-26 22:29:41 +04:00
Andrei Kortunov
a09f03c850
Drop groundcover materials - they are not used
2021-01-26 22:29:41 +04:00
Andrei Kortunov
36fc573375
Take in account Z direction for stomping
2021-01-26 22:29:41 +04:00
Andrei Kortunov
5124e81348
Use linear interpolation instead of abrupt transitions for groundcover lighting
2021-01-26 22:29:41 +04:00
Andrei Kortunov
14cf0ce1dc
Implement instanced groundcover
2021-01-26 22:29:41 +04:00
Mads Buvik Sandvei
aa44d616ab
Update water.cpp (more whitespace)
2021-01-26 17:57:08 +00:00
Mads Buvik Sandvei
12d9d6bfcb
Update water.cpp (whitespace)
2021-01-26 17:56:06 +00:00
psi29a
f917037ead
Merge branch 'movement_fix2' into 'master'
...
Fix bug: NPCs don't move if the target is exactly above or exactly below.
See merge request OpenMW/openmw!496
2021-01-26 08:30:15 +00:00
Petr Mikheev
bc2cec86e9
Fix bug: NPCs doesn't move if the target is exactly above or exactly below.
2021-01-26 00:05:28 +01:00
madsbuvi
a67b512863
formatting error
2021-01-25 19:59:34 +01:00
madsbuvi
5f0aae0523
De-hardcode settings and buffers.
2021-01-25 19:58:27 +01:00
psi29a
cadd1e7529
Merge branch 'daedric_fog' into 'master'
...
Don't nuke fog when bounds have changed
Closes #5469
See merge request OpenMW/openmw!522
2021-01-25 12:58:44 +00:00
psi29a
a8c5607aa6
Merge branch 'disableinfotablesorting' into 'master'
...
[OpenMW-CS] Info table dragging to move record order, disable sorting
See merge request OpenMW/openmw!538
2021-01-25 12:51:13 +00:00
psi29a
64b4472efa
Merge branch 'stand' into 'master'
...
Don't adjust actor position until all objects are loader (#5379 )
See merge request OpenMW/openmw!546
2021-01-25 12:12:43 +00:00
psi29a
c6f14cde20
Merge branch 'Show-level-multipliers-in-levelup-tooltip' into 'master'
...
Show level multipliers in levelup tooltip
Closes #5783
See merge request OpenMW/openmw!518
2021-01-25 10:01:39 +00:00
Cédric Mocquillon
3bb551a6f1
Show level multipliers in levelup tooltip
2021-01-25 10:01:39 +00:00
Evil Eye
59af819f97
Merge branch 'fix-mem-leak-2' into 'master'
...
Fix memory leak in MWInput
See merge request OpenMW/openmw!566
2021-01-24 16:05:30 +00:00
Gleb Mazovetskiy
fe815d3d8d
Fix memory leak in MWInput
...
mListener wasn't being cleaned up
2021-01-24 15:22:36 +00:00
Frederic Chardon
2353a4d8ec
Merge branch 'projectile_crash' into 'master'
...
Prevent nullptr access
See merge request OpenMW/openmw!565
2021-01-24 15:09:55 +00:00
