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
scrawl
427152c518
Disabled ripples until we can properly trigger them from the new character controller.
2013-02-19 03:15:31 +01:00
scrawl
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
2013-02-19 03:08:00 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +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
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01: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
scrawl
791d16bbdb
Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes
2013-02-17 18:12:38 +01:00
Marc Zinnschlag
31bfe62bbc
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 17:41:19 +01:00
scrawl
7ffcfa3622
Water and clouds no longer depend on timescale.
2013-02-17 16:23:55 +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
