Brad Davis
1aee8f1f4d
Ensure we continue calling idle when minimized
2017-07-18 13:44:58 -07:00
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
Dante Ruiz
06a69c8bd7
fixed another tablet stuck on help screen
2017-07-18 20:27:55 +01:00
Brad Hefta-Gaub
0ba9d65732
Merge pull request #10989 from druiz17/bug-whitespace-script-url
...
Fixed not being able to load a script url that has a white space
2017-07-18 11:39:10 -07:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
Andrew Meadows
6e59e451c4
Merge pull request #10986 from Atlante45/fix/avatar-audio-timer
...
Use timer instead of dedicated thread to tick AC scripted avatar audio
2017-07-18 10:25:35 -07:00
Andrew Meadows
888f2f64a5
Merge pull request #10981 from druiz17/bug/delete-avatar-entity
...
Fixed not being able to delete avatar entities when switching domains
2017-07-18 10:09:34 -07:00
Dante Ruiz
bcc15dd4ae
Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url
2017-07-18 17:59:56 +01:00
Dante Ruiz
976fec66f8
fixed loading script whitespace
2017-07-18 17:59:42 +01:00
Clément Brisset
bcc9cf7c60
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
...
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
Brad Davis
9f13533560
Ensure input and output device containers are protected by mutex
2017-07-18 08:58:17 -07:00
Dante Ruiz
7fe47e4e2f
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
2017-07-18 16:51:41 +01:00
Dante Ruiz
d504000604
made requested changes
2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub
2dfaf7b02a
Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
...
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub
d94365cc44
Merge pull request #10979 from zfox23/hoverOverlay_lasers
...
Create/Destroy Hover Overlays using hand controller lasers
2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub
a7e328285e
Merge pull request #10969 from druiz17/bug/addmodel-textbox
...
allow user move the cursor with the mouse for the add model URL textbox
2017-07-18 08:41:08 -07:00
Brad Hefta-Gaub
0d504e57a9
Merge pull request #10984 from druiz17/bug/tablet-position
...
trying new tablet spawn position.
2017-07-18 08:07:56 -07:00
Andrew Meadows
5f4df0da2b
Merge pull request #10847 from AndrewMeadows/entitymap
...
faster EntityItem lookup by EntityItemID
2017-07-18 08:04:37 -07:00
NeetBhagat
ff51fa7199
Resolved review comments.
2017-07-18 10:42:01 +05:30
Brad Davis
d43432bd71
Cleanup dead code, fix startup behavior
2017-07-17 18:54:52 -07:00
Brad Davis
aab56cf2a9
Trying to resolve QML / Audio deadlocks
2017-07-17 16:21:28 -07:00
Atlante45
91d65469a0
Use timer instead of dedicated thread to tick avatar
2017-07-17 15:52:52 -07:00
Dante Ruiz
f5abb4a090
trying new tablet position spwan
2017-07-17 23:18:16 +01:00
David Kelly
061f084d9f
Get marketplaceID into imported entities
...
Rather than doing this on the backend, we can do it here at the
time we import. Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed. However for now this is enough
to get us moving forward.
2017-07-17 15:08:30 -07:00
Zach Fox
a37f0137e7
Destroy overlays when trigger released
2017-07-17 14:29:43 -07:00
Dante Ruiz
21d760a533
make sure to lock data
2017-07-17 22:11:05 +01:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Dante Ruiz
282b364fad
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
2017-07-17 21:28:17 +01:00
Dante Ruiz
f6208a394c
delete avatar entity when switching domains
2017-07-17 21:27:55 +01:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842
Merge pull request #10978 from zfox23/hoverOverlayInterface
...
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
Zach Fox
19b42b0180
CR feedback
2017-07-17 13:15:23 -07:00
humbletim
9c610f52ec
switch history file format to JSON
2017-07-17 15:34:41 -04:00
Zach Fox
4b9797c179
Comment explaining category debugs
2017-07-17 11:35:27 -07:00
Zach Fox
0a4ab23356
Remove unnecessary include
2017-07-17 11:32:47 -07:00
Zach Fox
147474e19a
Logging category and filter
2017-07-17 11:17:59 -07:00
Andrew Meadows
99aad77e53
Merge pull request #10954 from jherico/qml_crashes_again
...
Still trying to address QML crashes
2017-07-17 10:21:23 -07:00
Zach Fox
19d5b8750a
Cleanup logging
2017-07-17 09:51:00 -07:00
Zach Fox
e602d3610e
Initial commit for HoverOverlayInterface
2017-07-14 17:26:53 -07:00
Andrew Meadows
5a4f56388b
Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains
...
Smooth IK when trackers are disabled / enabled.
2017-07-14 16:59:30 -07:00
druiz17
3b112450f0
Merge pull request #10959 from druiz17/bug/wrong-tablet-state
...
Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode
2017-07-14 14:31:04 -07:00
utkarshgautamnyu
fef375ef50
Merge pull request #10962 from highfidelity/clean_install
...
Added option in the installer for a clean install
2017-07-14 14:09:32 -07:00
Atlante45
2d246d2563
Implement shutdown with parent for Mac and Linux
2017-07-14 11:39:32 -07:00
Atlante45
366ce69e66
Add info on how the child AC finished
2017-07-14 11:39:32 -07:00
Dante Ruiz
93d1725b3c
make cursor position change based on mouse click position
2017-07-14 19:30:35 +01:00
Seth Alves
806d9f1436
Merge pull request #10968 from druiz17/bug/load-priority
...
Prioritize file:// requests over http://
2017-07-14 11:13:35 -07:00
Zach Fox
a9197509d8
Merge pull request #10965 from CainFoool/avatar-scaler
...
WL 21422 - Add a scale slider for avatar size
2017-07-14 10:30:33 -07:00
Dante Ruiz
68fa426da9
set file url as higher priority
2017-07-14 18:17:13 +01:00
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Andrew Meadows
17f5c9099e
Merge pull request #10944 from misslivirose/fix-chat-help-text
...
String pass on Chat.js
2017-07-14 09:58:35 -07:00
