Marc Zinnschlag
365ea11e86
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
2013-07-18 13:51:24 +02:00
Marc Zinnschlag
fdd47e5b73
silenced a warning
2013-07-18 13:50:12 +02:00
graffy76
0ae254f6a8
Fixed segfault opening tables
2013-07-18 06:31:47 -05:00
Chris Robinson
9c13568bb7
Remove idles from the state list and rename it
2013-07-18 01:49:53 -07:00
Chris Robinson
e803cdbe7f
Handle swimdeath and missing death animations
2013-07-18 01:13:53 -07:00
Chris Robinson
f01b0b48cc
Don't start with an idle state if dead
2013-07-18 00:35:03 -07:00
Chris Robinson
e78bdd2a5d
Clear 'swim' from the animation name as a backup instead of 'sneak'
2013-07-18 00:22:40 -07:00
Chris Robinson
9ea6b22a83
Handle soundgen animation keys
2013-07-17 23:58:21 -07:00
Chris Robinson
d6324d71bf
Ensure mechanics actors/objects are cleared before adding them
2013-07-17 21:39:21 -07:00
Chris Robinson
c7692acb79
Update the player's Ptr in mwrender when changing cells
2013-07-17 19:11:03 -07:00
graffy76
6486f342b5
Fixed setting synchronization issue
...
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
2013-07-17 20:19:01 -05:00
Marc Zinnschlag
1b4cd787a5
Merge remote-tracking branch 'kcat/animation-state'
2013-07-17 11:33:04 +02:00
Chris Robinson
0cd4df3edf
Stop playing idles on death
2013-07-17 02:19:22 -07:00
Chris Robinson
e2e278d06d
Fix some animations not playing properly
...
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
2013-07-17 02:06:31 -07:00
Marc Zinnschlag
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
2013-07-16 12:08:35 +02:00
Chris Robinson
e5e9c83ed5
Merge remote-tracking branch 'zini/master' into animation-state
2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20
Add a speed multiplier to the animation state
2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf
Store a pointer to the character controller for non-actor objects
2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213
Track death separately in the character controller
2013-07-15 23:43:33 -07:00
Chris Robinson
4ae65c20e6
Separate movement and idle states
...
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
2013-07-15 22:56:23 -07:00
scrawl
94d45e1518
Fix twohanded weapons not unequipping when equipping a torch
2013-07-15 23:21:01 +02:00
scrawl
daf9dca121
Fix exception when starting a new game
2013-07-15 20:37:36 +02:00
Marc Zinnschlag
fd9cc1c282
Merge remote-tracking branch 'vorenon/container'
2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b
Merge remote-tracking branch 'scrawl/raycast'
2013-07-15 09:20:16 +02:00
vorenon
66eb82b363
oops again
2013-07-15 02:26:22 +02:00
vorenon
33779ae23c
oops
2013-07-15 02:23:18 +02:00
vorenon
d4739a451a
added ability to close container windows with the activation key
2013-07-15 02:18:24 +02:00
scrawl
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
Marc Zinnschlag
1bc343f363
Merge remote-tracking branch 'kcat/first-person'
2013-07-14 21:28:09 +02:00
kcat
2bdfc3000c
Merge pull request #8 from scrawl/first-person
...
First person fixes
2013-07-14 10:08:10 -07:00
scrawl
fa5198d7b2
Fix an assertion
2013-07-14 14:59:24 +02:00
scrawl
61661c8653
Fix first person meshes casting shadows
2013-07-14 14:55:07 +02:00
scrawl
a049638e7f
Fixes character previews getting shadowed randomly
2013-07-14 14:54:40 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Chris Robinson
3771e5839e
Allow some more third person fallbacks in first person
2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6
Attach the camera to the Head node in first-person
2013-07-13 16:12:38 -07:00
Chris Robinson
2d7620e774
Rotate the neck when looking up and down in first-person
2013-07-13 12:39:06 -07:00
Marc Zinnschlag
b57042cac3
Merge remote-tracking branch 'scrawl/master'
2013-07-13 20:52:30 +02:00
scrawl
d6faad3dd2
Same fix for the book window
2013-07-13 20:26:35 +02:00
scrawl
4a562b585c
Fix journal window with background image != 512x256
2013-07-13 20:24:19 +02:00
Marc Zinnschlag
4cce466dc7
inverted region map y-axis
2013-07-13 16:34:10 +02:00
Chris Robinson
4df1f198a7
Avoid a map lookup for every skin body part when updating
2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa
Avoid casting shadows in first-person view
2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5
Use a multimap for the bodypart map
2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2
Show arms and body parts in first person
...
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74
Reset the NPC object root when switching POV
...
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586
Store a pointer to the character controller in the map
2013-07-12 22:31:50 -07:00
Marc Zinnschlag
c26a6f884f
added region map tooltips
2013-07-12 12:55:14 +02:00