Commit graph

53722 commits

Author SHA1 Message Date
Seth Alves
07b23b8235 expose other hinge-constraint parameters to javascript 2017-04-14 13:28:25 -07:00
Zach Fox
a4587e33f3 Tiny forward/backward icon updates 2017-04-14 13:19:33 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110 avatar-action-far-grab works now 2017-04-14 12:44:54 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Sam Cake
f991475004 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-14 11:33:21 -07:00
Seth Alves
2dab3069da fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called. 2017-04-14 11:06:40 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
samcake
17de3d1e28 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-14 10:03:03 -07:00
Chris Collins
e789492b34 Merge pull request #10212 from AndrewMeadows/avoid-invisible-avatars-003
avoid invisible avatars when source interface stops sending updates to avatar-mixer
2017-04-14 09:25:20 -07:00
Chris Collins
1eb3c5273f Merge pull request #10217 from sethalves/enable-grab-debug-prints
turn on handControllerGrab debug prints
2017-04-14 09:15:28 -07:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
Seth Alves
f5a5369055 attempt to remove dynamics associated with a rigid-body before removing the rigid-body 2017-04-14 07:06:53 -07:00
Seth Alves
52aee63e05 keep track of objectDynamics per rigidBody 2017-04-14 06:08:58 -07:00
Sam Cake
bb15b8c701 ANd fixing the gl41 rendering 2017-04-14 00:46:41 -07:00
Sam Cake
29545f0918 FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend 2017-04-13 23:53:56 -07:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00
Andrew Meadows
5bdecfbfa0 send keep-alive packets but don't resend identity 2017-04-13 16:00:11 -07:00
Zach Fox
520ceebf5b Small HMD tweaks 2017-04-13 15:52:59 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Seth Alves
afa8fc161b allow hinge constraint between two entities 2017-04-13 15:37:28 -07:00
Andrew Meadows
14b60165ef don't keep stale avatars alive 2017-04-13 14:55:08 -07:00
Andrew Meadows
63ea16f24b avatar-mixer to send identity packets as 'reliable' 2017-04-13 13:37:18 -07:00
Andrew Meadows
e364b8d33e avatar-mixer resends to avoid stale avatar 2017-04-13 13:35:59 -07:00
Seth Alves
7695d2ac05 put the protocol version back to what's in master, for now 2017-04-13 11:29:40 -07:00
Sam Cake
3b385772c3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-13 09:51:27 -07:00
Sam Cake
78bfc006f1 Prototyping the ResourceBuffer with the DrawBounds Job, yeah 2017-04-13 00:51:02 -07:00
samcake
d41f34ce8d Adding support for the resource buffer 2017-04-12 19:07:27 -07:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Seth Alves
1ab3a1eb60 bump entity-protocol version 2017-04-12 16:36:04 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
9b12956909 formatting 2017-04-12 16:34:34 -07:00
Zach Fox
f23f9ec698 Merge pull request #10207 from zfox23/gifShareImprovements
Snapshot sharing improvements
2017-04-12 16:33:44 -07:00
Zach Fox
631033dcb5 Merge pull request #10209 from zfox23/fixUserInfoViewerButton
Make userInfoViewer button always clickable for myCard
2017-04-12 16:33:05 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Brad Davis
b2aa3271f7 Adding support for variable allocated textures to the GL 4.1 backend 2017-04-12 15:09:20 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
Kinect hand filter
2017-04-12 14:27:05 -07:00