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
Sergey Shambir
bba024d6ad
Right mouse button click now stops Container GuiMode.
2013-02-10 08:37:45 +04:00
Chris Robinson
4ee5857bae
Filter accumulation axis for mLastPosition as needed
2013-02-09 19:09:56 -08:00
Chris Robinson
8d6f017f17
Remove an unneeded Animation field
2013-02-09 13:25:39 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Chris Robinson
f5afa43db5
Remove an unneeded parameter
2013-02-07 17:45:41 -08:00
Chris Robinson
d47d2216f2
Use some const references where appropriate
2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500
Remove unneeded playerMove from PhysicActor
2013-02-07 15:48:41 -08:00
Chris Robinson
ca6f8b6d88
Reorganize a bit of code in the movement solver
2013-02-07 13:18:16 -08:00
Chris Robinson
fe0e6c452d
Remove the unneeded playerMove object from PhysicsSystem
2013-02-07 12:11:10 -08:00
Nikolay Kasyanov
0d4b0bfd93
Trying to resolve sound issues on OS X with ffmpeg backend
2013-02-07 23:40:20 +04:00
Chris Robinson
8de2d24d0e
Restore old ground check
2013-02-06 21:57:59 -08:00
Chris Robinson
923d0d6eb4
Fix up some header includes
2013-02-06 21:47:09 -08:00
