Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54170 commits 25 branches 0 tags 1.1 GiB
Commit graph

2307 commits

Author SHA1 Message Date
Triplelexx
e295ab2778 change location of menu item Create Entities As Grabbable 2017-04-26 21:13:39 +01:00
Thijs Wenker
d05229d3b4 fix conversion 2017-04-26 22:11:56 +02:00
Thijs Wenker
20a9b60e7b this might make it work 2017-04-26 21:42:36 +02:00
Triplelexx
06b3b84145 changes from CR 2017-04-26 18:50:15 +01:00
Thijs Wenker
0363e96f34 Allow skeletons with different bone structures to become friends (still requires hands) 2017-04-26 18:55:50 +02:00
Thijs Wenker
a25584c90f ESLINT, style and spelling fixes 2017-04-26 18:51:55 +02:00
Zach Fox
3e24296996 Swap the two lines 2017-04-26 09:10:05 -07:00
Howard Stearns
0f8ee7051c lint 2017-04-26 08:20:12 -07:00
David Rowe
4581b9a0df Refresh countdown number upon reopening dialog 2017-04-26 20:13:21 +12:00
Triplelexx
01b11022e3 add menu item to control grabbable setting on newly created entites 2017-04-26 07:26:00 +01:00
humbletim
84c8b2945a detect and update doppleganger when user changes skeletonModelURLs; cleanup 2017-04-26 01:58:51 -04:00
David Rowe
06f56f024b Increase delay of checking a recording loaded to reduce false positives 2017-04-26 15:55:59 +12:00
David Rowe
c5f384d8fb Don't fade playback avatar when approaches observer 2017-04-26 14:02:45 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
David Rowe
c83f82f5da Delay start of recording until after beep finishes 2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
humbletim
a833912399 cleanup and documentation 2017-04-25 16:30:05 -04:00
howard-stearns
ee9b953b1c typo 2017-04-25 12:12:26 -07:00
David Rowe
79346673ed Log user activity events in record and playback scripts 2017-04-25 13:43:28 +12:00
Andrew Lowry
5ffb8eba86 Initialize background color for color picker correctly. 2017-04-24 20:37:43 -04:00
humbletim
6f178ee1ec initial checkin of doppleganger module and tablet app scripts 2017-04-24 19:28:03 -04:00
Triplelexx
d689a43678 changes from CR 2017-04-24 22:07:51 +01:00
David Rowe
c0a258f9b3 Disable "load" button while making a recording 2017-04-25 09:04:26 +12:00
Triplelexx
d63c4d11c7 enable grabbable property for all newly created entities 2017-04-24 21:33:08 +01:00
David Rowe
d73fd6e08d Update AC script URL in info 2017-04-25 07:42:21 +12:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
ecf3826050 Always show hand lasers when in edit mode. 2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
volansystech
1abbca6737 Merge branch 'master' into 21200 2017-04-24 19:09:02 +05:30
howard-stearns
fac40f51d9 message waiting art 2017-04-21 16:00:23 -07:00
David Rowe
7fe0ba19b5 Don't display the "Record" button as pressed while recording 2017-04-22 10:05:02 +12:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5 Right-align "i" icon and update info text 2017-04-21 17:46:30 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
David Rowe
076bf0943e Attach HMD "recording" indicator to camera 2017-04-21 10:33:24 +12:00
Stephen Birarda
3452dd0251 increment colspan count in table footer 2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
volansystech
9e2899678a Resolving conflicts of #21206 2017-04-20 23:54:41 +05:30
volansystech
abc87c0338 Increased accuracy for converting far-grab to near-grab for every object 
Near-grab radius reduced to its default = 0.3
 2017-04-20 23:37:16 +05:30
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
David Rowe
43619d1db1 Finish with TODOs 2017-04-20 14:22:54 +12:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
David Rowe
f7d87c4c28 Tweak start-up delay 2017-04-19 16:32:46 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
David Rowe
f920192244 Fix up script tear-down 2017-04-18 08:22:29 +12:00
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
David Rowe
15128faa49 Fix (work around) tablet access at Interface start-up crashing Interface 2017-04-15 17:11:03 +12:00
David Rowe
ef8f36026c Improve speed of starting playing animations at server start-up 2017-04-15 13:20:42 +12:00
David Rowe
e91cf4a4e8 Use "i" circle for info button 2017-04-15 12:50:00 +12:00
David Rowe
e7fb268843 Update to use modified Recording API 2017-04-15 12:18:50 +12:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet 
fix can't grab tablet
 2017-04-14 14:57:06 -07:00
David Rowe
2731c13a5c Merge remote-tracking branch 'upstream/master' into 21249 2017-04-15 09:51:16 +12:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting 
Make it easier to exit FingerPaint
 2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -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
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
David Rowe
f715850766 Display animated GIF while recording 2017-04-14 16:13:45 +12:00
David Rowe
08f4fc2cf9 Remove hover highlight from "x"s 2017-04-14 15:51:59 +12:00
David Rowe
c2d8755b15 Merge branch 'master' into 21249 2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9 Use HiFi glyph for delete "x"s 2017-04-14 15:30:28 +12:00
David Rowe
5f333ee02c Style "i" button and info text 2017-04-14 15:14:39 +12:00
David Rowe
1d43e5a992 Style overall dialog layout 2017-04-14 15:12:36 +12:00
David Rowe
fd919f0db7 Play sounds during countdown and beep when recording starts and finishes 2017-04-14 10:34:15 +12:00
David Rowe
072e06123f Fix recording just made not being played 2017-04-14 10:02:15 +12:00
volansystech
70855b1c53 Improve the accuracy of Far to near Equip State. 2017-04-13 19:24:47 +05:30
David Rowe
75e4fb3820 On tablet with option enabled recording ends when open tablet or dialog 2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f Show "busy" spinner when counting down or recording 2017-04-13 19:23:22 +12:00
David Rowe
9638b093d8 Fix number of available player instances being wrong on tablet 2017-04-13 18:55:02 +12:00
David Rowe
ff42715a15 Retain "Record" button's pressed state when close and reopen dialog 2017-04-13 18:41:55 +12:00
David Rowe
45ca8438fa Persist finish-on-open checkbox value to settings 2017-04-13 18:29:39 +12:00
David Rowe
b508d6882f Add checkbox that stops countdown/finishes recording when reopen dialog 2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75 Don't close dialog when start recording; press "Record" again to finish 2017-04-13 17:00:35 +12:00
David Rowe
c369b1314a Remove countdown overlays 2017-04-13 16:32:03 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
e21e15c064 Update warning dialog to refer to player "instance" 2017-04-13 14:01:37 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
David Rowe
464bc17491 Column heading for "unload" buttons 2017-04-13 13:40:20 +12:00