Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006
SpatiallyNestable: warn on failure.
2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844
Merge pull request #7049 from jherico/antistutter
...
Anti-stutter work
2016-02-09 12:16:15 -08:00
Chris Collins
cc576dd5e3
Merge pull request #7045 from sethalves/fix-query-cube
...
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Chris Collins
e61636e8a7
Merge pull request #7028 from zzmp/fix/overlay
...
Add transparency and layering for overlays
sam is doing it
2016-02-09 09:18:32 -08:00
Anthony Thibault
aa3cb8fb20
Merge pull request #7047 from AndrewMeadows/hide-the-razor-blades
...
MyAVatar::rebuildCollisionShape() is not a slot
2016-02-09 09:11:14 -08:00
James B. Pollack
a8395b38ac
Merge pull request #7046 from jherico/keynav
...
Improve keyboard navigation in file dialog and running scripts
2016-02-09 09:09:58 -08:00
Brad Davis
6a66d74e19
Limit the number of concurrent file parsing threads
2016-02-08 23:55:03 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
samcake
07759bb5db
Merge pull request #7034 from zzmp/feat/render-to-json
...
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
Andrew Meadows
65ca25ff47
MyAVatar::rebuildCollisionShape() is not a slot
2016-02-08 17:08:40 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Brad Davis
427644cb77
Add better keyboard navigation to file dialog
2016-02-08 16:12:24 -08:00
Brad Davis
e376b781c1
Keyboard navigation in running scripts list
2016-02-08 16:12:23 -08:00
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
Seth Alves
7f2b822796
only setLastEdited on properties to be sent
2016-02-08 15:15:49 -08:00
Seth Alves
3030944ca1
set last-edited when updating a child's queryAACube
2016-02-08 15:09:11 -08:00
Anthony J. Thibault
2667fe3c24
Merge branch 'master' into tony/avatar-on-moving-platform
2016-02-08 14:32:46 -08:00
Zach Pomerantz
a7bafed61b
Change ShapeKey::CULL to NO_CULL_FACE
2016-02-08 13:44:42 -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
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
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
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
Zach Pomerantz
8bf6c66327
Add (de)serializer for QObject->JSON
2016-02-05 13:03:46 -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
Babiuch, Ryan Nicholas
aab98db812
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-05 12:49:38 -06: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
Bradley Austin Davis
64597f9d9f
Fixing save dialog issues saving new files
2016-02-04 13:32:52 -08:00
Zach Pomerantz
3fceaba2fe
Remove extra qualifications to getShapeKey from overlay headers
2016-02-04 10:01:34 -08: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
Zach Pomerantz
53bd595b77
Update all appropriate overlays to use plumber
2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a
Split DrawOverlay3D to Transparent/Opaque
2016-02-03 19:18:56 -08:00
Zach Pomerantz
60f3ee5a18
Initialize Volume3dOverlay to a valid scale
2016-02-03 19:18:56 -08:00
Stephen Birarda
058bba7b55
move avatar invokables from AvatarManager to AvatarHashMap
2016-02-03 17:13:35 -08:00
Anthony J. Thibault
d2068678f4
MyAvatar: bumped up size of head, w.r.t. head cauterization.
...
This is to avoid some issues where face is visible when looking straight down.
Specifically, with the Albert avatar.
2016-02-03 16:08:11 -08:00
Anthony J. Thibault
027a2166f5
MyAvatar: Use head to turn while flying in HMD mode
2016-02-03 15:44:06 -08:00
Bradley Austin Davis
60d97c45af
Support save file dialog
2016-02-03 14:51:10 -08:00
Bradley Austin Davis
8f85abfec8
Support 'naked' selection globs in file dialog
2016-02-03 14:51:07 -08:00
Bradley Austin Davis
320c4d27b5
Force Qt (rather than OS) rendering in a number of places
2016-02-03 14:51:05 -08:00
Bradley Austin Davis
0a99086617
Moving to QML based dialogs
2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78
Remove declarative form creation from WindowScriptingInterface
2016-02-03 14:50:59 -08:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
