mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 23:26:41 +00:00
Code Issues Releases Wiki Activity
7031 commits 115 branches 76 tags 128 MiB
Commit graph

7031 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marc Zinnschlag
667b7d94e3 Merge remote-tracking branch 'axujen/master' 2013-05-13 14:56:09 +02:00
Marc Zinnschlag
74d791e207 fixed auto calc column 2013-05-13 14:07:31 +02:00
Axujen
56d8ca8434 Add link to Development Environment Setup in the readme. 
Point people who need to build this from source in the right direction.
 2013-05-13 11:40:50 +00:00
Marc Zinnschlag
897e55391d added columns for tool IDs 2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa added columns for enchantments 2013-05-13 13:11:43 +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
Marc Zinnschlag
90bae2bead do not create editors for unused columns 2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a added missing columns for apparati records 2013-05-13 12:51:27 +02: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
e2620a1edf Issue #694: allow float literals starting with . 2013-05-13 11:38:35 +02: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
graffy76
c71d921f09 Moved signalUpdateEditorSettings from UserSettingsDialog to 
UserSettings.

UserSettings is now derived from QObject.
 2013-05-12 15:15:57 -05:00
graffy76
144be59735 Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
Marc Zinnschlag
7fd277b87a added missing column for potions 2013-05-12 15:50:29 +02: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
graffy76
88df3b980f Implemented UserSettings as a singleton. 2013-05-11 20:55:36 -05: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
Marc Zinnschlag
da92921387 added columns related to items in inventories 2013-05-11 19:21:16 +02:00
Marc Zinnschlag
ee2bc94698 added script column 2013-05-11 18:57:23 +02:00
Marc Zinnschlag
e24ecfd5d2 added name column 2013-05-11 18:43:16 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Marc Zinnschlag
318ebe0cb6 added model column 2013-05-11 18:35:48 +02:00
Marc Zinnschlag
8ef2d04007 added type column 2013-05-11 17:49:38 +02:00
Marc Zinnschlag
c22f773f72 load all types of referenceable IDs 2013-05-11 17:45:28 +02:00
Marc Zinnschlag
d715cf5431 replaced static adapter with a template 2013-05-11 17:34:18 +02:00
Marc Zinnschlag
9426eda47a small test with statics and two columns 2013-05-11 17:01:16 +02:00
Marc Zinnschlag
02ace69511 fixed RefID search 2013-05-11 16:55:10 +02:00
graffy76
d0b23a4786 Relocated "User Settings" to Edit->Preferences 
Removed <QDebug> reference from view.hpp
 2013-05-11 07:40:10 -05:00
graffy76
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
 2013-05-11 05:55:46 -05: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