Commit graph

44472 commits

Author SHA1 Message Date
Anthony J. Thibault
2ed88bca6d Bug fix for bow and arrow.
* before this change the releaseEquip message was not getting sent to the bow,
  which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
2016-06-20 17:24:36 -07:00
Brad Davis
0bc4beeffd Fix initial toolbar positioning 2016-06-20 17:09:30 -07:00
howard-stearns
bfb697bc77 No hysteresis. 2016-06-20 17:04:23 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Zach Pomerantz
4e0aeea2b8 add time offset to domain-server UI 2016-06-20 16:19:19 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
SamGondelman
a52fab00a9 commit possible fix for testing 2016-06-20 16:04:39 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Ryan Huffman
0393777b03 Add getMemoryInfo helper function 2016-06-20 16:01:44 -07:00
Ryan Huffman
1fa274a527 Fix GPUIdent name trailing whitespace 2016-06-20 16:01:03 -07:00
Anthony J. Thibault
8817bbea09 reduce log spam 2016-06-20 15:53:33 -07:00
Brad Hefta-Gaub
10d79945d1 Merge pull request #8101 from humbletim/fix-entity-lifetime-guards
Fix entity lifetime guards (re: canRez/canRezTmp)
2016-06-20 15:52:54 -07:00
Brad Hefta-Gaub
d5c6296db5 Merge pull request #8095 from SamGondelman/skeletonFix
Fix skeleton switching bug
2016-06-20 15:52:40 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Anthony J. Thibault
e5159ad213 Added "Developer > Hands > Drop Without Shake" menu option 2016-06-20 14:50:15 -07:00
Zach Pomerantz
cfe9ac32d4 fix narrowing warning by casting -1 2016-06-20 14:46:20 -07:00
Zach Pomerantz
25b21dacda clean domain metadata and update acl 2016-06-20 13:44:14 -07:00
Anthony J. Thibault
408f65100b Bug fix for dropping near-grabbed entities via thump press. 2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884 Change raw for loop to Array.prototype.forEach instead 2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef brush clearing 2016-06-20 13:21:06 -07:00
Anthony J. Thibault
359483d9ba coding standard fix 2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68 Remove /* style multi-line comments 2016-06-20 11:40:59 -07:00
Zach Pomerantz
40f2d36487 fix hosts/tags in domain-server settings 2016-06-20 11:38:38 -07:00
Anthony J. Thibault
35276c3893 Use Array.prototype.filter instead of my hand rolled filter function 2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb Primary thumb press can be used to drop an equipped object 2016-06-20 11:22:56 -07:00
Zach Pomerantz
1c188a270d Merge pull request #8087 from zzmp/feat/send-domain-descriptors
send domain metadata to metaverse for authed domains
2016-06-20 11:22:01 -07:00
SamGondelman
34d18da4e4 remove mutable 2016-06-20 11:11:54 -07:00
Anthony J. Thibault
14efd5dc12 Disable WANT_DEBUG_STATE 2016-06-20 10:44:09 -07:00
Anthony J. Thibault
1759132377 Use trigger to both grab and equip objects
* Removed entry into HOLD state via secondary aka grip buttons.
* Changed equip logic to prioritize equip over near over far grabs.
* Added drop gesture, upside down controller + slight shake + trigger press
* Bug fix for near grab snapping to an incorrect offset after a far grab (this bug is present in master)
2016-06-20 10:39:07 -07:00
Brad Hefta-Gaub
b012e46dc7 Merge pull request #8097 from sethalves/make-permissions-names-case-insensitive
fix domain-server permissions-grid usernames to be case insensitive
2016-06-20 09:57:47 -07:00
humbletim
e65e6dc9ce Fix entity lifetime guards (re: canRez/canRezTmp) 2016-06-19 13:40:03 -04:00
Howard Stearns
81300ec127 turn hud reset behavior on by default 2016-06-18 14:35:37 -07:00
Howard Stearns
6196c657f8 Minimize triggering distance to HUD. 2016-06-18 14:17:47 -07:00
SamGondelman
c30c2b64b2 first pass at preventing repeated compileShader error prints 2016-06-17 17:49:27 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Brad Hefta-Gaub
c297fa7c0e Merge pull request #8060 from imgntn/usersUpdates
Hide users.js options when logged out
2016-06-17 14:17:42 -07:00
SamGondelman
caf4a9fa34 got rid of comparison warning 2016-06-17 14:17:32 -07:00
Brad Hefta-Gaub
abd368b69d Merge pull request #8071 from ctrlaltdavid/20969
let user choose an existing file in the file save dialog
2016-06-17 14:14:37 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText
Add face camera option to edit.js text entity properties
2016-06-17 14:14:06 -07:00
Howard Stearns
4aa5e87a26 Merge pull request #8093 from jherico/vive-toolbars
Support toolbar API
2016-06-17 13:43:16 -07:00
Howard Stearns
aeebe8b3fb Merge pull request #8094 from howard-stearns/fix-depth-request
fix depth request
2016-06-17 13:26:07 -07:00
Howard Stearns
e104429fa1 Merge pull request #8096 from hyperlogic/bug-fix/reticle-focus
Change rendering of reticle when in HMD mode
2016-06-17 13:25:26 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Anthony J. Thibault
e04d86a75a Change rendering of reticle when in HMD mode
Properly take the overlay model matrix into account.
Reticle depth is now relative to the eye, not relative to the overlay sphere.
2016-06-17 12:10:26 -07:00
SamGondelman
7d602986cd removed multiple interface instances hack which you should never do anyways because it breaks everything 2016-06-17 12:01:02 -07:00
SamGondelman
5f7e49b087 possible fix, needs testing 2016-06-17 11:50:56 -07:00
howard-stearns
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the
HUD.
2016-06-17 11:14:56 -07:00