John Conklin II
|
1341774450
|
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype
Add a Q_DECLARE_METATYPE in TextureCache.
|
2018-03-08 09:37:06 -08:00 |
|
Clément Brisset
|
b7ac07f590
|
Merge pull request #12589 from highfidelity/RC65
merge back RC65 to master after RC hotfixes
|
2018-03-07 17:22:41 -08:00 |
|
John Conklin II
|
fcb2f358f8
|
Merge pull request #12579 from SimonWalton-HiFi/RC65
Fix for avatar record only replaying once
|
2018-03-07 14:55:03 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
SamGondelman
|
0aacdcd558
|
docs
|
2018-03-07 13:34:48 -08:00 |
|
John Conklin II
|
7381bb0d7e
|
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce
use QCoreApplication for Oven when headless version is used
|
2018-03-07 12:56:25 -08:00 |
|
John Conklin II
|
e0a11271bf
|
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
fix for getSetting QVariant ref in DomainServer
|
2018-03-07 12:11:45 -08:00 |
|
John Conklin II
|
84c9016e2a
|
Merge pull request #12548 from Atlante45/fix/ds-consolidate-crash
Prevent crash during long backup web requests
|
2018-03-07 12:11:04 -08:00 |
|
Brad Hefta-Gaub
|
9595049e01
|
Merge pull request #12582 from thoys/fix/JSDOCtypo
fix JSDOC typo rule -> role
|
2018-03-07 07:50:07 -08:00 |
|
Thijs Wenker
|
866bec0b34
|
rule -> role
|
2018-03-07 02:36:07 +01:00 |
|
Simon Walton
|
17c12fde9c
|
Fix for HandshakeRequest logic
|
2018-03-06 16:32:04 -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 |
|
Atlante45
|
edeed95ccc
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-06 15:33:12 -08:00 |
|
Stephen Birarda
|
a83b54e10d
|
fix for getSetting QVariant ref in DomainServer
|
2018-03-06 13:55:50 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
9e8368e50e
|
Disable virtual trackpad rendering on non-Android builds
|
2018-03-02 11:12:44 -08:00 |
|
Dante Ruiz
|
7ce13a3ce7
|
adding comment
|
2018-03-02 11:06:28 -08:00 |
|
Dante Ruiz
|
55d8cfd4c1
|
make sure dont make audio devices that don't use stereo use stereo
|
2018-03-02 10:56:44 -08:00 |
|
samcake
|
b8fb97c824
|
Resolving conflicts
|
2018-03-02 10:36:55 -08:00 |
|
Zach Fox
|
a5a109e4f1
|
Fix undefined request from JS
|
2018-03-02 10:05:32 -08:00 |
|
John Conklin II
|
678584538d
|
Merge pull request #12532 from samcake/RC65
RC65 Fix: Applying the fix for shadows and transitions on Dual Quat Skinned meshes
|
2018-03-02 09:23:38 -08:00 |
|
Sam Gateau
|
88ecfe7895
|
Merge pull request #12464 from jherico/android_dev
Android Master
|
2018-03-01 17:22:34 -08:00 |
|
SamGondelman
|
a66125fbb7
|
scriptablematerial -> scriptablemateriallayer
|
2018-03-01 16:56:51 -08:00 |
|