71d39c2fa0
Merge remote-tracking branch 'zini/master' into animations
12 years ago
e069215583
Don't clear the last queued animation when it stops
12 years ago
28f2a7d2b4
added missing column for clothing records
12 years ago
66f55b3178
Play the item up/down sound when readying/unreadying weapons
12 years ago
b459a010b0
Fix vec.z being applied while not in the air
12 years ago
3c5c10144a
Remove a duplicate showWeapons call
12 years ago
56b2b05f9a
Merge remote-tracking branch 'glorf/weather'
12 years ago
39c7bc8363
Corrected celestical object sizes
12 years ago
9fa2dd5277
Playing with moons part 2
12 years ago
e8661794fe
Avoid trying to find a state for non-actors.
...
They're only ever play idles, unless PlayGroup is called.
12 years ago
eba9d3e3ee
added missing columns for book record
12 years ago
fce9939f83
added missing columns for armor record
12 years ago
7c57f2c221
added AI-related actor columns
12 years ago
355f653614
Use AnimationAlloc instead of AnimationAllocatedObject
12 years ago
47a9a4cdff
Clean up a for loop
12 years ago
96e3b3b7c2
Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject
12 years ago
d684120f7a
Merge remote-tracking branch 'scrawl/master'
12 years ago
ac4fa1941d
Fix the frame update not getting called on the first frame
12 years ago
74d791e207
fixed auto calc column
12 years ago
897e55391d
added columns for tool IDs
12 years ago
52d81dc9fa
added columns for enchantments
12 years ago
822f130f79
Merge remote-tracking branch 'zini/master' into animations
12 years ago
8ec722ac92
Use std::find_if instead of ugly for loops
12 years ago
90bae2bead
do not create editors for unused columns
12 years ago
929b38ff6a
added missing columns for apparati records
12 years ago
f83ee5d316
Play ready/unready animations on the upper body
12 years ago
4d10a1c407
Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)
12 years ago
af191c7382
fixed AiWander arguments
12 years ago
a9928bb842
Split up the UpperBody group
...
Also recognize the [un]equip start and stop text keys.
12 years ago
70dc2f77ad
Move the priority enum to MWMechanics
12 years ago
7ba2508556
add a priority for death animations, and store it in the state list
12 years ago
c71d921f09
Moved signalUpdateEditorSettings from UserSettingsDialog to
...
UserSettings.
UserSettings is now derived from QObject.
12 years ago
144be59735
Changed enum names to match OpenMW naming conventions
12 years ago
7fd277b87a
added missing column for potions
12 years ago
4e389b5a8f
Store whether a given animation loops in the state table
12 years ago
bbb38c61cc
Fix queued animations
12 years ago
3988866ecd
Make sure active groups are updated after a state is auto-disabled
12 years ago
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.
12 years ago
9835c6df11
Merge remote-tracking branch 'scrawl/tradefix'
12 years ago
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.
12 years ago
88df3b980f
Implemented UserSettings as a singleton.
12 years ago
b56d50287e
Barter mechanic fix
12 years ago
e14cb6853f
Merge remote-tracking branch 'scrawl/containerui'
12 years ago
da92921387
added columns related to items in inventories
12 years ago
ee2bc94698
added script column
12 years ago
e24ecfd5d2
added name column
12 years ago
0c4a963132
Container UI rewrite
12 years ago
318ebe0cb6
added model column
12 years ago
8ef2d04007
added type column
12 years ago
c22f773f72
load all types of referenceable IDs
12 years ago
d715cf5431
replaced static adapter with a template
12 years ago
9426eda47a
small test with statics and two columns
12 years ago
02ace69511
fixed RefID search
12 years ago
d0b23a4786
Relocated "User Settings" to Edit->Preferences
...
Removed <QDebug> reference from view.hpp
12 years ago
a8b45e0a13
Three primary changes:
...
1. Declared QStringPair::isEmpty() const
2. Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3. Declared several classes as _noqt in CMakeLists.txt for OpenCS
12 years ago
6b8a687a79
Add methods to disable an animation
...
And rename WeaponState to WeaponType
12 years ago
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.
12 years ago
abc676eedd
Allow specifying which bone groups to play an animation on
12 years ago
56eede2610
Search more aggressively for an animation velocity
12 years ago
5a9c1e1245
Don't explicitly track the last position
12 years ago
7c3b014193
Figure out which animations to play based on priority
...
Bone group will also be taken into account later.
12 years ago
921f534980
Parameterize the number of bone groups
12 years ago
8a9b0eb5f7
Store the AnimSource in the animation state
12 years ago
6aaa8d6dc0
Fixed fading problem
12 years ago
9cc85cbe81
Playing with moons part 1
12 years ago
8d0f350446
New file structure separating view classes from model classes. Deleted
...
.ui file.
12 years ago
58efce5008
Rename animation layers to animation states
12 years ago
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).
12 years ago
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
12 years ago
d5490b0f8f
Fix an outdated comment
12 years ago
74ed1f73b4
Merge remote-tracking branch 'zini/master' into animations
12 years ago
5c99f15ad3
Merge remote-tracking branch 'torben/aiescort'
12 years ago
6417fa504e
Fixed constness
12 years ago
4928c9d079
Removed sqrt function call (minor optimization thanks to Chris)
12 years ago
d20178dd56
Removed unnecessary std::cout messages
12 years ago
133964f0e4
AIEscort complete
12 years ago
c03dca47f5
AIEscort implemented and working - only touchups are needed.
12 years ago
c605f15a15
Another weather cleanup
12 years ago
10840765d9
Framework - duration and pathing implemented, no waiting for follower yet.
12 years ago
51067698a8
minor cleanup
12 years ago
c80ffa0a16
Merge remote-tracking branch 'gus/AIFix'
12 years ago
90b7df439f
Fix image buttons
12 years ago
cb9c82324c
UserSettings system
12 years ago
f6203cac2a
update for master
12 years ago
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.
12 years ago
603af21715
little interface improvement
12 years ago
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
12 years ago
301efb411e
Fix exit crash
12 years ago
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
12 years ago
0f29ab8cf9
fixed the interface of the adapter class
12 years ago
f7f56a1a1f
added a RefIdCollection to Data
12 years ago
68f249e8f4
Small weather cleanup
12 years ago
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.
12 years ago
6a3ba41170
Don't store camera nodes, we don't need them.
12 years ago
90e29c83c0
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
12 years ago
007a3cf9bd
rename IInterface to Interface
12 years ago
b5071ced23
Removed using namespace
12 years ago
757a26794a
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
12 years ago
c6edb0288a
Remove unused file
12 years ago
1315432322
Handle @# links in journal
12 years ago
e9f1aac7bd
added data structures for referenceable records
12 years ago
d43adbaa7c
Topic link fixes for russian version, thanks to greye for testing
12 years ago
166eac2e25
Cleanup
12 years ago
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
12 years ago
38c399a698
Fix duplicate sounds
12 years ago
062ff189a2
Merge branch 'master' into memory
12 years ago
0f2866dc15
Text replace fix
12 years ago
48c5e33c79
Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.
12 years ago
a33e6b9c35
Fast forward to the last page in the journal when opening it
12 years ago
d16bb26a48
Added text colors, goodbye, message
12 years ago
f07497bbde
Fix lockup
12 years ago
78e6dab9d2
Dialogue history rewrite WIP
12 years ago
6cd28d1156
Fix a bug in getPCNextRank
12 years ago
0bb51fd91d
Retrieve the correct case for topics in the journal
12 years ago
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
12 years ago
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...
12 years ago
2e6594f8f7
Merge remote-tracking branch 'glorf/bugfix-5'
12 years ago
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)
12 years ago
517dfb4d75
Bugfix #732 part 2
12 years ago
13e7abd7df
added assign function to Record class
12 years ago
57f22c77c0
Bugfix #732 part 1
12 years ago
a8b1706678
init pointer value to prevent segfault
12 years ago
dcccfd9f22
Initialize values
12 years ago
1b84aeb5b9
fixed a problem with editing records that do not exist in base
12 years ago
28ef4d97da
Fixes Bug #734 'Book empty line problem'
...
Hides buttons 'Next' and 'Prev' at the last and at the first page
12 years ago
03a6190c5a
Merge remote-tracking branch 'zini/master' into animations
12 years ago
a120653c38
Implement handling weapon states
12 years ago
d5741c7141
Merge remote-tracking branch 'scrawl/master'
12 years ago
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a067422c397c
12 years ago
f8a331f173
fixed a bad cast
12 years ago
1acfd849a2
Fix a case folding bug
12 years ago
6f0ccb6e38
Merge remote-tracking branch 'scrawl/insertrecords'
12 years ago
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
12 years ago
40a0969055
Insert records that may not exist in vanilla MW
12 years ago
b8630239d7
Code cleanup
12 years ago
236ec3409f
Finished acrobatics
12 years ago
67422c397c
GetWindSpeed
12 years ago
5063d90dda
GetStartingAngle was implemented, but not registered
12 years ago
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
12 years ago
3c68c87923
Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries
12 years ago
8bc59f8fe6
Merge branch 'master' into journal
12 years ago
d01351431c
Merge remote-tracking branch 'zini/master' into animations
12 years ago
4b15da076b
Move getStateInfo into the character controller
12 years ago
d30e43784a
Fatigue decrease when jumping, live decrease when falling
12 years ago
5a8c1661be
Jump acrobatics working, started falling acrobatics implementation
12 years ago
1420a2cb33
Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.
12 years ago
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
12 years ago
add3cd6456
Advance acrobatics on jump
12 years ago
2a42556aa5
Merge branch 'master' into HEAD
12 years ago
61e476118d
Merge remote-tracking branch 'kcat/animations'
12 years ago
Chris Robinson
Marc Zinnschlag
Glorf
scrawl
Torben Carrington
graffy76
kpp
gus
greye