NissimHadar
dbf1be5de3
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-06 15:22:40 -08:00
NissimHadar
b30934d460
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
2018-03-06 15:21:38 -08:00
David Back
47e8e26255
CR indent fixes
2018-03-06 14:05:24 -08:00
Gabriel Calero
a2327ea0cf
Merge branch 'android' into android_bubble_fix
2018-03-06 19:03:53 -03:00
Gabriel Calero
069d3e40bc
Merge branch 'android' into android_bubble_fix
2018-03-06 18:58:49 -03:00
Stephen Birarda
a83b54e10d
fix for getSetting QVariant ref in DomainServer
2018-03-06 13:55:50 -08:00
Zach Fox
48aa862c16
Show Connection instructions in Send Money when 0 connections
2018-03-06 13:52:42 -08:00
Atlante45
a23884d0e0
Prevent crash during long backup web requests
2018-03-06 13:21:02 -08:00
John Conklin II
9294ae0dd2
Merge pull request #12567 from elisa-lj11/RC65-update
...
Added fixed log spam undefined error to RC65
2018-03-06 12:40:28 -08:00
Brad Davis
6cc36136bd
Fix assert on interaction with stats and avatarinputs during UI setup
2018-03-06 12:34:21 -08:00
Simon Walton
30206ff33e
Call killed-avatar slot directly rather than by signal
...
Rename nodeKilled slot to handleKilledAvatar since the node
isn't killed in this case and call directly from
handleKillAvatarPacket().
2018-03-06 12:28:55 -08:00
David Back
b74be92fd8
redo scale handles to fix scaling into avatar collision causing chaos
2018-03-06 12:27:51 -08:00
Alexander Ivash
53e1a0cae5
forward 'maybeEnableHmdPreview' if control is not visible
2018-03-06 22:25:35 +03:00
Elisa Lupin-Jimenez
15c1f5ba30
fixed log spam undefined error
2018-03-06 11:01:50 -08:00
Simon Walton
547d86a2d5
Improve debugging diagnostic
2018-03-05 18:10:15 -08:00
NissimHadar
84815fadae
Use JPG->PNG trick to keep file sizes down.
2018-03-05 17:45:51 -08:00
Simon Walton
8fb3015ec8
Fix for missing avatar on second replay
...
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
2018-03-05 16:51:05 -08:00
John Conklin II
acf1f48d9e
Merge pull request #12550 from thoys/fix/grabbableCheckbox
...
FIX: make the grabbable checkbox function again when dynamic disabled
2018-03-05 14:55:38 -08:00
Simon Walton
d259e115c0
Merge remote-tracking branch 'upstream/master'
2018-03-05 14:35:30 -08:00
John Conklin II
16bb992d8d
Merge pull request #12557 from druiz17/correctly-use-defaults-values
...
correctly use default values and don't delete userData in entitiesProperties.js
2018-03-05 13:15:23 -08:00
Cristian Luis Duarte
0bb56d837d
Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice
2018-03-05 18:08:06 -03:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox
...
Adding Stereo checkbox in Audio settings
2018-03-05 12:45:01 -08:00
Cristian Luis Duarte
c091bc0bb3
Fix warnings regarding float to double conversion
2018-03-05 17:08:38 -03:00
Seth Alves
7d6927a00d
Merge pull request #12555 from druiz17/fix-controllerDispacther-error
...
fix controllerDispatcher error in logs
2018-03-05 12:08:35 -08:00
Thijs Wenker
d7725f1d73
make the grabbable checkbox again, respect default true setting
2018-03-05 20:54:08 +01:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-05 11:36:39 -08:00
Dante Ruiz
1997cd27bd
correctly use default values
2018-03-05 11:26:37 -08:00
Dante Ruiz
654770af51
fix controller dispatacher error
2018-03-05 09:39:26 -08:00
John Conklin II
8cb7e0584f
Merge pull request #12547 from Atlante45/fix/session-uuid-lock
...
Protect session UUID from concurrent read/writes
2018-03-05 08:24:22 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink
...
Fix hyperlink when far/near grabbing enitities
2018-03-05 08:23:51 -08:00
NissimHadar
5a79f272f3
Allow multiple evaluations.
2018-03-04 20:56:57 -08:00
NissimHadar
913ad569c0
Added completion message.
2018-03-04 17:36:20 -08:00
vladest
43e7f282ec
cleanup
2018-03-04 20:44:46 +01:00
vladest
c2c7962f66
return styling. set implicit sizes
2018-03-04 19:49:47 +01:00
vladest
9f151566bf
temporarily remove styling
2018-03-04 18:46:27 +01:00
vladest
1d43ca48bd
remove wrap
2018-03-04 17:59:56 +01:00
vladest
12a70d57c2
Set Y pos for indicator explicetly
2018-03-04 17:24:52 +01:00
NissimHadar
b32ad2f69c
createTests fixed.
2018-03-03 18:22:51 -08:00
NissimHadar
0a2610a9e0
Evaluation seems to work.
2018-03-03 09:58:30 -08:00
NissimHadar
361b5331ba
File sizes are wrong, and so is format.
2018-03-02 18:09:32 -08:00
Atlante45
85b4c3b422
Protect session UUID from concurrent read/writes
2018-03-02 17:34:18 -08:00
Simon Walton
75db77b1e3
Merge remote-tracking branch 'upstream/master'
2018-03-02 17:30:11 -08:00
NissimHadar
96c7cc8197
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
2018-03-02 16:49:30 -08:00
NissimHadar
4b836a2ca9
Stores downloaded images in correct folder and with correct filenames.
2018-03-02 16:49:09 -08:00
Sam Gateau
8856d4af4f
Merge pull request #12530 from samcake/punk
...
Fixing the graphics bugs introduced since last recent dual quaternion change
2018-03-02 16:12:23 -08:00
NissimHadar
8536b44c61
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 16:09:06 -08:00
NissimHadar
d29adcd000
Can download multiple images from GitHub.
2018-03-02 16:08:14 -08:00
John Conklin II
ed07b3c28b
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick
...
Purge RayPick and LaserPointers from default scripts
2018-03-02 14:59:32 -08:00
Dante Ruiz
d12a4f0c18
little change
2018-03-02 14:30:02 -08:00
