kpp
28ef4d97da
Fixes Bug #734 'Book empty line problem'
...
Hides buttons 'Next' and 'Prev' at the last and at the first page
2013-05-02 07:35:25 +04:00
Marc Zinnschlag
d5741c7141
Merge remote-tracking branch 'scrawl/master'
2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a0
, reversing
changes made to 67422c397c
.
2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2
Fix a case folding bug
2013-05-01 16:38:16 +02:00
Marc Zinnschlag
fe038cef03
turned redeclartion of local variables from an error into a warning
2013-05-01 14:20:09 +02:00
Marc Zinnschlag
63407a662c
allow <== and >== as alternative for <= and >= in scripts
2013-05-01 14:08:05 +02:00
Marc Zinnschlag
6f0ccb6e38
Merge remote-tracking branch 'scrawl/insertrecords'
2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
2013-05-01 13:44:23 +02:00
scrawl
40a0969055
Insert records that may not exist in vanilla MW
2013-05-01 12:47:50 +02:00
Glorf
b8630239d7
Code cleanup
2013-05-01 12:25:02 +02:00
Glorf
236ec3409f
Finished acrobatics
2013-05-01 12:21:59 +02:00
scrawl
67422c397c
GetWindSpeed
2013-05-01 11:42:24 +02:00
scrawl
5063d90dda
GetStartingAngle was implemented, but not registered
2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
2013-05-01 11:15:43 +02:00
Glorf
d30e43784a
Fatigue decrease when jumping, live decrease when falling
2013-04-30 23:39:56 +02:00
Glorf
5a8c1661be
Jump acrobatics working, started falling acrobatics implementation
2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33
Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.
2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
2013-04-30 20:26:59 +02:00
Glorf
add3cd6456
Advance acrobatics on jump
2013-04-30 18:22:59 +02:00
Marc Zinnschlag
61e476118d
Merge remote-tracking branch 'kcat/animations'
2013-04-30 10:25:26 +02:00
Marc Zinnschlag
2cb7e1f3d5
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-30 10:24:02 +02:00
scrawl
c0dd383cd0
Fix door collision to work with all possible movement directions
2013-04-30 09:43:32 +02:00
Glorf
d283f8d85f
Bugfix #748
2013-04-29 21:19:13 +02:00
Chris Robinson
020e3e8a8e
Show the equipped weapon in the inventory screen
...
And use the proper pose based on what's equipped.
2013-04-29 12:08:43 -07:00
Chris Robinson
854de1c6c1
Make sure the weapon is in the proper group
2013-04-29 11:43:37 -07:00
Chris Robinson
15a2eeebb8
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-04-29 10:16:29 -07:00
Chris Robinson
063322b081
Declare some variables closer to where they're used
2013-04-29 10:12:50 -07:00
Chris Robinson
0cf531ba12
Make sure to update parts when the weapon changes
2013-04-29 09:53:36 -07:00
Marc Zinnschlag
93868c8bca
Merge remote-tracking branch 'scrawl/master'
2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6
Enabled collision when new game
2013-04-29 17:56:16 +02:00
Chris Robinson
a15758ac85
Fix preview and vanity cameras
2013-04-29 08:48:45 -07:00
Glorf
6222b3f52a
Bugfix #744
2013-04-29 17:19:20 +02:00
Chris Robinson
d17e1e83d5
Rename MWRender's Player to Camera
2013-04-29 05:50:40 -07:00
Chris Robinson
dbba126344
Use a method to check if the view should be first person
2013-04-29 04:40:28 -07:00
scrawl
d5c7a26041
Fix broken loose file resources when using Ogre 1.9
2013-04-29 12:32:24 +02:00
Chris Robinson
bb8277920b
Manage the player's NpcAnimation object in the RenderingManager
...
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
2013-04-29 03:31:46 -07:00
scrawl
6c5ea1ea7a
Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes
2013-04-29 12:05:10 +02:00
scrawl
5ff098b8fb
Fix quick keys being triggered when in UI mode
2013-04-29 11:55:30 +02:00
scrawl
867c7db014
Fix wrong door sounds
2013-04-29 11:00:15 +02:00
scrawl
9648804af5
Fix terrain material leak, this should in theory allow the terrain to free its temporary resources
2013-04-29 10:20:38 +02:00
scrawl
78596cad83
Fix enchantment points value
2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b
Don't store the player base node in MWRender::Player
2013-04-28 23:44:44 -07:00
Chris Robinson
4cedf0fbab
Avoid colliding with AvoidNodes
...
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
2013-04-28 11:12:55 -07:00
Chris Robinson
24e503330b
Merge remote-tracking branch 'zini/master' into animations
2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034
Merge remote-tracking branch 'scrawl/doors'
2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1
Fix some doors
2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-28 16:52:48 +02:00
Marc Zinnschlag
116ac05677
Merge remote-tracking branch 'scrawl/doors'
2013-04-28 16:44:11 +02:00
Glorf
6ea82333d4
Headers cleanup
2013-04-28 16:38:33 +02:00