riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04:00
Miroslav Puda
3cebb41459
missing break
2013-05-21 21:04:15 +02:00
Edmondo Tommasina
f0482dd796
dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘"
...
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
2013-05-20 23:51:01 +02:00
scrawl
d3effdf34c
Fix exception when trying to equip a shield while a lockpick is equipped
2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610
Security fixes
2013-05-20 12:42:11 +02:00
scrawl
2715520d6f
Cleanup Security class
2013-05-19 23:19:48 +02:00
scrawl
5173779f4b
Add sounds for security skill
2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
2013-05-17 06:21:59 -07:00
scrawl
d096b19307
Fix not being able to equip arrows/bolts
2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac
Don't show weapons in first-person
2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74
Use the PickProbe animation group as appropriate
2013-05-17 01:46:51 -07:00
Marc Zinnschlag
cc42b1ef48
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 20:07:48 +02:00
riothamus
d89dbde940
Bug 752, spacing fix
2013-05-16 14:05:22 -04:00
Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 19:52:14 +02:00
riothamus
36f1197b51
Bug 752, cleanup
2013-05-16 13:51:54 -04:00
riothamus
db981a72fe
Bug 752
2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179
Merge remote-tracking branch 'scrawl/persistence'
2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
Chris Robinson
6201cb0093
Add a method to clear the animation queue
2013-05-16 06:59:41 -07:00
Glorf
af28be915f
Use fallback video name
2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c
Bugfix #778
2013-05-16 13:35:28 +02:00
Chris Robinson
6c6200efef
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 16:34:51 -07:00
Marc Zinnschlag
9fee99d56c
Merge remote-tracking branch 'scrawl/master'
2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999
Some fixes
2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Chris Robinson
71d39c2fa0
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 06:36:06 -07:00
Chris Robinson
e069215583
Don't clear the last queued animation when it stops
2013-05-15 06:32:20 -07:00
Chris Robinson
66f55b3178
Play the item up/down sound when readying/unreadying weapons
2013-05-15 01:45:47 -07:00
Chris Robinson
b459a010b0
Fix vec.z being applied while not in the air
2013-05-14 23:03:28 -07:00
Chris Robinson
3c5c10144a
Remove a duplicate showWeapons call
2013-05-14 19:38:57 -07:00
Marc Zinnschlag
56b2b05f9a
Merge remote-tracking branch 'glorf/weather'
2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363
Corrected celestical object sizes
2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277
Playing with moons part 2
2013-05-14 19:58:08 +02:00
Chris Robinson
e8661794fe
Avoid trying to find a state for non-actors.
...
They're only ever play idles, unless PlayGroup is called.
2013-05-14 07:29:07 -07:00
Chris Robinson
355f653614
Use AnimationAlloc instead of AnimationAllocatedObject
2013-05-14 01:30:01 -07:00
Chris Robinson
47a9a4cdff
Clean up a for loop
2013-05-14 01:29:15 -07:00
scrawl
96e3b3b7c2
Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject
2013-05-13 21:03:53 +02:00
Marc Zinnschlag
d684120f7a
Merge remote-tracking branch 'scrawl/master'
2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d
Fix the frame update not getting called on the first frame
2013-05-13 20:08:12 +02:00
Chris Robinson
822f130f79
Merge remote-tracking branch 'zini/master' into animations
2013-05-13 04:09:56 -07:00
Chris Robinson
8ec722ac92
Use std::find_if instead of ugly for loops
2013-05-13 04:08:36 -07:00
Chris Robinson
f83ee5d316
Play ready/unready animations on the upper body
2013-05-13 03:32:00 -07:00
Torben Carrington
4d10a1c407
Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)
2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382
fixed AiWander arguments
2013-05-13 11:27:36 +02:00
Chris Robinson
a9928bb842
Split up the UpperBody group
...
Also recognize the [un]equip start and stop text keys.
2013-05-13 02:09:22 -07:00
Chris Robinson
70dc2f77ad
Move the priority enum to MWMechanics
2013-05-13 00:54:44 -07:00
Chris Robinson
7ba2508556
add a priority for death animations, and store it in the state list
2013-05-12 19:19:21 -07:00
Chris Robinson
4e389b5a8f
Store whether a given animation loops in the state table
2013-05-12 05:59:39 -07:00
Chris Robinson
bbb38c61cc
Fix queued animations
2013-05-12 05:08:01 -07:00
Chris Robinson
3988866ecd
Make sure active groups are updated after a state is auto-disabled
2013-05-12 04:34:37 -07:00
Chris Robinson
2c556e4036
Be smarter about handling non-moving animations
...
Don't rely on being told by the play method, so the animation can
automatically change without impacting the character controller.
2013-05-12 04:29:42 -07:00
Marc Zinnschlag
9835c6df11
Merge remote-tracking branch 'scrawl/tradefix'
2013-05-12 12:58:32 +02:00
Chris Robinson
4ea347ac52
Use shared pointers to store animation sources
...
This ensures references to the sources stay valid as long it the object
is, rather than becoming invalidated whenever one is added or removed.
2013-05-11 19:38:23 -07:00
scrawl
b56d50287e
Barter mechanic fix
2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f
Merge remote-tracking branch 'scrawl/containerui'
2013-05-11 19:23:02 +02:00
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
Chris Robinson
6b8a687a79
Add methods to disable an animation
...
And rename WeaponState to WeaponType
2013-05-10 22:22:39 -07:00
Chris Robinson
6605aa7dec
Create three bone groups
...
This still won't work as expected. Currently there is only one priority level,
and only one animation state per priority level can be active at a time.
It's close, though.
2013-05-10 20:45:09 -07:00
Chris Robinson
abc676eedd
Allow specifying which bone groups to play an animation on
2013-05-10 20:05:09 -07:00
Chris Robinson
56eede2610
Search more aggressively for an animation velocity
2013-05-10 19:31:33 -07:00
Chris Robinson
5a9c1e1245
Don't explicitly track the last position
2013-05-10 18:58:14 -07:00
Chris Robinson
7c3b014193
Figure out which animations to play based on priority
...
Bone group will also be taken into account later.
2013-05-10 18:37:44 -07:00
Chris Robinson
921f534980
Parameterize the number of bone groups
2013-05-10 16:35:43 -07:00
Chris Robinson
8a9b0eb5f7
Store the AnimSource in the animation state
2013-05-10 15:27:29 -07:00
Glorf
6aaa8d6dc0
Fixed fading problem
2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81
Playing with moons part 1
2013-05-10 18:55:56 +02:00
Chris Robinson
58efce5008
Rename animation layers to animation states
2013-05-10 04:01:30 -07:00
Chris Robinson
ccff364b52
Use a map of active layers instead of an array
...
A bit of an upheaval. Each animation is now a "layer", instead of each layer
having an animation. Incidentally, this is much closer to how Ogre handles
animation states.
In the future, each layer will have a priority, which will be used to determine
which one affects a given bone group (which we currently only have one of).
2013-05-10 03:08:07 -07:00
kpp
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
Chris Robinson
d5490b0f8f
Fix an outdated comment
2013-05-09 23:07:50 -07:00
Chris Robinson
74ed1f73b4
Merge remote-tracking branch 'zini/master' into animations
2013-05-09 13:53:38 -07:00
Marc Zinnschlag
5c99f15ad3
Merge remote-tracking branch 'torben/aiescort'
2013-05-09 14:27:22 +02:00
Glorf
6417fa504e
Fixed constness
2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079
Removed sqrt function call (minor optimization thanks to Chris)
2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56
Removed unnecessary std::cout messages
2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4
AIEscort complete
2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5
AIEscort implemented and working - only touchups are needed.
2013-05-08 17:19:47 -07:00
Glorf
c605f15a15
Another weather cleanup
2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9
Framework - duration and pathing implemented, no waiting for follower yet.
2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8
minor cleanup
2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16
Merge remote-tracking branch 'gus/AIFix'
2013-05-08 20:31:57 +02:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02:00
Chris Robinson
8e38dc410f
Allow loading multiple animation sources
...
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
2013-05-07 16:59:32 -07:00
gus
603af21715
little interface improvement
2013-05-07 19:42:21 +01:00
gus
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
2013-05-07 19:35:10 +01:00
scrawl
301efb411e
Fix exit crash
2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
Glorf
68f249e8f4
Small weather cleanup
2013-05-07 10:27:37 +02:00
Chris Robinson
e85bc8b2cd
Only load one Nif for Animation objects
...
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170
Don't store camera nodes, we don't need them.
2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd
rename IInterface to Interface
2013-05-06 16:05:56 +02:00
scrawl
b5071ced23
Removed using namespace
2013-05-06 16:04:28 +02:00
scrawl
757a26794a
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a
Remove unused file
2013-05-06 15:30:23 +02:00
scrawl
1315432322
Handle @# links in journal
2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c
Topic link fixes for russian version, thanks to greye for testing
2013-05-06 13:13:14 +02:00
scrawl
166eac2e25
Cleanup
2013-05-06 11:31:34 +02:00
gus
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
2013-05-06 00:46:50 +01:00
scrawl
38c399a698
Fix duplicate sounds
2013-05-05 10:51:17 +02:00
scrawl
062ff189a2
Merge branch 'master' into memory
2013-05-04 23:04:33 +02:00
scrawl
0f2866dc15
Text replace fix
2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79
Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.
2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35
Fast forward to the last page in the journal when opening it
2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48
Added text colors, goodbye, message
2013-05-04 15:15:44 +02:00
scrawl
f07497bbde
Fix lockup
2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156
Fix a bug in getPCNextRank
2013-05-04 12:28:12 +02:00
scrawl
0bb51fd91d
Retrieve the correct case for topics in the journal
2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +02:00
gus
7fe7111c19
Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...
2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7
Merge remote-tracking branch 'glorf/bugfix-5'
2013-05-03 14:55:00 +02:00
scrawl
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75
Bugfix #732 part 2
2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0
Bugfix #732 part 1
2013-05-03 12:44:27 +02:00
greye
a8b1706678
init pointer value to prevent segfault
2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22
Initialize values
2013-05-02 22:43:21 +04:00
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
Chris Robinson
03a6190c5a
Merge remote-tracking branch 'zini/master' into animations
2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38
Implement handling weapon states
2013-05-01 10:19:16 -07: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 089ef7a2a067422c397c
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
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
scrawl
3c68c87923
Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries
2013-05-01 10:28:59 +02:00
scrawl
8bc59f8fe6
Merge branch 'master' into journal
2013-05-01 08:27:42 +02:00
Chris Robinson
d01351431c
Merge remote-tracking branch 'zini/master' into animations
2013-04-30 19:27:55 -07:00
Chris Robinson
4b15da076b
Move getStateInfo into the character controller
2013-04-30 19:26:41 -07: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
scrawl
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +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
Chris Robinson
05060e57ec
Add a weapon state to the character controller
2013-04-29 13:07:49 -07: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
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
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
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
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
Marc Zinnschlag
29cb076113
Merge remote-tracking branch 'scrawl/rank'
2013-04-22 09:52:28 +02:00
Marc Zinnschlag
3fa35af796
Merge remote-tracking branch 'scrawl/master'
2013-04-22 09:52:24 +02:00
Chris Robinson
a7776e124c
Only set mNonAccumRoot from mSkelBase
2013-04-22 00:22:31 -07:00
Chris Robinson
a3511c62cf
Don't store textkeys in user object bindings
...
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.
Plus, proper serialization can help for future optimizations.
2013-04-22 00:01:30 -07:00
scrawl
56b871e362
Rank condition should always fail if NPC is not in a faction
2013-04-22 07:57:53 +02:00
Chris Robinson
2345b5e8b3
Avoid storing text keys for each animation
2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6
Don't clip out the group name from the textkeys
2013-04-21 22:13:49 -07:00
Chris Robinson
6c85d6763a
Pass "loop stop" to the character controller
2013-04-21 18:38:25 -07:00
Chris Robinson
d7c9df16f8
Store the current animation group
2013-04-21 18:32:34 -07:00
scrawl
8bf1149cec
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-21 21:24:48 +02:00
Nathan Jeffords
19325f9d40
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-21 11:41:09 -07:00
Chris Robinson
835ff8eb1e
Avoid creating an AnimationValue per ObjectList
2013-04-20 17:13:27 -07:00
Chris Robinson
4122b0b55f
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-20 00:25:00 -07:00
scrawl
a8e3acd6c4
Fix consecutive dialogue choices
2013-04-19 17:57:22 +02:00
Marc Zinnschlag
f13b0c884f
hotfix for CharacterPreview destructor
2013-04-19 14:41:26 +02:00
Chris Robinson
50bb92beb3
Use a method to set the visibility flags and render queue.
2013-04-19 02:01:50 -07:00
Marc Zinnschlag
9c1e280614
Merge remote-tracking branch 'scrawl/master'
2013-04-19 00:23:24 +02:00
Chris Robinson
434f3ac8c8
Merge remote-tracking branch 'zini/next' into nifogre
2013-04-18 15:14:28 -07:00
scrawl
ef9afeb53e
Auto calculate attributes if there are not specified in the NPC record
2013-04-18 23:51:43 +02:00
Marc Zinnschlag
1b764e5d3c
Merge remote-tracking branch 'gus/AI'
2013-04-18 22:17:49 +02:00
Glorf
f9deb593d1
Bugfix #578
2013-04-18 21:37:58 +02:00
gus
c753eb4c28
another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat
2013-04-18 18:35:01 +01:00
scrawl
3c5e4ceefd
Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)
2013-04-18 16:46:32 +02:00
Chris Robinson
6d59325bff
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-17 23:21:17 -07:00
Britt Mathis
1dff1fabdb
Fixed race.cpp
2013-04-17 19:38:13 -04:00
Britt Mathis
7eee86ab66
No more using namespace
2013-04-17 18:56:48 -04:00
scrawl
c519fc360d
Move away from fixed record names for body parts
2013-04-18 00:19:34 +02:00
scrawl
0341a9e778
Fix a gcc 4.8 warning
2013-04-17 20:57:22 +02:00
scrawl
547f77031d
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again
2013-04-17 17:06:30 +02:00
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
2013-04-17 12:04:05 +02:00
Marc Zinnschlag
5bbab1abd9
Merge remote-tracking branch 'galdor557/master'
2013-04-17 09:52:58 +02:00
Britt Mathis
60fadaeaf0
Cleaned up includes in implementation files
2013-04-16 20:16:22 -04:00
Glorf
e3a9f73eb6
Improved getangle script behaviour
2013-04-16 21:40:34 +02:00
Glorf
1fd59d0ce0
Removed useless include
2013-04-16 21:21:54 +02:00
Glorf
1e92ffc314
Added rotation layer
2013-04-16 21:17:19 +02:00
Chris Robinson
cac793758b
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-16 11:52:19 -07:00
Chris Robinson
4ce98e9bd6
Store iterators for start and stop keys
2013-04-15 20:37:10 -07:00
