Dante Ruiz
3c1d434449
fixed typo
2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a
added descendant checking
2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4
fixed child of parent not being added when performing an undo
2016-12-01 10:54:26 -08:00
Dante Ruiz
1b24d373d2
fixed near grab issue
2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083
grip button fix
2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Chris Collins
c0a0a16ff8
Merge pull request #9127 from huffman/fix/hand-controller-grab-release
...
Fix 'releaseGrab' not being called when using grip buttons
2016-12-01 09:58:36 -08:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Anthony J. Thibault
78559934a1
Merge branch 'master' into third-person-lasers
2016-11-29 16:38:34 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
Ryan Jones
01ae2b9452
add errant semicolon
2016-11-29 11:56:11 -08:00
Ryan Jones
251b070db3
add unit test
2016-11-29 11:50:11 -08:00
Ryan Jones
a59df5b04d
one last indentation fix
2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55
revert changes to dev utils, apply changes to system utils
2016-11-28 17:18:31 -08:00
Ryan Jones
68e86da023
adjust indentation and implement editorconfig at root of repo
2016-11-28 17:10:59 -08:00
Ryan Jones
4be1922df5
add bind polyfill
2016-11-28 14:47:15 -08:00
Howard Stearns
030f0d7103
Merge pull request #9114 from howard-stearns/bubble-state
...
bubble state
2016-11-28 12:16:39 -08:00
David Kelly
1b26d51292
Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots
...
Capture original location in snapshots
2016-11-28 08:55:47 -08:00
howard-stearns
8b9efb461e
bubble state
2016-11-23 10:22:24 -08:00
howard-stearns
414371d1fc
record starting href/domainId, not ending
2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e
allow movement during .gif recording
2016-11-22 16:02:01 -08:00
howard-stearns
5188de924f
allow for SnapshotReview dialog to be up during a change of href for all
...
media capture
2016-11-22 11:09:43 -08:00
Philip Rosedale
664b54c004
remove whitespace
2016-11-22 10:27:27 -08:00
Philip Rosedale
c1e044364f
Added distance attentuation of linear and angular rate
2016-11-22 10:24:02 -08:00
samcake
c494479290
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-22 10:16:08 -08:00
Philip Rosedale
c81d5b0793
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-22 09:07:13 -08:00
howard-stearns
066a518142
expose metaverse url to javascript and use it rather than hardcoding
2016-11-21 13:07:38 -08:00
howard-stearns
5b216578d7
Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup
2016-11-21 11:47:30 -08:00
samcake
31232a1078
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-21 11:30:26 -08:00
Brad Hefta-Gaub
fe709f51de
personal space feature
2016-11-19 16:30:15 -08:00
howard-stearns
da56457c4a
Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup
2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649
server protocols
2016-11-18 17:05:14 -08:00
Ryan Huffman
541ef21801
Merge pull request #9094 from Atlante45/edit-js
...
Turn Edit.js on when importing entities
2016-11-18 15:36:50 -08:00
Zach Fox
35d075a78f
Fix notifications.js formatting
2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a
Bugfixes and GIF uploads workinggit add -A!
2016-11-18 14:39:30 -08:00
Zach Fox
adcbb0b760
Code clarity and potential bugfix
2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7
Huge progress today. Buggy behavior with multiple snapshots remains
2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f
code cleanup; simultaneous gif and still capture
2016-11-18 14:39:29 -08:00
Zach Fox
704476c197
Initial progressgit add -A!
2016-11-18 14:39:28 -08:00
Atlante45
cfd4294743
Turn Edit.js on when importing SVO
2016-11-18 11:31:12 -08:00
Anthony J. Thibault
270adfe692
removed debug prints
2016-11-17 11:40:05 -08:00
Anthony J. Thibault
38ac6fff03
Hand Controller rendering is camera relative
...
Basically, when using the third person camera in HMD mode. If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.
To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.
These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.
These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
samcake
9031e65aa5
Merge and fix the bug!!!
2016-11-16 19:12:56 -08:00
samcake
d95b682b87
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-16 11:10:01 -08:00
samcake
b74a1af5ba
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-11-16 10:48:30 -08:00
David Kelly
40914d9790
Logging to help find audio device issue
...
We sometimes show duplicate devices in Audio > Devices menu. But
I cannot reproduce it, so maybe best thing is log timing and contents
of input and output device arrays, to try to run down where the issue
is.
2016-11-15 12:58:51 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-14 14:26:45 -08:00
howard-stearns
47bef18bd4
show the hand controllers when in third-person+hmd, but currently, they're
...
at avatar hands instead of physical hand, which is not what we want!
2016-11-14 13:05:35 -08:00
samcake
b888af15e4
Fix merge
2016-11-14 11:15:27 -08:00
howard-stearns
06a6da3931
Merge branch 'master' of https://github.com/highfidelity/hifi into third-person-lasers
2016-11-14 09:58:54 -08:00
samcake
a05e42138c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-14 09:58:12 -08:00
Stephen Birarda
212d518109
use for loop for kick and mute overlay cleanup
2016-11-13 12:17:12 -08:00
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
David Kelly
3d7e075897
Added mute to mod.js script
2016-11-11 11:18:24 -08:00
howard-stearns
e2fded846f
make hand-controller ui work in third person
2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
a90a0fe8ba
Merge pull request #8976 from druiz17/FixMenuOutOfView
...
Fixed menu out of view with HMD and Xbox controller
2016-11-10 18:49:34 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
Brad Hefta-Gaub
f55b660820
Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser
...
Fix users.js maximize button unclickable with hand controllers
2016-11-10 17:53:17 -08:00
howard-stearns
8299e23cc3
diable some viewpoint menu options when in hmd.
2016-11-10 15:15:11 -08:00
Philip Rosedale
c0b1392685
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-10 13:41:13 -08:00
humbletim
35f857ef9d
inhibit user interactions when window is disabled
2016-11-09 13:21:24 -05:00
Ryan Huffman
5dab2ac2a7
Add margin to left and right side of users.js
2016-11-08 09:47:09 -08:00
Ryan Huffman
284b458148
Increase margin at bottom of users.js
2016-11-08 09:46:47 -08:00
samcake
cab699464e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-07 17:31:06 -08:00
Seth Alves
42d13f7e77
Merge pull request #9024 from huffman/fix/userdata-showing-old-data
...
Fix userData in edit.js sometimes showing wrong value when locked
2016-11-07 13:37:03 -08:00
Ryan Huffman
c4f35bf7bf
Fix userData in edit.js sometimes showing wrong value when locked
2016-11-07 11:39:36 -08:00
samcake
ff82fcae56
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-07 10:37:42 -08:00
Dante Ruiz
e22c36b4b7
fixed menu pop up delay
2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
David Rowe
852218815b
Display "content loading" while there are pending GPU texture transfers
2016-11-07 13:40:49 +13:00
samcake
f274ef1a59
Merging back with upstream and trying to fix counter for them to be more stable
2016-11-04 16:56:03 -07:00
samcake
e12040a98a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-04 14:54:18 -07:00
Brad Hefta-Gaub
206f1ead1a
Merge pull request #8990 from howard-stearns/centered-toolbar
...
centered toolbar
2016-11-03 14:18:32 -07:00
samcake
6926cd274c
Merge with upstream
2016-11-02 18:15:08 -07:00
howard-stearns
8eb6699420
help script
2016-11-02 16:50:37 -07:00
Seth Alves
d0c0cdd82f
polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again
2016-11-02 16:31:34 -07:00
Dante Ruiz
1a83cc2c3e
fixed deleted comment
2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1
fixed coding standard conflicts
2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d
removed bad commit
2016-11-02 00:05:38 +01:00
Dante Ruiz
86abd9120e
Fixed menu out of view with HMD and Xbox controller
2016-11-01 14:30:48 -07:00
David Kelly
a8832fafeb
Merge pull request #8934 from howard-stearns/more-reliable-crowds
...
More reliable crowds
2016-10-28 16:17:35 -07:00
Brad Hefta-Gaub
dc836cbefc
Merge pull request #8949 from ctrlaltdavid/21090
...
Fix comment typo
2016-10-28 13:29:47 -07:00
David Rowe
9a79345493
Fix comment typo
2016-10-29 09:04:50 +13:00
howard-stearns
a64a1e2ee0
update agent script reference
2016-10-28 10:20:29 -07:00
howard-stearns
3d8bf7f11c
Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds
2016-10-28 10:18:46 -07:00
Ryan Huffman
b8cf4e9c0e
Merge pull request #8943 from ctrlaltdavid/21090
...
QA READY: Revise loading progress bar
2016-10-28 08:24:40 -07:00
David Rowe
b548e6441c
Animate progress bar without regard for amount of content left to load
2016-10-28 18:57:54 +13:00
David Rowe
610159fcbe
Improve bar for 4K displays
2016-10-28 18:20:33 +13:00
David Rowe
73b2bc433d
Improve bar positions
2016-10-28 18:03:13 +13:00
Stephen Birarda
c41af25776
Merge pull request #8939 from huffman/fix/tutorial-fixes
...
Tutorial fixes
2016-10-27 21:43:55 -07:00
Ryan Huffman
d933155c71
Fix trigger highlight configuration
2016-10-27 20:16:34 -07:00
David Rowe
edc9b1fa07
Update bar graph for desktop and HMD displays
2016-10-28 15:50:50 +13:00
David Rowe
c9e4fddeab
Remove background image
2016-10-28 14:17:18 +13:00
David Rowe
0824142987
Add "loading" text
2016-10-28 14:12:24 +13:00
David Rowe
4befab1151
JSLint progress bar code
2016-10-28 11:34:00 +13:00
Ryan Huffman
69e7dababc
Collapse multiline dict to one line in controllerDisplay
2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380
Remove annotation API from controller display
2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f
Update controller tips and trigger highlight in tutorial
2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5
Add more debug to tutorial, new firecrackers, and adjust fuse
2016-10-27 14:58:20 -07:00
