NissimHadar
|
d72f46ec3e
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 16:24:53 -08:00 |
|
NissimHadar
|
05e9aa52c9
|
Moved can-cast-shadow checkbox to behaviour section.
|
2018-03-06 16:22:54 -08:00 |
|
Zach Fox
|
04a230c20f
|
Merge pull request #12491 from ElderOrb/FB12523
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
|
2018-03-06 16:19:39 -08:00 |
|
Clément Brisset
|
fdc054c86b
|
Merge pull request #12577 from Atlante45/new-master
RC65 merge back into master
|
2018-03-06 16:17:27 -08:00 |
|
Dante Ruiz
|
69af12fbc7
|
chaning speeds
|
2018-03-06 15:47:01 -08:00 |
|
Atlante45
|
edeed95ccc
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-06 15:33:12 -08:00 |
|
NissimHadar
|
dbf1be5de3
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 15:22:40 -08:00 |
|
Dante Ruiz
|
6fefd1355a
|
minimize diff
|
2018-03-06 14:19:26 -08:00 |
|
Dante Ruiz
|
fe363e7f2a
|
changing keybaord mapping
|
2018-03-06 14:16:25 -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 |
|
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 |
|
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 |
|
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 |
|
Atlante45
|
85b4c3b422
|
Protect session UUID from concurrent read/writes
|
2018-03-02 17:34:18 -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 |
|
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 |
|
Dante Ruiz
|
5dc336bfae
|
remove dead code and eslint files
|
2018-03-02 14:23:35 -08:00 |
|
John Conklin II
|
8f403ebc23
|
Merge pull request #12543 from zfox23/improveFontLoading
Improve font loading via QRC instead of file path
|
2018-03-02 14:22:17 -08:00 |
|
samcake
|
fc8f1c1e65
|
Resolving conflicts
|
2018-03-02 14:20:33 -08:00 |
|
Dante Ruiz
|
05fb3cfd9a
|
fixing hyper link for entities
|
2018-03-02 14:03:24 -08:00 |
|
Brad Hefta-Gaub
|
762e36ef19
|
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii
fix ASCII art for packet headers in NLPacket
|
2018-03-02 13:49:27 -08:00 |
|
Cristian Luis Duarte
|
76e4a5bef2
|
Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().
|
2018-03-02 18:46:14 -03:00 |
|
John Conklin II
|
7ebe3df2b1
|
Merge pull request #12537 from zfox23/fixJsRequest
Fix undefined request from JS
|
2018-03-02 13:39:27 -08:00 |
|
John Conklin II
|
ff94587518
|
Merge pull request #12544 from jherico/fix_android
Disable virtual trackpad rendering on non-Android builds
|
2018-03-02 13:37:08 -08:00 |
|
Brad Hefta-Gaub
|
746f43c0fc
|
Merge pull request #12538 from huffman/fix/gzipped-json-export
Fix Edit -> Export Entities exporting gzipped json
|
2018-03-02 13:34:23 -08:00 |
|
Gabriel Calero
|
01699e26a5
|
Fix QML debug info: print last QML loaded file instead of Desktop.qml
|
2018-03-02 18:04:36 -03:00 |
|
Stephen Birarda
|
4f151a4237
|
fix ASCII art for packet headers in NLPacket
|
2018-03-02 12:41:22 -08:00 |
|
John Conklin II
|
be30d8d4ec
|
Merge pull request #12542 from zfox23/RC65_fixJsRequest
RC65: Fix undefined request from JS
|
2018-03-02 12:34:14 -08:00 |
|