scrawl
9b0ac4e299
NPCs / creatures can now emit ripples
2013-02-27 09:20:42 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
b9912a19e0
Z-up conversion: fix player arrow direction on global map
2013-02-26 14:31:30 +01:00
scrawl
cd68012498
Z-up conversion: raycasts
2013-02-26 14:28:35 +01:00
scrawl
cc9b72b9b1
Removing some leftovers of mwRoot node
2013-02-26 14:01:10 +01:00
scrawl
341f9b96e2
Local map: restore zHigh
2013-02-26 13:53:23 +01:00
scrawl
284ba58e1e
Z-up conversion: global map, shader fix
2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
scrawl
5c0c5854e8
Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not
2013-02-26 12:01:10 +01:00
scrawl
3ef952172d
Z-up conversion: water, sky
2013-02-26 10:38:48 +01:00
scrawl
3cb3ec91c0
Z-up conversion: camera
2013-02-26 09:12:35 +01:00
scrawl
a5451eb9d9
Z-up conversion: terrain, objects
2013-02-26 08:30:06 +01:00
scrawl
8aff033a0c
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
2013-02-25 18:29:11 +01:00
scrawl
b1fc68d44d
Merge branch 'master' into graphics
2013-02-25 17:36:33 +01:00
scrawl
355390429e
Fix World::isUnderwater to use dynamic waterlevel
2013-02-25 17:27:50 +01:00
scrawl
73d48a95f6
Add message box when the player tries to move when being overencumbered.
2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
Marc Zinnschlag
cd40d167ce
Merge remote-tracking branch 'chris/animation2'
2013-02-25 14:56:03 +01:00
scrawl
dfe29db9cb
Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)
2013-02-25 06:57:32 +01:00
Chris Robinson
53eb553c57
Be a little more aggressive when looking to skip generating a skeleton
...
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
2013-02-24 18:12:15 -08:00
Chris Robinson
000236ba80
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 15:30:46 -08:00
Chris Robinson
74b8095fc7
Use default parameters where appropriate
2013-02-24 14:43:20 -08:00
Chris Robinson
5267d17408
Revert "forgot to destroy child scene nodes"
...
This reverts commit f1a3309392
2013-02-24 14:14:08 -08:00
ChrisKCat
9e7b559b09
Merge pull request #6 from scrawl/lights
...
For light objects without an AttachLight bone, attach the light to the c...
2013-02-24 14:12:53 -08:00
Chris Robinson
c60e858b02
Create bones for NiTriShape nodes, and attach the entities to them
...
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
2013-02-24 12:42:32 -08:00
Marc Zinnschlag
e060713aa3
updated credits file
2013-02-24 20:37:29 +01:00
scrawl
f1a3309392
forgot to destroy child scene nodes
2013-02-24 19:03:25 +01:00
scrawl
1ae2d3c6ab
For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.
2013-02-24 19:00:06 +01:00
Nathan Jeffords
7ea1f6a02a
fixes for using FFMPEG on windows
2013-02-24 09:42:08 -08:00
scrawl
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-24 18:04:51 +01:00
scrawl
2e6c63d9cd
Disable specular on NIF's
2013-02-24 17:18:22 +01:00
Lars Söderberg
e32646ee50
Prettier repeated borders.
2013-02-24 16:57:40 +01:00
Lars Söderberg
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
2013-02-24 16:57:07 +01:00
Chris Robinson
94be45e07e
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 06:20:10 -08:00
ChrisKCat
aab7cf137b
Merge pull request #5 from greye/cross-cell
...
fix and unify object cell change update in mwrender
2013-02-24 05:32:52 -08:00
Marc Zinnschlag
fa880e3274
Merge remote-tracking branch 'lazydev/master'
2013-02-24 14:07:52 +01:00
Chris Robinson
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 03:32:35 -08:00
Chris Robinson
89d4c245e9
Better calculate jump velocity
...
The fatigue term isn't currently used correctly
2013-02-24 03:30:33 -08:00
greye
6a8c532244
fix and unify object cell change update in mwrender
2013-02-24 15:04:56 +04:00
scrawl
0d6a3367d3
Water shader no longer depends on object shaders being enabled
2013-02-24 10:28:50 +01:00
scrawl
3135482cee
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-24 10:06:04 +01:00
Chris Robinson
90cb9ee0ac
Don't set a vertical velocity when on the ground
2013-02-23 16:30:11 -08:00
lazydev
a5ff8181b7
fix for https://bugs.openmw.org/issues/569
2013-02-24 03:35:43 +04:00
Chris Robinson
8e59ea4941
Use a separate method to handle animation events
2013-02-23 14:39:01 -08:00
Chris Robinson
d77d035d3a
Handle the "sound" events in runAnimation
2013-02-23 14:15:11 -08:00
Chris Robinson
df8889dcc4
Limit maximum frame time to 200ms
...
This effectively slows game time when it drops below 5 fps. Something like this
is desirable when dealing with time-based animations, which can jump forward
after a lengthy cell transition.
2013-02-23 13:15:37 -08:00
Marc Zinnschlag
9a03b17b2d
Merge branch 'localworkaround'
2013-02-23 20:50:22 +01:00
Marc Zinnschlag
a95431c387
fix
2013-02-23 20:20:40 +01:00
Marc Zinnschlag
9e8d0128e0
Merge remote-tracking branch 'blunted2night/size_t-warnings_v2'
2013-02-23 20:06:27 +01:00
Nathan Jeffords
1af4e11414
apply MSVC warning settings to shiny projects
2013-02-23 10:24:18 -08:00
