David Cernat
195bd88ac0
Add AnyOldName3's osgshadow-test commits up to Sep 21 while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2017-09-29 21:20:34 +03:00
David Cernat
44fb7518ee
Merge pull request #300 from OpenMW/master
...
Add OpenMW commits up to 28 Sep 2017
2017-09-28 11:09:14 +03:00
scrawl
e5d1fd022f
Merge pull request #1479 from akortunov/physics
...
Make physics framerate configurable
2017-09-27 22:31:00 +00:00
scrawl
1ad6cf90c6
Merge pull request #1482 from akortunov/ownerfix
...
Inherit owner, if an item is in container (regression #4128 )
2017-09-27 21:08:54 +00:00
David Cernat
b1aacd5028
Merge pull request #299 from OpenMW/master
...
Add OpenMW commits up to 27 Sep 2017
2017-09-27 21:29:56 +03:00
Andrei Kortunov
668a947210
Inherit owner, if an item is in container (regression #4128 )
2017-09-27 20:00:41 +04:00
scrawl
f2146a2dc0
Update AUTHORS.md
2017-09-27 13:15:22 +00:00
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00:00
scrawl
60604ef5e8
Update AUTHORS.md
2017-09-26 23:07:58 +00:00
David Cernat
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
2017-09-26 21:54:55 +03:00
Andrei Kortunov
62177ebb30
Move physics framerate from setting to environment variable
2017-09-26 21:23:15 +04:00
Andrei Kortunov
6062cd4b9c
Make physics framerate configurable
2017-09-26 17:15:58 +04:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +02:00
scrawl
be7bdec2ed
Merge pull request #1471 from crussell187/nif_stream_optimization
...
first pass on optimization of nif parsing functions from the file stream
2017-09-25 22:43:34 +00:00
scrawl
5d1392b452
Merge pull request #1476 from akortunov/wanderfix
...
Fix regressions in PR1474
2017-09-24 14:54:25 +00:00
Andrei Kortunov
7d703a13a3
Fix a crash in the World::isUnderwater() if the cell is empty
2017-09-24 16:28:05 +04:00
Andrei Kortunov
9b04a7c1e6
Fix idle animations playing
2017-09-24 16:26:41 +04:00
scrawl
2a14af2e27
Merge pull request #1474 from akortunov/swimanimations
...
Implement missing swim animations
2017-09-23 23:33:37 +00:00
scrawl
22222f07ae
Merge pull request #1475 from akortunov/wanderfix
...
AiWander: reset spawn position, if an actor was moved to another cell
2017-09-23 23:10:35 +00:00
scrawl
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
2017-09-23 22:55:56 +00:00
Andrei Kortunov
91adfc9fc0
AiWander: reset spawn position, if an actor was moved to another cell (bug #4010 )
2017-09-23 20:59:06 +04:00
MiroslavR
b5f5268ff3
Clean up faraway projectiles
2017-09-23 18:54:17 +02:00
825de71b29
removed an iostream include used for debug prints from nifstream.hpp
2017-09-23 11:10:05 -05:00
Andrei Kortunov
a57f6ac2af
Fix a typo in attack animation name
2017-09-23 08:25:58 +04:00
30a213a9b3
updates for nifstream optimization including fixing the non-x86 path for little endian reads
2017-09-22 21:08:25 -05:00
Miloslav Číž
9dececcbd2
rename a constant in water shader
2017-09-22 21:10:05 +02:00
Miloslav Číž
28f58d5a32
add deleted letter in macro
2017-09-22 21:06:03 +02:00
Miloslav Číž
f274bc84cc
fix depth computation in water shader
2017-09-22 21:03:09 +02:00
David Cernat
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
2017-09-22 19:12:41 +03:00
Andrei Kortunov
bcad431cc5
Implement SwimTurnLeft/Right animations
2017-09-22 16:07:00 +04:00
Andrei Kortunov
1c6cfad3cc
Implement SwimHit animation
2017-09-22 15:49:42 +04:00
Andrei Kortunov
3eb1308c0d
Implement SwimKnockdown/out animations
2017-09-22 15:26:35 +04:00
Andrei Kortunov
6260bb1366
Implement SwimAttack1-3 and SwimDeathKnockDown/Out animations
2017-09-22 14:51:06 +04:00
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
2017-09-22 09:14:21 +00:00
Miloslav Číž
8df79625e8
fix water shader
2017-09-22 10:53:02 +02:00
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
2017-09-22 12:32:47 +04:00
8834066dea
make streaming to a type array in nif a direct copy from the file into the vector
2017-09-21 23:47:09 -05:00
090a8408b8
made nif basic type read optimizations more portable
2017-09-21 22:37:19 -05:00
Miloslav Číž
658fa0fdae
fix typo
2017-09-21 22:33:57 +02:00
Miloslav Číž
c43baf6e94
remove commented code
2017-09-21 22:31:26 +02:00
Miloslav Číž
16d9773c6c
fix water shader artifacts at shores
2017-09-21 22:25:36 +02:00
scrawl
75c047a6e0
Merge pull request #1472 from akortunov/equipfix
...
Do not play draw weapon animation when equip a new weapon
2017-09-21 13:05:14 +00:00
Andrei Kortunov
5da532a36c
Do not play draw weapon animation when equip a new weapon (bug #4056 )
2017-09-21 10:48:52 +04:00
c72aa19d6d
first pass on optimization of nif parsing functions from the file stream
2017-09-20 23:53:12 -05:00
AnyOldName3
e33bec97be
Tidy up the mess I made of lighting.glsl a bit by removing two single-line functions that are only ever called in one location.
2017-09-21 02:03:53 +01:00
AnyOldName3
26ecf2088b
Make shadows play nicely with per-vertex lighting
2017-09-21 01:59:02 +01:00
AnyOldName3
c67b3267fb
Stop shadowing ambient lighting from the light casting a shadow when using per-pixel lighting.
2017-09-21 00:49:34 +01:00
AnyOldName3
f50063402d
Adjust shaders to support shadows
2017-09-21 00:25:48 +01:00
scrawl
f004622530
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 22:24:20 +00:00
scrawl
aaa727757d
Don't use MW_Dialog skin with plain Widgets
...
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.
This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:24:20 +00:00
