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
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
Chris Robinson
d208422ca7
Add a method to update an Animation's Ptr object
2013-02-23 10:12:36 -08:00
Chris Robinson
a2eaec7878
Avoiding holding the InventoryStore in the NpcAnimation class
2013-02-23 08:03:52 -08:00
Chris Robinson
0d0e75fe0b
Don't set animation sources for models that don't have a skeleton
2013-02-23 07:36:11 -08:00
Chris Robinson
0148db8ccf
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
2013-02-23 05:59:35 -08:00
Marc Zinnschlag
3472a6f180
workaround for infinite recursion during local variable access
2013-02-23 14:40:56 +01:00
Chris Robinson
e6da9dfae5
Specify the animation key to stop playing at
2013-02-23 05:15:10 -08:00
Marc Zinnschlag
59748a7647
Merge remote-tracking branch 'greye/cross-cell'
2013-02-23 13:55:31 +01:00
Sergey Shambir
a3adcf752d
TradeWindow: fixed coding style
...
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
2013-02-23 13:51:21 +01:00
greye
ac7095537f
remove insertMesh() call on object cell change
2013-02-23 16:50:37 +04:00
greye
d983ed5c78
fix invalid SceneNode pointer on cell change
2013-02-23 16:45:55 +04:00
greye
9659b4a95e
update NpcAnimation inventory reference on cell change
2013-02-23 16:45:55 +04:00
Chris Robinson
b8f5813609
Set all animation sources at once
2013-02-23 03:34:03 -08:00
Chris Robinson
f841576bba
Don't override animations played with playgroup
2013-02-23 01:54:46 -08:00
scrawl
7e816c826b
Fix lights without a mesh
2013-02-23 09:17:12 +01:00
scrawl
f17ea109ca
Fix light positions
2013-02-23 04:06:05 +01:00
Chris Robinson
b12c6a4c16
Fix character preview
2013-02-22 11:16:00 -08:00
Chris Robinson
ecbf1568a1
Fix NPC part attachment
2013-02-22 10:15:29 -08:00
Chris Robinson
9dee2a72cd
Use a separate method to calculate animation velocity
2013-02-22 09:22:06 -08:00
Chris Robinson
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
2013-02-22 01:34:22 -08:00
Chris Robinson
84227caa0c
Cleanup Npc::getSpeed a little
2013-02-22 01:30:06 -08:00
Chris Robinson
7ec73c29f2
Do not return the player's Animation object for non-players
2013-02-22 01:27:26 -08:00
Chris Robinson
9c3af5f344
Do not interpret noclip mode as flying
2013-02-22 01:26:30 -08:00
lazydev
71e5369f04
Loading translation data for all the plugin files, not only for the first one
2013-02-22 02:18:54 +04:00
Chris Robinson
7fcca180b6
Implement rudimentary jumping
2013-02-20 20:08:04 -08:00
Chris Robinson
bbde0146a7
Merge remote-tracking branch 'zini/master' into animation2
2013-02-20 08:27:40 -08:00
Chris Robinson
4eb8ea0c95
Fix stepping and vertical force accumulation
2013-02-20 07:51:36 -08:00
Chris Robinson
b14def7c09
Set the character as being on the ground when colliding with a shallow enough slope
2013-02-20 05:24:38 -08:00
Chris Robinson
fe6fa9ebe7
Simplify newtrace a bit
2013-02-20 04:14:52 -08:00
Chris Robinson
617158afcd
Ensure updated skeleton bone placement matches in world space
...
Objects attached to actors (shirts, robes, etc) do not require the same node
hierarchy as the character root. So to ensure proper placement, we need to set
the bone target's derived transformation using the source bone's derived
transformation (which in turn means we need to work up from the root, to ensure
the bone's parents are properly placed).
2013-02-20 02:41:46 -08:00
Chris Robinson
cfdc820a1f
Make an actor fly when it has a levitate effect
2013-02-20 01:55:12 -08:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
Emanuel Guevel
43d6392921
Change the way pinnable window are made visible
...
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
2013-02-20 01:00:13 +01:00
Chris Robinson
8196694c08
Avoid applying the animation when resetting it
2013-02-19 06:04:25 -08:00
Chris Robinson
f8349a04bf
Use the looping portion of the animation to calculate the velocity
2013-02-19 05:26:58 -08:00
Chris Robinson
5d55b41714
Remove a now-unneeded(?) hack
2013-02-19 04:59:38 -08:00
Chris Robinson
89fabdb3a9
Update the PhysicActor's RigidBody when moving
...
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
2013-02-19 04:18:15 -08:00
Chris Robinson
1399a06c76
Update animation looping when setting the same state
2013-02-19 04:01:33 -08:00
Chris Robinson
a510adc572
Allow stepping when not being affected by gravity
2013-02-19 02:25:57 -08:00
Chris Robinson
8255a64bfe
Handle levitate and swift swim effects
2013-02-19 02:10:36 -08:00
Chris Robinson
c694161272
Don't try to step if not on the ground
2013-02-19 01:28:02 -08:00
Chris Robinson
5a1a0b7338
Add and use an MWWorld::isFlying method
2013-02-18 22:39:43 -08:00
Chris Robinson
17200cb226
Don't try to move when there's no speed
2013-02-18 20:43:55 -08:00
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
2013-02-19 04:03:24 +01:00
Chris Robinson
627b866744
Don't try to set a new state when dead
2013-02-18 06:29:16 -08:00
Chris Robinson
f2948ced23
Allow diagonal movement
2013-02-18 03:07:31 -08:00
Chris Robinson
bea460955d
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 16:03:39 -08:00
scrawl
b52df83d84
Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again
2013-02-17 20:23:22 +01:00
scrawl
52d0f0b750
Fixed OpAddItem, OpRemoveItem
2013-02-17 19:44:00 +01:00
scrawl
e1ca0a15ae
Add message box when item is added to player's inventory
2013-02-17 18:58:54 +01:00
scrawl
170a9762ac
Fix travel services not actually costing gold.
2013-02-17 18:30:21 +01:00
Marc Zinnschlag
31bfe62bbc
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 17:41:19 +01:00
scrawl
5a11ddc485
Pressing F1 again hides the quick keys menu.
2013-02-17 16:01:36 +01:00
scrawl
d899f33444
Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.
2013-02-17 16:00:31 +01:00
scrawl
00db13be32
Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.
2013-02-17 15:56:22 +01:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Marc Zinnschlag
44d66cbf5a
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 09:09:31 +01:00
Marc Zinnschlag
448293f270
Merge remote-tracking branch 'scrawl/bug_559' into next
2013-02-17 09:09:06 +01:00
Marc Zinnschlag
b8c0c94d5f
Merge remote-tracking branch 'wareya/master' into next
2013-02-17 08:58:41 +01:00
scrawl
c4f17f5596
playercontrols switch now disables activation in general (Chris' suggestion)
2013-02-17 03:03:41 +01:00
scrawl
373de19aee
Removed dialogue fix again, now on separate branch
2013-02-17 03:02:47 +01:00
scrawl
df8e502f8c
Ouch, I used && instead of &, this broke actions without a sound
2013-02-17 02:52:49 +01:00
Wareya
c98a815581
Remove debug printing from previous commit
2013-02-16 13:37:25 -05:00
Wareya
f0220fb06b
Implement "Rest Until Healed"
...
Fixes: https://bugs.openmw.org/issues/563
2013-02-16 13:35:03 -05:00
scrawl
a5c8d5748f
fix FailedAction.
2013-02-16 18:05:25 +01:00
scrawl
0bc34c1c0d
Action::executeImp returns a bool value to indicate if the sound should be played.
2013-02-16 16:40:44 +01:00
scrawl
7d918caa93
Don't allow dialogue if player controls are disabled.
2013-02-16 16:26:40 +01:00
Marc Zinnschlag
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
2013-02-16 14:50:42 +01:00
Douglas Mencken
eb09662f1d
Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead.
...
It is boost headers' job to deal with their internals.
2013-02-16 14:49:11 +01:00
Chris Robinson
158e18b98d
Remove an unused method
2013-02-16 00:30:07 -08:00
Chris Robinson
c965bd8e18
Increase step size to 30
2013-02-15 17:22:55 -08:00
scrawl
4da11a96a5
Fixed gold ref count always becoming 1 when dropped on the ground
2013-02-15 17:34:55 +01:00
Chris Robinson
c57001e3bd
Remove an unused field
2013-02-15 05:11:06 -08:00
Chris Robinson
e4341525c8
Add a jump state
...
Currently unused
2013-02-15 04:45:28 -08:00
Chris Robinson
ff0099fa6e
Scale the animation speed based on the animation velocity and movement speed
...
This may not be totoally correct since it takes the whole animation into
account, rather than just the looping portion. But it's good enough for now.
2013-02-15 02:15:39 -08:00
Chris Robinson
e1a1530774
Better implement Npc::getSpeed
2013-02-15 01:27:57 -08:00
Chris Robinson
3348e8a436
Clarify a comment
2013-02-14 22:41:14 -08:00
Chris Robinson
ac717373b1
Add a method to check if an object is on the ground
2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf
Use the PhysicActor's set/getOnGround method
2013-02-14 20:10:04 -08:00
Chris Robinson
15dc82f454
Increase step size to 15
2013-02-14 18:59:05 -08:00
Chris Robinson
a729b1b12a
Snap to the ground after moving
...
Depends on two factors:
* End up close enough above to a walkable plane (it's within sMaxStep units
down and is angled sMaxSlope or less)
* Started out on the ground without any upward movement
This also reduces the distance needed to be to the ground to 4 (from 10), and
ensures the actor is 2 units above the ground when on it. Downward force is
also removed when starting on the ground.
2013-02-14 18:34:51 -08:00
Chris Robinson
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
2013-02-12 18:14:46 -08:00
Marc Zinnschlag
5e3529783d
Merge remote-tracking branch 'ace/win-fixes' into next
2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
bbb845824d
Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__
2013-02-12 13:59:24 +01:00
Sergey Shambir
7d7a1119da
Fixed book text misalignment, at least in some cases
...
https://bugs.openmw.org/issues/284
2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5
BookTextParser: moved to Ogre::UTFString
...
Font height and unicode characters glyph width now accounted correctly.
2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668
BookTextParser: fixed infinitive loop
2013-02-12 11:14:30 +04:00
Marc Zinnschlag
1a079ec8d3
Merge branch 'master' into next
2013-02-11 19:53:51 +01:00
Marc Zinnschlag
64d9d9e2ce
Merge remote-tracking branch 'wheybags/master' into next
2013-02-10 17:29:28 +01:00
Tom Mason
c32c31f6d6
break after activating button
2013-02-10 15:41:02 +00:00
Tom Mason
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
2013-02-10 14:58:46 +00:00
Sergey Shambir
59808c3e10
GUI: Birth and Class dialogs now both select 1st item in list at first
...
time.
2013-02-10 08:59:38 +04:00
Sergey Shambir
725bfe6372
TradeWindow: balance now changes per time if user holds +/- button
...
pressed
2013-02-10 08:50:36 +04:00
