mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Code Issues Releases Wiki Activity
5678 commits 38 branches 54 tags 122 MiB
Commit graph

4010 commits

Author SHA1 Message Date
scrawl
52d0f0b750 Fixed OpAddItem, OpRemoveItem 2013-02-17 19:44:00 +01:00
Marc Zinnschlag
abd307d70e Issue #567: workaround for crash with non-English ESX files 2013-02-17 19:26:01 +01:00
scrawl
e1ca0a15ae Add message box when item is added to player's inventory 2013-02-17 18:58:54 +01:00
scrawl
170a9762ac Fix travel services not actually costing gold. 2013-02-17 18:30:21 +01:00
Marc Zinnschlag
31bfe62bbc Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 17:41:19 +01:00
Marc Zinnschlag
9221c861c5 Merge remote-tracking branch 'graffy76/next' into next 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-17 17:38:33 +01:00
Marc Zinnschlag
bb990b96bf Merge branch 'globaltype' into next 2013-02-17 17:27:41 +01:00
Marc Zinnschlag
50d61a5b6e proper implementation of gmst type column 2013-02-17 17:27:25 +01:00
scrawl
5a11ddc485 Pressing F1 again hides the quick keys menu. 2013-02-17 16:01:36 +01:00
scrawl
d899f33444 Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now. 2013-02-17 16:00:31 +01:00
scrawl
00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 2013-02-17 15:56:22 +01:00
graffy76
ceefae81e8 fix for the opencs icon 2013-02-17 07:46:50 -06:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
Marc Zinnschlag
44d66cbf5a Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 09:09:31 +01:00
Marc Zinnschlag
448293f270 Merge remote-tracking branch 'scrawl/bug_559' into next 2013-02-17 09:09:06 +01:00
Marc Zinnschlag
b8c0c94d5f Merge remote-tracking branch 'wareya/master' into next 2013-02-17 08:58:41 +01:00
scrawl
c4f17f5596 playercontrols switch now disables activation in general (Chris' suggestion) 2013-02-17 03:03:41 +01:00
scrawl
373de19aee Removed dialogue fix again, now on separate branch 2013-02-17 03:02:47 +01:00
scrawl
df8e502f8c Ouch, I used && instead of &, this broke actions without a sound 2013-02-17 02:52:49 +01:00
Wareya
c98a815581 Remove debug printing from previous commit 2013-02-16 13:37:25 -05:00
Wareya
f0220fb06b Implement "Rest Until Healed" 
Fixes: https://bugs.openmw.org/issues/563
 2013-02-16 13:35:03 -05:00
scrawl
a5c8d5748f fix FailedAction. 2013-02-16 18:05:25 +01:00
scrawl
0bc34c1c0d Action::executeImp returns a bool value to indicate if the sound should be played. 2013-02-16 16:40:44 +01:00
scrawl
7d918caa93 Don't allow dialogue if player controls are disabled. 2013-02-16 16:26:40 +01:00
Marc Zinnschlag
910858c300 Merge remote-tracking branch 'sergeyshambir/guiconvience' into next 2013-02-16 14:50:42 +01:00
Douglas Mencken
eb09662f1d Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. 
It is boost headers' job to deal with their internals.
 2013-02-16 14:49:11 +01:00
Douglas Mencken
a3e421167b esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel 
Signed chars, unsigned chars... Just use int for index everywhere.
 2013-02-16 14:48:44 +01:00
Chris Robinson
158e18b98d Remove an unused method 2013-02-16 00:30:07 -08:00
Chris Robinson
c965bd8e18 Increase step size to 30 2013-02-15 17:22:55 -08:00
Douglas Mencken
df5919f2c5 Use `signed char' explicitly where needed. It is important because: 
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
 2013-02-15 20:28:14 +01:00
scrawl
4da11a96a5 Fixed gold ref count always becoming 1 when dropped on the ground 2013-02-15 17:34:55 +01:00
Chris Robinson
c57001e3bd Remove an unused field 2013-02-15 05:11:06 -08:00
Chris Robinson
e4341525c8 Add a jump state 
Currently unused
 2013-02-15 04:45:28 -08:00
Chris Robinson
ff0099fa6e Scale the animation speed based on the animation velocity and movement speed 
This may not be totoally correct since it takes the whole animation into
account, rather than just the looping portion. But it's good enough for now.
 2013-02-15 02:15:39 -08:00
Chris Robinson
e1a1530774 Better implement Npc::getSpeed 2013-02-15 01:27:57 -08:00
Chris Robinson
3348e8a436 Clarify a comment 2013-02-14 22:41:14 -08:00
Chris Robinson
ac717373b1 Add a method to check if an object is on the ground 2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf Use the PhysicActor's set/getOnGround method 2013-02-14 20:10:04 -08:00
Chris Robinson
15dc82f454 Increase step size to 15 2013-02-14 18:59:05 -08:00
Chris Robinson
a729b1b12a Snap to the ground after moving 
Depends on two factors:
* End up close enough above to a walkable plane (it's within sMaxStep units
  down and is angled sMaxSlope or less)
* Started out on the ground without any upward movement

This also reduces the distance needed to be to the ground to 4 (from 10), and
ensures the actor is 2 units above the ground when on it. Downward force is
also removed when starting on the ground.
 2013-02-14 18:34:51 -08:00
Chris Robinson
6a9755778e Merge remote-tracking branch 'zini/next' into animation2 2013-02-12 18:14:46 -08:00
Marc Zinnschlag
5e3529783d Merge remote-tracking branch 'ace/win-fixes' into next 2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
bbb845824d Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__ 2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson
0ae01794f1 Fixed build errors in OpenCS 2013-02-12 13:57:16 +01:00
Sergey Shambir
7d7a1119da Fixed book text misalignment, at least in some cases 
https://bugs.openmw.org/issues/284
 2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5 BookTextParser: moved to Ogre::UTFString 
Font height and unicode characters glyph width now accounted correctly.
 2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668 BookTextParser: fixed infinitive loop 2013-02-12 11:14:30 +04:00
Marc Zinnschlag
1a079ec8d3 Merge branch 'master' into next 2013-02-11 19:53:51 +01:00
Marc Zinnschlag
1fd7d8ed2a Merge remote-tracking branch 'graffy76/master' into next 2013-02-11 15:35:59 +01:00
graffy76
55dd17c27c Added setBarColor() function to CSVDoc::Operation. Created four color 
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
 2013-02-11 04:30:16 -06:00
Marc Zinnschlag
64d9d9e2ce Merge remote-tracking branch 'wheybags/master' into next 2013-02-10 17:29:28 +01:00
Marc Zinnschlag
eb6590f7d8 added delegate factory 2013-02-10 17:21:25 +01:00
Tom Mason
c32c31f6d6 break after activating button 2013-02-10 15:41:02 +00:00
Tom Mason
158c6fc9fa pressing enter when a messagebox is prompting for "ok", will activate ok button 2013-02-10 14:58:46 +00:00
Sergey Shambir
59808c3e10 GUI: Birth and Class dialogs now both select 1st item in list at first 
time.
 2013-02-10 08:59:38 +04:00
Sergey Shambir
725bfe6372 TradeWindow: balance now changes per time if user holds +/- button 
pressed
 2013-02-10 08:50:36 +04:00
Sergey Shambir
bba024d6ad Right mouse button click now stops Container GuiMode. 2013-02-10 08:37:45 +04:00
Chris Robinson
4ee5857bae Filter accumulation axis for mLastPosition as needed 2013-02-09 19:09:56 -08:00
Chris Robinson
8d6f017f17 Remove an unneeded Animation field 2013-02-09 13:25:39 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Marc Zinnschlag
2d937cd9e2 Merge branch 'gmst' into next 2013-02-09 15:26:25 +01:00
Marc Zinnschlag
d40ee06897 fixed base/modified logic 2013-02-09 15:25:50 +01:00
Mark Siewert
55bd9eef66 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 2013-02-09 13:00:57 +01:00
Marc Zinnschlag
828695f295 added value column to gmst table 2013-02-08 14:48:38 +01:00
Marc Zinnschlag
cce2d63433 added type column to gmst table 2013-02-08 12:20:03 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +01:00
Chris Robinson
f5afa43db5 Remove an unneeded parameter 2013-02-07 17:45:41 -08:00
Chris Robinson
d47d2216f2 Use some const references where appropriate 2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500 Remove unneeded playerMove from PhysicActor 2013-02-07 15:48:41 -08:00
Chris Robinson
ca6f8b6d88 Reorganize a bit of code in the movement solver 2013-02-07 13:18:16 -08:00
Chris Robinson
fe0e6c452d Remove the unneeded playerMove object from PhysicsSystem 2013-02-07 12:11:10 -08:00
Nikolay Kasyanov
0d4b0bfd93 Trying to resolve sound issues on OS X with ffmpeg backend 2013-02-07 23:40:20 +04:00
Marc Zinnschlag
dd2b7d5c63 handle deleted records 2013-02-07 13:26:00 +01:00
Marc Zinnschlag
c1cd8305bc a bit of cleanup for the previous commit 2013-02-07 13:13:06 +01:00
Marc Zinnschlag
21733e8181 hide startup dialogue when opening open dialogue 2013-02-07 13:11:41 +01:00
Marc Zinnschlag
adcaea464b basic globals record loading 2013-02-07 12:52:01 +01:00
Marc Zinnschlag
7d112e4d5c rewrote logic of content file loading 2013-02-07 11:33:08 +01:00
Chris Robinson
8de2d24d0e Restore old ground check 2013-02-06 21:57:59 -08:00
Chris Robinson
923d0d6eb4 Fix up some header includes 2013-02-06 21:47:09 -08:00
Chris Robinson
e577ee2de8 Add a method to set/retrieve being on the ground 2013-02-06 21:44:58 -08:00
Chris Robinson
ebc7bc9427 Rename A_AlwaysRun to A_Run 
Note that there is an "always run" key, but its functionality is handled by
A_ToggleWalk.
 2013-02-06 18:22:16 -08:00
Chris Robinson
a8f0ce43a5 Add a run key 2013-02-06 17:51:47 -08:00
Chris Robinson
cbaf489eb6 Add running states 2013-02-06 16:53:52 -08:00
Chris Robinson
04524fbf92 Don't scale the movement vector up 2013-02-06 15:23:52 -08:00
Chris Robinson
bdda7278c4 Use 3/4ths of the physic actor's height to test if swimming 2013-02-06 12:56:30 -08:00
Chris Robinson
dfd16c4424 Fix movement rotations 2013-02-06 12:39:26 -08:00
Marc Zinnschlag
43912f927a Merge remote-tracking branch 'potatoesmaster/importer' into next 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-06 10:12:40 +01:00
Chris Robinson
9cf30f39bd Don't apply gravity when swimming 2013-02-05 19:45:51 -08:00
Chris Robinson
fc307e64b0 Add swimming states 2013-02-05 19:05:07 -08:00
Chris Robinson
18b7008409 Better fix some scaling issues 2013-02-05 18:25:09 -08:00
Chris Robinson
535cd8360f Load extra animations for NPCs 2013-02-05 18:09:43 -08:00
Chris Robinson
8b1e7b95ba Attempt to load the skeleton source if it doesn't yet exist 2013-02-05 17:55:12 -08:00
Chris Robinson
c839502743 Setup base_anim.nif as an initial skeleton source for biped creatures 2013-02-05 17:16:45 -08:00
Chris Robinson
054ef3113a Check existing skeleton sources if the current one has no animation root 2013-02-05 17:15:40 -08:00
Chris Robinson
16933e3926 Scale the accumulation root translation 2013-02-05 16:59:20 -08:00
Chris Robinson
600fe06f00 Use a vector of skeletons to handle animation sources 2013-02-05 16:29:51 -08:00
Chris Robinson
e217a3d25c Silence some console spam 2013-02-05 15:51:26 -08:00
Emanuel Guevel
a4f051e85a Fix game files import 2013-02-06 00:51:05 +01:00
Emanuel Guevel
6e3c016351 Add archives to settings imported by mwiniimporter 
Add Morrowind.bsa by default.
 2013-02-06 00:51:05 +01:00
Chris Robinson
ee3764e9b3 Increase max slope to 60. 45 is too low. 2013-02-05 15:07:48 -08:00
Chris Robinson
8c0bb1ff4d Rotate movement in the movement solver 2013-02-05 14:02:14 -08:00
Michal Sciubidlo
347a734364 Move OpenDialog to editor and use it in startup dialogue. 
Remove debug output from DataFilesList.
 2013-02-05 22:06:36 +01:00
Chris Robinson
f7f1adfb9d Don't accumulate animations with activators 2013-02-05 12:55:06 -08:00
Chris Robinson
2c39760bd5 Move the movement solver code to mwworld's physics system 2013-02-05 12:45:10 -08:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Chris Robinson
0a4568bd11 Move the PtrMovementList typedef to MWWorld 
Use it for the doPhysics parameter, too
 2013-02-05 11:03:39 -08:00
Chris Robinson
2cdda96798 Clear out some unneeded doPhysics stuff 2013-02-05 10:23:26 -08:00
Chris Robinson
3251796ba0 Fix left/right movement 2013-02-05 09:57:08 -08:00
Chris Robinson
d50832081c Remove the unneeded PhysicActor field from MovementSolver 2013-02-05 09:37:02 -08:00
Chris Robinson
a782a9109b Store the vertical velocity in the physic actor 2013-02-05 09:24:22 -08:00
Chris Robinson
82e4da4e64 Get the half-extents from the physicactor 2013-02-05 07:41:57 -08:00
Chris Robinson
1c604445ba Store movement vectors as they get returned 2013-02-05 06:59:01 -08:00
Chris Robinson
4bd1e63ac1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-05 03:26:46 -08:00
Marc Zinnschlag
c409f1184e cleaned up object movement and fixed a bug regarding local scripts 2013-02-05 12:19:06 +01:00
Chris Robinson
786cb6e928 Merge remote-tracking branch 'zini/master' into animation2 2013-02-05 02:57:02 -08:00
Marc Zinnschlag
86fb3574a0 Merge remote-tracking branch 'wheybags/master' into next 2013-02-05 11:55:47 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2013-02-05 02:27:57 -08:00
scrawl
09180666b2 Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix 2013-02-05 00:21:42 +01:00
scrawl
58cf182db2 better place for syncing 2013-02-05 00:21:29 +01:00
scrawl
596628d339 Fix terrain derived data update (bug 534, bug 544) 2013-02-04 23:13:01 +01:00
Chris Robinson
5ee298cdc1 Make sure the player updates last 2013-02-04 14:08:38 -08:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Chris Robinson
2f8affc955 Make sure the player's controller is properly updated when they change 2013-02-04 12:58:06 -08:00
Chris Robinson
ee9b19d2ed Make sure to remove a Ptr from the activators when requested 2013-02-04 12:04:06 -08:00
Chris Robinson
39cf7b0b42 Pass the Ptr of the object being moved to the move method 
This prevents having to store another copy of it, which risks getting out of
sync.
 2013-02-04 11:17:48 -08:00
Chris Robinson
1a5cb8760d Rotate movement vector to world space before passing to the movement solver 2013-02-04 11:04:20 -08:00
Chris Robinson
6b32fa7999 Use the correct position for the actor 2013-02-04 09:48:21 -08:00
scrawl
bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 2013-02-04 18:03:03 +01:00
Chris Robinson
1747c1e01a Integrate a new movement solver to handle object movement and collisions 
Temporary, and pretty breoken. Needs some serious integration fixes.
 2013-02-04 07:10:14 -08:00
Marc Zinnschlag
ba0d13fc12 moved code for creating new base content records into the Document class 2013-02-04 13:50:38 +01:00
Marc Zinnschlag
4c973a0f67 constructing documents from a file list instead of a single name 2013-02-04 13:46:54 +01:00
Marc Zinnschlag
3f0a49a2f6 Merge branch 'master' into startup 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-04 10:22:37 +01:00
Chris Robinson
91513206a0 Don't use per-animation accumulation values 
This breaks walking diagonally and "jumping" (which technically wasn't jumping
anyway).
 2013-02-03 12:02:51 -08:00
Chris Robinson
51d5efeeb2 Work out the state in the character controller update method 2013-02-03 07:15:34 -08:00
Mark Siewert
3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-03 16:14:41 +01:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
Marc Zinnschlag
c97553703a fixes for static build without cg 2013-02-03 13:47:55 +01:00
Marc Zinnschlag
a4872e3217 rewrote the opencs cmake scripts (more compact and no more annoying warnings) 2013-02-03 13:30:40 +01:00
Chris Robinson
23acf4b130 Don't break right away when the animation time remaining is 0 2013-02-03 01:38:42 -08:00
Chris Robinson
60a75cb5ee Make sure to keep the character preview animation updated 2013-02-03 00:54:50 -08:00
Chris Robinson
7fe877d8ea Add a couple more character states 2013-02-03 00:19:22 -08:00
Chris Robinson
007a5963de Handle most state changes in the character controller when setting the movement vector 2013-02-02 23:39:43 -08:00
Tom Mason
f785659297 Implemented OnPCAdd special variable 
Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
 2013-02-02 17:36:12 +00:00
Michal Sciubidlo
155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 2013-02-02 18:36:01 +01:00
Marc Zinnschlag
67a1ec5166 added provisional startup dialogue 2013-02-02 16:14:58 +01:00
Chris Robinson
c23a96d606 Run an aniamtion update after "playing" the inventory idle 
This is so all the NPC parts get updated correctly.
 2013-02-02 06:08:03 -08:00
Chris Robinson
fc7590694d Revert "Revert "Use a child scene node for the accumulation root"" 
This reverts commit 376dfed15b.

I was wrong. It's needed at least for NPCs since they're attaching multiple
animated skeletons to an object, and they all need to be offset correctly.

Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode,
though.
 2013-02-02 05:43:37 -08:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
Chris Robinson
7f87c1873b Use an array to store the entity parts 2013-02-02 02:53:22 -08:00
Chris Robinson
376dfed15b Revert "Use a child scene node for the accumulation root" 
This reverts commit d6f923f274.

We don't need it for any of the NIFs we're currently handling. As long as
there's no NIF files that would break it, we should require a stationary root
if an animation wants to accumulate. If we must, a better idea may be to inject
an extra bone into the skeleton instance and make that the accumulation root.
 2013-02-01 08:50:32 -08:00
Michal Sciubidlo
492482de7f Add "open" option in opencs. 2013-02-01 00:42:03 +01:00
Tom Mason
0f58e03343 Unequipping items will reset OnPCEquip variable 2013-01-31 19:04:39 +00:00
Tom Mason
9ad08520fd Implemented OnPCDrop special variable 
Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.
 2013-01-31 18:45:32 +00:00
Tom Mason
0fc5ee5149 allow OnPCEquip special variable to be of any type 2013-01-31 17:46:16 +00:00
Chris Robinson
d6f923f274 Use a child scene node for the accumulation root 2013-01-30 22:28:18 -08:00
Tom Mason
09f9557ecb Implemented OnPCEquip special variable 2013-01-31 00:34:16 +00:00
Tom Mason
dc91211b12 Fixed Small bug where scripts were being removed when they shouldn't be. 
Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.
 2013-01-31 00:21:04 +00:00
Michal Sciubidlo
ac62dd050d Rename datafilespage to datafileslist 2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01:00
Chris Robinson
b6354c6282 Don't share skeleton instances between bounded parts on an NPC 
However, a skeleton instance will still be shared between entities in an entity
list.
 2013-01-30 09:29:16 -08:00
Chris Robinson
5c3a7f7d52 Avoid handling animation states 
We don't need them anymore
 2013-01-30 07:34:07 -08:00
Chris Robinson
360f7bfac8 Apply animations to bones manually 
Couple reasons for this:

* This paves the way for allowing animations specified in other skeletons to
be applied to the character (NPCs and certain creatures can have multiple
animation sources, but Ogre is incredibly strict when it comes to sharing
animations between skeletons).

* It will allow for entities to be animated based on the character's skeleton,
without having to duplicate the mesh for each skeleton it can be used on.

This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor
does it get in the way of hardware skinning.
 2013-01-30 07:04:18 -08:00
Chris Robinson
600d3bf9eb Make sure the player node's visibility cascades 2013-01-30 02:38:50 -08:00
Chris Robinson
04d4c125ba Print when an animation event is unhandled 2013-01-29 02:00:42 -08:00
Chris Robinson
d4ddaa3d95 Only register activators that have a MWRender::Animation object 2013-01-29 01:08:52 -08:00
Chris Robinson
99efe4e494 Remove an unnecessary class member 2013-01-29 01:02:55 -08:00
Chris Robinson
879359f39d Set the animation state loop flag as appropriate 2013-01-29 00:50:52 -08:00
Chris Robinson
92d0c55f32 Add a flag to specify if an animation should be playing 2013-01-29 00:43:42 -08:00
Chris Robinson
fdabef65a1 Use a method to update an object's cell in the mechanics manager 
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
 2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
7df4d0d19f Remove an unnecessary cast 2013-01-28 21:41:51 -08:00
Chris Robinson
7b71b4eb31 Add a missing include 2013-01-27 03:03:48 -08:00
Chris Robinson
0cd3880b20 Merge remote-tracking branch 'zini/master' into animation2 2013-01-26 04:54:52 -08:00
Chris Robinson
b1ffdf855f Reset the initial state of animated nodes on the skeleton instances 
This is so the animation specifies node keyframe data based on the node's
parent. This will also be necessary for applying animations from different
skeleton sources, as they can have different binding positions (even native
.skeleton resources will need to specify animation data this way).
 2013-01-26 04:48:53 -08:00
Mark Siewert
dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
 2013-01-25 18:22:01 +01:00
Emanuel Guevel
19dff822f4 Dialogue: do not filter on disposition for creatures 2013-01-24 19:43:21 +01:00
Emanuel Guevel
ed9a9904b4 Dialogue filter: search script variables case-insensitively 2013-01-24 19:39:31 +01:00
Marc Zinnschlag
90d05858ef disabling dialogue sub-views for now 2013-01-22 11:50:08 +01:00
Marc Zinnschlag
cd662af634 Merge branch 'globals' 2013-01-22 11:47:24 +01:00
Chris Robinson
05f8b8c283 Specify the text key to reset animations to 2013-01-22 00:31:45 -08:00
Chris Robinson
37fe1bd3f0 Handle looping in the Animation object 2013-01-21 22:51:13 -08:00
Marc Zinnschlag
2756d3ee94 Merge remote-tracking branch 'wheybags/containerscripts' 2013-01-21 23:02:45 +01:00
Tom Mason
f5f3c2e62d enabling / disabling should not affect scripts 2013-01-21 20:06:08 +00:00
Chris Robinson
e956a1cbc0 Merge SpecialIdle character state into Idle 2013-01-21 03:24:52 -08:00
Chris Robinson
6905bd18ba Filter out the group name from the text keys 
It's already in the animation name, and the text keys are animation-specific
anyway.
 2013-01-21 02:59:12 -08:00
Chris Robinson
536f8104e6 Do not create an 'all' animation. 2013-01-20 17:24:43 -08:00
Chris Robinson
e1e76bde76 Combine a loop into another where it's used 2013-01-20 15:39:43 -08:00
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01:00
Tom Mason
31c71c029d objects with scripts attached, that are inside containers will behave correctly when the container is moved 2013-01-20 17:01:30 +00:00
Emanuel Guevel
736e471613 Print a fallback text when no topic response is found 2013-01-20 17:44:09 +01:00
Emanuel Guevel
43e85ea0c6 Disallow redirection to info refusal for greetings 2013-01-20 17:44:09 +01:00
Emanuel Guevel
05796d85a4 NPC: take stats from NPDT12 into account 
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
 2013-01-20 17:44:08 +01:00
Emanuel Guevel
951eb1b236 Dialogue: return a response from "Info Refusal" when disposition is not satisfied 2013-01-20 17:44:08 +01:00
Tom Mason
23dada0ee4 moved script handling on enable / disable into their own functions 2013-01-20 16:38:56 +00:00
Tom Mason
28c580d280 disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly 2013-01-20 15:43:52 +00:00
Tom Mason
abe25c5f66 removed use of c++11 auto 2013-01-20 14:24:55 +00:00
Tom Mason
665a530e10 renamed realAdd to addImp 2013-01-20 14:14:34 +00:00
Tom Mason
3c6ddd7fa7 fixed isInCell method 2013-01-20 14:10:04 +00:00