Commit graph

38943 commits

Author SHA1 Message Date
samcake
5ef7a19d67 Drafting a solution to update the render items when ENtity is moving 2016-02-09 18:29:22 -08:00
samcake
8a4e2cb0c5 cleaning the warnings coming from the os side 2016-02-09 16:27:40 -08:00
samcake
da158bcd85 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 15:52:28 -08:00
samcake
c96dd7f131 Cleaning up of the octree as items are removed 2016-02-09 15:51:38 -08:00
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
Brad Davis
7d99f9e72f PR comments 2016-02-09 10:16:44 -08:00
Brad Davis
839b8d432e Don't burn CPU cycles calculating an average color we don't use 2016-02-09 09:39:34 -08:00
Brad Davis
2b127720f8 Run the present thread at highest priority 2016-02-09 09:39:33 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -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
Brad Davis
421160eeb6 Make the file parsing threads run at lower priority 2016-02-08 23:55:02 -08:00
Anthony J. Thibault
6a82594a4f SpatiallyNestable: more locks, less contention 2016-02-08 20:09:32 -08:00
Anthony J. Thibault
9a0e206843 SpatiallyNestable: made getParentPointer protected again. 2016-02-08 20:04:45 -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
40e49b2376 Starting to remove empty bricks and empty cells 2016-02-08 18:23:29 -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
James B. Pollack
ad36e84e24 Merge pull request #7023 from ericrius1/acSoundSearcher
AC Sound Searcher
2016-02-08 17:54:15 -08:00
ericrius1
3acc077bbd replaced sound url for example entity 2016-02-08 17:47:57 -08:00
Brad Hefta-Gaub
89648f3c2e Merge pull request #7044 from jherico/optional_threaded_present
Make threaded present optional
2016-02-08 17:17:31 -08:00
Andrew Meadows
65ca25ff47 MyAVatar::rebuildCollisionShape() is not a slot 2016-02-08 17:08:40 -08:00
Zach Pomerantz
63d87550b1 Guard batchSetter invocation for ShapePipelines 2016-02-08 17:06:43 -08:00
ericrius1
85ddb7100c fixed gap range bug 2016-02-08 16:51:04 -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
ericrius1
b60ba0c5a7 can now change loop 2016-02-08 16:22:05 -08:00
Zach Pomerantz
281ba3c3ea Fix ShapeKey::withoutCullFace to set, not reset 2016-02-08 16:14:03 -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
Stephen Birarda
7dee3c61f3 Merge pull request #7038 from kencooke/master
HRTF-based audio spatialization engine
2016-02-08 15:37:09 -08:00
Seth Alves
4f8a7a080f remove debugging print 2016-02-08 15:33:03 -08:00
Seth Alves
82fcfc1d64 don't apply clock-skew to a lastEdited of 0 2016-02-08 15:31:32 -08:00
Seth Alves
e2098038f1 only setLastEdited on properties to be sent 2016-02-08 15:16:15 -08:00
Seth Alves
eb1c159c7e only setLastEdited on properties to be sent 2016-02-08 15:16:04 -08:00
Seth Alves
7f2b822796 only setLastEdited on properties to be sent 2016-02-08 15:15:49 -08:00
Seth Alves
5b5ddebb1a set last-edited when updating a child's queryAACube 2016-02-08 15:09:51 -08:00
Seth Alves
92d016f03a debugging prints for queryAACube 2016-02-08 15:09:34 -08:00
Seth Alves
3030944ca1 set last-edited when updating a child's queryAACube 2016-02-08 15:09:11 -08:00
Seth Alves
44ddfb8039 set last-edited when updating a child's queryAACube 2016-02-08 15:08:58 -08:00
Ken Cooke
0968118ef7 Removed the commented-out AVX2 detection 2016-02-08 14:51:14 -08:00
Ken Cooke
04798a45fc Remove redundant patterns from CMake GLOB 2016-02-08 14:47:43 -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
Brad Davis
390df78327 Make threaded present optional 2016-02-08 14:10:51 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00