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
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
98baf9fac1
Bugfix #718
2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14
More fixes
2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02
Put door physics in a separate method, some fixes
2013-04-28 15:36:37 +02:00
Marc Zinnschlag
cd61177eed
Merge remote-tracking branch 'gus/renderWeaponShield'
2013-04-28 15:00:47 +02:00
scrawl
9343b4459e
Opening doors
2013-04-28 14:59:15 +02:00
Marc Zinnschlag
a6b7f8e904
Merge remote-tracking branch 'scrawl/fall'
2013-04-28 14:14:10 +02:00
Marc Zinnschlag
93c98e1df4
Merge remote-tracking branch 'scrawl/athletics'
2013-04-28 14:11:12 +02:00
Marc Zinnschlag
738a54337d
removed redundant case smashing
2013-04-28 14:07:53 +02:00
gus
3d9ceede77
little fix (weapons disapeared when tab was pressed)
2013-04-28 12:33:41 +01:00
gus
5388c25e64
Fix or lockpicks.
2013-04-28 11:55:50 +01:00
gus
766d1efa84
Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out.
2013-04-28 11:41:01 +01:00
scrawl
7d61459ccd
Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway.
2013-04-28 11:13:21 +02:00
scrawl
fdf80c1c4f
Fix unused variable
2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4
Fix changeWeather
2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1
Avoid special-casing player rotation
2013-04-28 01:14:58 -07:00
scrawl
07891fa213
Athletics skill increase
2013-04-28 07:53:04 +02:00
Glorf
3669d0a998
Bugfix #742
2013-04-27 20:57:44 +02:00
Chris Robinson
ab52e68c05
Merge remote-tracking branch 'zini/master' into animations
2013-04-27 05:16:15 -07:00
Chris Robinson
137017b325
Don't allow forcing vanity mode
2013-04-27 01:24:36 -07:00
Glorf
ade871ce12
Corrected unused opcodes
2013-04-26 17:31:58 +02:00
Glorf
89f7ef2472
Move, moveworld script instructions
2013-04-26 17:28:19 +02:00
Marc Zinnschlag
32138dbb0f
silenced a warning
2013-04-26 13:33:47 +02:00
Chris Robinson
2822f431c4
Merge remote-tracking branch 'zini/master' into animations
2013-04-26 01:38:51 -07:00
Chris Robinson
b666f1d551
Work around a problem with MWRender::Player::renderPlayer
...
NpcAnimation::setViewMode makes a call to the character controller, in the
mechanics manager, to forcefully update the character's state. This in turn
makes a call to the player's old NpcAniamtion object that was just deleted.
The mechanics manager will eventually remove and reinsert the player, so the
old character controller will be removed and a new one will get the right
Animation object again, but not in time for the setViewMode call.
There's many factors that all contribute to this run-around, which needs
discussion on how to best fix.
2013-04-26 01:30:36 -07:00
Chris Robinson
55ee4e65a9
Clean up the slotlist struct
2013-04-25 23:42:20 -07:00
scrawl
7821610ec6
Make OnDeath work with explicit reference
2013-04-26 02:08:53 +02:00
scrawl
a373f53988
Added SetAtStart
2013-04-26 02:02:51 +02:00
Marc Zinnschlag
4e45222a63
Merge remote-tracking branch 'glorf/rotate-update1'
2013-04-25 20:57:24 +02:00
Glorf
240217ae42
Fixed rotations more than 360 degrees
2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c
Merge remote-tracking branch 'glorf/rotate-update1'
2013-04-25 20:22:40 +02:00
Glorf
7cd4dd0c91
Improved local rotations
2013-04-25 19:14:10 +02:00
Chris Robinson
274f3c7b77
Force character state to update after switching view modes
2013-04-25 07:08:11 -07:00
Chris Robinson
e4eb4b7e30
Keep track of the character looping state
2013-04-25 06:29:17 -07:00
Chris Robinson
9da2c9153e
Don't store the animation group string in the character controller
2013-04-25 06:12:37 -07:00
Chris Robinson
849335d8cc
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-25 05:35:33 -07:00
Chris Robinson
2769adcee0
Implement switching to and from first-person animations
...
Note that the current animation gets interrupted, so switching to first person
may break movement until you stop and try to move again. This can be fixed by
alerting the character controller in the mechanics manager to force a state
update when switching POV.
2013-04-25 05:23:05 -07:00
Chris Robinson
9a2a32f2a5
Add a method to clear all Animation sources except the first
...
The first needs to remain, since that's where any mSkelBase entity comes from,
and where any retrieved nodes are from.
2013-04-25 05:02:11 -07:00
Chris Robinson
9be20b90f1
Fix potential infinite loop when layer 0 is empty
2013-04-25 03:35:40 -07:00
Marc Zinnschlag
08e2254628
Merge remote-tracking branch 'pvdk/spacefix'
2013-04-25 12:15:35 +02:00
pvdk
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
2013-04-25 11:04:12 +02:00
Chris Robinson
76c8e81908
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-25 01:35:21 -07:00
Marc Zinnschlag
247a76766d
fixed a typo in a doxygen comment
2013-04-25 10:27:43 +02:00
Marc Zinnschlag
71fc8f5830
Merge remote-tracking branch 'scrawl/item' into next
2013-04-25 10:21:14 +02:00
Chris Robinson
86fda1bff6
Only set mSkelBase from the first objectlist
2013-04-25 00:52:26 -07:00
Chris Robinson
7eac37be23
Make sure the old layer is cleared before starting the next
2013-04-25 00:18:02 -07:00
Chris Robinson
09fc50948b
Add methods to disable and get info for a layer
2013-04-25 00:08:16 -07:00
Chris Robinson
24f1eba902
Keep track of whether an animation supplies movement
...
Also handle it when it doesn't.
2013-04-24 22:45:43 -07:00
Nathan Jeffords
7db6447a00
dropped the I infront of the journal view model interfaces
2013-04-24 21:53:25 -07:00
Nathan Jeffords
36a6806faf
drop the leading 'I' from the book page control interfaces
2013-04-24 21:44:29 -07:00
Nathan Jeffords
4c22afc29b
made a pass at conforming to established naming convention
2013-04-24 20:22:57 -07:00
Nathan Jeffords
c7ede9b523
port code to C++03
2013-04-24 20:22:57 -07:00
Nathan Jeffords
718af692c9
reworked journal to match bethesda's implemenation
2013-04-24 20:20:01 -07:00
Nathan Jeffords
f02a53b121
Created a helper class to format books for display from the journal
...
view-model data.
2013-04-24 20:20:01 -07:00
Nathan Jeffords
50d688c2fc
Created a view-model to present journal data to the UI in the form it
...
intends to display it.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
55ca037411
Created a MyGUI widget to present a page of formatted text.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
8dad04eef1
hid JournalWindow behind IJournalWindow interface, and put its entire
...
implementation, class definition and all, into journalwindow.cpp
2013-04-24 20:20:00 -07:00
scrawl
9e3917881d
Don't fail on nonexistent items in a levelled list
2013-04-25 04:44:30 +02:00
Chris Robinson
0817d59f23
Allow specifying where to start in an animation
2013-04-24 19:09:36 -07:00
scrawl
933f894148
Added Blind and Night Eye effects
2013-04-25 02:31:51 +02:00
scrawl
baa7a9160c
Rank condition should always fail if NPC is not in a faction
2013-04-25 02:31:39 +02:00
scrawl
a7092ef2d7
Fix activation not working sometimes
...
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
2013-04-25 02:31:39 +02:00
Nathan Jeffords
2dc01fe56b
fixed the type of iterator uses in MWWorld::Store
...
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
2013-04-25 02:31:39 +02:00
scrawl
51580ead4f
Fix consecutive dialogue choices
2013-04-25 02:31:39 +02:00
Marc Zinnschlag
87ce2110dc
hotfix for CharacterPreview destructor
2013-04-25 02:31:38 +02:00
scrawl
cd57e3f896
Auto calculate attributes if there are not specified in the NPC record
2013-04-25 02:31:38 +02:00
Glorf
53fb17da10
Rotation system fixes
2013-04-24 21:42:04 +02:00
Chris Robinson
333354fe62
Remove the character controller from the Animation class
2013-04-24 07:10:41 -07:00
Chris Robinson
b80891099e
Don't use the character controller to handle text keys
...
The Animation class has the Ptr and can call to whatever subsystem is needed.
2013-04-24 06:48:34 -07:00
Chris Robinson
e8cabc9434
Pass the loop count from loopgroup to the play method
...
Instead of queueing each iteration separately.
2013-04-24 06:32:11 -07:00
Chris Robinson
b482d5be09
Add a method to check if a given layer is playing
2013-04-24 05:23:45 -07:00
Chris Robinson
c58dfbe921
Specify the loop count to Animation::play
2013-04-24 04:56:39 -07:00
Chris Robinson
7241267d5c
Make an AnimationValue for each animation layer
2013-04-24 04:41:52 -07:00
Chris Robinson
102b3bdef9
Update position by reference
2013-04-24 01:57:51 -07:00
Chris Robinson
9e05ee53da
Avoid looking for the controller if there is no NonAccum node
...
Also, make sure there is a controller before updating the position.
2013-04-24 01:18:08 -07:00
Chris Robinson
544011e096
Fix 'start' text key fallback lookup
2013-04-24 00:40:58 -07:00
Chris Robinson
7e2995bc2f
Fix setting up active controllers
2013-04-23 19:43:26 -07:00
Chris Robinson
6a67a5e650
Merge remote-tracking branch 'zini/next' into nifogre
2013-04-23 16:57:48 -07:00
Chris Robinson
8c9e2e0ee9
Improve handling of reaching the stop animation text key
2013-04-23 05:34:08 -07:00
Chris Robinson
c4806f01f8
Use a separate list of controllers to update
...
This should make it easier to figure out what controllers need to be updated
for various animation sources and layers.
2013-04-23 04:08:09 -07:00
greye
cfccf0981d
update IndexedStore::setUp() for multiple datafile support
2013-04-23 14:36:38 +04:00
Chris Robinson
e4c5aac966
Keep track of the animation layers a given object list is animating on
...
This only tracks layers they explicitly animate on. They may animate on other
layers as well, if nothing else is animating on them.
2013-04-23 02:48:11 -07:00
Chris Robinson
e378176937
Don't update controllers that have already been updated
2013-04-23 00:15:31 -07:00
Chris Robinson
8782ae6976
Separate some Animation fields into a separate AnimLayer class
2013-04-22 23:52:28 -07:00
Chris Robinson
c3ce49798a
Fix animation velocity calculation
2013-04-22 21:34:39 -07:00
Chris Robinson
7279e015e9
Search the textkeys to check if an animation group exists
2013-04-22 20:59:55 -07:00
Chris Robinson
a2fc43c7df
Use reset to check that the animation exists and has the right markers
2013-04-22 20:41:54 -07:00
Chris Robinson
507d72ede5
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-22 18:44:28 -07:00
Chris Robinson
bb64efc18e
Improve looping behavior
2013-04-22 05:08:52 -07:00
Chris Robinson
cc70c6263b
Use the NodeTargetValue for the NonAccum root
2013-04-22 04:10:46 -07:00
Chris Robinson
9485a4aa6d
Look through the whole animation stack to find the "velocity"
2013-04-22 01:40:41 -07:00
