Chris Robinson
9f9d978b0f
Use an enum to specify the NPC's view mode (normal, head only)
2013-04-09 09:07:05 -07:00
Glorf
46925e93a6
Second minor fix
2013-04-09 16:14:08 +02:00
Glorf
623c2c8201
Minor fix
2013-04-09 07:45:07 +02:00
scrawl
01ae91f640
Fix several NPCs spawning in the ground
2013-04-09 01:24:17 +02:00
Glorf
7c22e123f4
Bugfix #691 changes
2013-04-08 22:10:55 +02:00
Chris Robinson
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-04-08 11:46:57 -07:00
Marc Zinnschlag
ef09b1cac8
Merge remote-tracking branch 'glorf/bugfix-1'
2013-04-08 20:23:18 +02:00
Glorf
2f52df22ce
Bugfix #553
2013-04-08 19:00:38 +02:00
Glorf
194ca2584d
Small azura's star fix
2013-04-08 17:53:41 +02:00
Glorf
50932a7a6b
Finished bugfix #691
2013-04-08 17:50:03 +02:00
scrawl
d0bcf83091
Adjust player position to ground after using travel services
2013-04-08 16:30:18 +02:00
scrawl
a7de870a44
Fix mercenary not updating its profit when item was dragged onto the player avatar
2013-04-08 16:21:18 +02:00
Chris Robinson
08d43fe217
Make the getHeadNode method more general
2013-04-08 05:48:52 -07:00
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-07 17:24:47 -07:00
Chris Robinson
7baca30a1d
Only get the non-accum root's keyframe when updating positions
...
The actual animation pose is now handled by the controllers, based on the
current animation time.
2013-04-07 16:21:45 -07:00
Chris Robinson
261ea1fe5e
Implement a KeyframeController
2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1
Update animation source controller targets
2013-04-07 13:51:04 -07:00
scrawl
9e08497f02
Initial container content should inherit the owner of its container
2013-04-07 22:07:04 +02:00
Chris Robinson
7494f90301
Remove an unneeded function
2013-04-07 13:02:46 -07:00
scrawl
480467b6eb
Reset the 'owner' field for items that were legitimately bought from an NPC.
2013-04-07 21:53:11 +02:00
Chris Robinson
2362e920f3
Use an unconnected object list for animation sources
...
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065
Don't buy/sell keys which are set to open a lock
2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6
Implemented levelled items
2013-04-07 21:01:02 +02:00
Chris Robinson
80a1abd48a
Clear the old text keys when setting new animation sources
2013-04-07 11:09:55 -07:00
Marc Zinnschlag
a0d34c5e8d
Merge remote-tracking branch 'wheybags/autorun2'
2013-04-07 19:51:02 +02:00
Marc Zinnschlag
a91e3c0b01
Merge remote-tracking branch 'scrawl/fatigue_bug'
2013-04-07 19:50:16 +02:00
Tom Mason
822866b5ae
fixed autorun
2013-04-07 18:04:30 +01:00
scrawl
8bbfba3f43
Fix fatigue not being set to its maximum value when player is rebuilt
2013-04-07 16:18:40 +02:00
scrawl
755a80a522
Fix camera shaking when near the pitch limit.
2013-04-07 15:52:43 +02:00
Chris Robinson
be419bc891
Handle NiCamera nodes
2013-04-07 02:28:15 -07:00
Chris Robinson
878b4c15c5
Set visibility flags and the render queue group for particles
2013-04-07 02:08:33 -07:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Chris Robinson
41e410347e
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 10:35:01 -07:00
Marc Zinnschlag
053f744566
Merge remote-tracking branch 'scrawl/master'
2013-04-06 19:31:46 +02:00
scrawl
1f3df4df0f
Perform a sanity check on count arguments
2013-04-06 19:25:29 +02:00
Marc Zinnschlag
0f34c79d0a
Merge branch 'race'
2013-04-06 19:21:38 +02:00
Chris Robinson
59f1d4b047
Add support for NiUVController on meshes
2013-04-06 09:44:10 -07:00
Chris Robinson
1d934e3112
Reduce some stdout spam
2013-04-06 04:46:28 -07:00
Chris Robinson
0631b28646
Prepare for supporting controller objects
2013-04-05 10:13:54 -07:00
Chris Robinson
af2a38db38
Fix looping anims that dont have "loop start"
2013-04-05 08:27:26 -07:00
Glorf
48d9885554
Started bugfix #691
2013-04-05 15:42:05 +02:00
Chris Robinson
4d14fe0d95
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-04 22:06:27 -07:00
Marc Zinnschlag
034ebf8ffd
Merge remote-tracking branch 'scrawl/master'
2013-04-04 19:57:55 +02:00
scrawl
2e7d5377f4
Fix crash when moving npcs to an inactive cell
2013-04-04 16:51:22 +02:00
scrawl
48a88f1917
Fix startRandomTitle
2013-04-04 15:10:27 +02:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
Marc Zinnschlag
18e046e628
cleaned up race record struct
2013-04-04 13:50:36 +02:00
Marc Zinnschlag
62d70f17c8
removed another redundant include
2013-04-04 12:42:38 +02:00
Marc Zinnschlag
111ebf84bb
replaced an include with a forward declaration
2013-04-04 12:27:57 +02:00
Marc Zinnschlag
5244362fba
some cleanup
2013-04-04 12:23:06 +02:00