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
David Rowe
8bbce53f74
Reset player details when domain restarts or user teleports
2017-04-13 12:23:10 +12: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
0eb9507a10
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:25:50 -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
volansystech
7bc3435cfa
Initial Commit..
...
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
2017-04-13 02:51:30 +05:30
David Rowe
7dddd266ba
Merge branch 'master' into 21249
2017-04-13 08:39:32 +12:00
Seth Alves
026dde2e68
allow kinematic near-grab to be turned on or off for a given entity
2017-04-12 10:14:16 -07:00
volansystech
5639a3f92a
Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state.
2017-04-12 20:08:26 +05:30
David Rowe
50a06db1b9
Display "REC" indicator when recording
2017-04-12 15:56:59 +12:00
David Rowe
f30dc4b560
Add a "record" button to initiate recording
2017-04-12 15:04:29 +12:00
David Rowe
905560b96d
Remove checkbox and record-on-close functionality
2017-04-12 14:48:15 +12:00
Thijs Wenker
695c55bc3d
fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes
2017-04-12 03:44:24 +02:00
David Rowe
3ae388bded
Rework auto-playback
2017-04-12 13:32:34 +12:00
David Rowe
0d9e0ebfec
Merge branch 'master' into 21249
2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023
Merge pull request #10184 from druiz17/snapshot-fix
...
snapshot bug fixes
2017-04-11 13:00:46 -07:00
volansystech
99af493ac8
Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically.
...
Successfully converted far grab into near grab when entity is closer to the Avatar.
When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.
2017-04-11 21:57:01 +05:30
David Rowe
86baf785aa
Add "Load" button
2017-04-11 15:23:09 +12:00
Dante Ruiz
daf25c1fe8
fix crashes when clicking in the homebutton
2017-04-11 00:25:08 +01:00
David Rowe
559fba39ab
Remove avatar after stopping recording
2017-04-11 10:17:52 +12:00