Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 08:37:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38776 commits 71 branches 56 tags 1.2 GiB
Commit graph

38776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
97bcc54360 CharacterController: separate target velocity from parent velocity. 
Also, disable damping on the rigidBody used by the CharacterController.
 2016-02-08 16:01:36 -08:00
Anthony J. Thibault
2667fe3c24 Merge branch 'master' into tony/avatar-on-moving-platform 2016-02-08 14:32:46 -08:00
Anthony J. Thibault
20a38f613e Rig: remove position delta based velocity. 
In general, the physics body velocity is MUCH more behaved now.
 2016-02-08 14:30:28 -08:00
Philip Rosedale
63afa8c1ed Merge pull request #7040 from hyperlogic/tony/landing-animation 
MyAvatar: added standing and run landing animations
 2016-02-08 11:38:12 -08:00
Brad Hefta-Gaub
7939f1381c Merge pull request #7036 from jherico/qml 
Fix native text rendering by forcing positions to integer values
 2016-02-08 09:45:57 -08:00
Brad Hefta-Gaub
c28612ea9a Merge pull request #7037 from sethalves/dressing-room 
Dressing room + grab fixes
 2016-02-08 09:19:29 -08:00
Anthony Thibault
c4f9a4805c MyAvatar: moving platform support 
* pass sum of desired and parent velocity onto avatar's character controller.
* pass local position and velocity to Rig for animation purposes.
 2016-02-07 14:07:40 -08:00
Brad Hefta-Gaub
3f0ebf7732 Merge pull request #7031 from AndrewMeadows/simulation-ownership 
server can clear simulation ownership
 2016-02-06 19:19:39 -08:00
Brad Hefta-Gaub
7e22ac997a Merge pull request #7029 from birarda/atp-test 
fix ATP SendQueue failure to receive after re-activity
 2016-02-05 19:36:53 -08:00
Brad Hefta-Gaub
eebf6f8883 Merge pull request #7021 from hyperlogic/tony/animation-mirror-support 
AnimClip: Animation mirror support
 2016-02-05 19:25:01 -08:00
Anthony J. Thibault
d24a024726 MyAvatar: added standing and run landing animations 2016-02-05 17:53:50 -08:00
Philip Rosedale
a98efbc660 Merge pull request #6997 from jagwire/WorkingEnergy 
Working energy usage for entity manipulation.
 2016-02-05 17:17:45 -08:00
Philip Rosedale
dbbeb90873 Merge pull request #7039 from ericrius1/gunFix 
updated gun position
 2016-02-05 16:56:28 -08:00
ericrius1
39bb68931f updated gun position 2016-02-05 15:48:34 -08:00
Seth Alves
d567020283 trying to zero velocity during an equiped adjustment 2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2 refix double action grabs 2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37 try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it. 2016-02-05 13:53:45 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump 
MyAvatar: Standing Takeoff and In-Air Animations
 2016-02-05 13:45:52 -08:00
Brad Hefta-Gaub
f738f2b6f6 Merge pull request #7035 from howard-stearns/fix-mouth-movement 
fix-mouth-movement
 2016-02-05 12:08:23 -08:00
Howard Stearns
47694b90ee Fix inverted boolean that was preventing other people's avatars from mouth-animating. 2016-02-05 11:47:21 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Anthony J. Thibault
f13e31c7fc CharacterController: removed unnecessary code. 2016-02-05 10:53:58 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
Anthony J. Thibault
bfeace78f7 AnimInverseKinematics: warning fixes 2016-02-04 18:51:48 -08:00
Seth Alves
ae6a5aa286 add some debugging to handControllerGrab 2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-04 18:10:03 -08:00
Anthony J. Thibault
51189cfc50 AnimInverseKinematics: opened up UpLeg and Leg constraints 
This improves the quality of the jump animations, while IK is enabled.
 2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Andrew Meadows
725f9e29a3 Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle 
MyAvatar: Use head to turn while flying in HMD mode
 2016-02-04 17:52:47 -08:00
Brad Hefta-Gaub
817245accc Merge pull request #7025 from jherico/qml 
QML Work
 2016-02-04 16:03:39 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 16:50:43 -06:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Stephen Birarda
42e9a4ebf0 fix ATP SendQueue failure to receive after re-activity 2016-02-04 13:43:50 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Andrew Meadows
2da46ff26a server-side release ownership 2016-02-04 13:26:07 -08:00
Andrew Meadows
af57f5d120 add simple and fast DirtyOctreeElementOperator 2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d flag entity as changed when changing simulatorID 2016-02-04 13:26:07 -08:00
Andrew Meadows
91a2f86482 update some comments 2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117 update some comments 2016-02-04 13:26:06 -08:00
Andrew Meadows
381049acb3 clear simulation ownership when owners vanish 2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5 fix spelling typo in comment 2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2 make some methods const 2016-02-04 13:26:06 -08:00
Eric Levin
294a7ee9ad Merge pull request #7027 from birarda/avatars-property 
move two AvatarList invokable methods from AvatarManager to AvatarHashMap
 2016-02-04 11:41:52 -08:00
Anthony J. Thibault
a8e092272c AnimStateMachine: added new State parameter interpType 
interpType defines how the interpolation between two states is performed.

   * SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
     interTarget frame.  Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
   * SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins.  However the target state is
     evaluated dynamically.  During the interpolation period the previous snapshot is interpolated with the target pose
     to produce smooth motion between them.  This mode is useful for interping into a blended animation where the actual
     blend factor is not known at the start of the interp or is might change dramatically during the interp.
 2016-02-04 10:32:58 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82 Merge pull request #7024 from birarda/audio-mute-crash 
fix for audio-mixer mute env crash
 2016-02-04 08:53:10 -08:00
Babiuch, Ryan Nicholas
0069849da3 Consider existing velocity in calculating energy costs when editing entities. 2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c Conform to coding standard. 2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Eric Levin
2af6c08057 Merge pull request #7022 from imgntn/mastertoys 
Fix userData for pistol in toybox reset scripts
 2016-02-03 17:47:21 -08:00