Brad Davis
|
ca38b9fe34
|
Fix invalid QML surface cache interaction
|
2018-03-16 10:53:59 -07:00 |
|
John Conklin II
|
25b93d9fd7
|
Merge pull request #12606 from ElderOrb/FB12956_RC65
Fix for broken 'toggle audio meter' button
|
2018-03-09 11:20:27 -08:00 |
|
John Conklin II
|
407dfec342
|
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one
clear wallet when picking a new one
|
2018-03-09 10:09:24 -08:00 |
|
John Conklin II
|
209dd7fb43
|
Merge pull request #12602 from zfox23/RC65_fixFontsAgain
RC65: Fix font loading for MacOS via completely different font loading method
|
2018-03-09 09:53:46 -08:00 |
|
John Conklin II
|
fe0d354d26
|
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-08 15:30:19 -08:00 |
|
Alexander Ivash
|
b427d6c326
|
FB12956 - Audio Meter Toggle Button Broken
|
2018-03-09 02:20:34 +03:00 |
|
Zach Fox
|
c22d79041d
|
Cleanup after cherry-pick
|
2018-03-08 14:35:56 -08:00 |
|
howard-stearns
|
883528488c
|
clear wallet when picking a new one
|
2018-03-08 14:35:43 -08:00 |
|
Zach Fox
|
ec6f66ee52
|
Try this
|
2018-03-08 14:31:56 -08:00 |
|
Zach Fox
|
747a6b07ce
|
Fix font loading for MacOS via different font loading method
|
2018-03-08 14:31:48 -08:00 |
|
John Conklin II
|
260715d616
|
Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug
Fixed blocks importer textures being interpreted as image entities
|
2018-03-08 13:33:41 -08:00 |
|
Zach Fox
|
22f18dbf56
|
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-08 13:12:13 -08:00 |
|
John Conklin II
|
c5514f5120
|
Merge pull request #12570 from dback2/RC65
Redo entity scale handles to fix scaling into avatars causing undesirable physics/dimensions
|
2018-03-08 12:58:08 -08:00 |
|
John Conklin II
|
3e9e55c3db
|
Merge pull request #12591 from zfox23/RC65_fixUncertifiedPurchases
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-08 09:36:28 -08:00 |
|
David Back
|
554c37d14b
|
removed undefined event checks in scaling
|
2018-03-07 19:34:08 -08:00 |
|
David Back
|
9681f0eb77
|
restore old scale math, disable avatar collisions while scaling
|
2018-03-07 18:20:26 -08:00 |
|
Zach Fox
|
a0eb7e0712
|
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-07 15:01:12 -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 |
|
Elisa Lupin-Jimenez
|
2987c90f96
|
fixed syntax for ubuntu
|
2018-03-07 13:48:35 -08:00 |
|
Elisa Lupin-Jimenez
|
9ae2da7e4b
|
fixed logic for texture files/non-models
|
2018-03-07 13:18:36 -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 |
|
David Back
|
2047437893
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65
|
2018-03-07 10:30:18 -08:00 |
|
Elisa Lupin-Jimenez
|
28589094c2
|
hopefully fixed mac/ubuntu builds
|
2018-03-07 10:18:40 -08:00 |
|
Elisa Lupin-Jimenez
|
c6e5f4c9c8
|
zip file drags don't auto add model textures
|
2018-03-06 19:24:09 -08:00 |
|
Elisa Lupin-Jimenez
|
251e4a3127
|
Fixed blocks importer textures being interpreted as image entities
|
2018-03-06 16:44:23 -08:00 |
|
Simon Walton
|
17c12fde9c
|
Fix for HandshakeRequest logic
|
2018-03-06 16:32:04 -08:00 |
|
David Back
|
47e8e26255
|
CR indent fixes
|
2018-03-06 14:05:24 -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 |
|
David Back
|
b74be92fd8
|
redo scale handles to fix scaling into avatar collision causing chaos
|
2018-03-06 12:27:51 -08: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 |
|
Thijs Wenker
|
d7725f1d73
|
make the grabbable checkbox again, respect default true setting
|
2018-03-05 20:54:08 +01: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 |
|
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 |
|
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 |
|
Ryan Huffman
|
70bdedc4b3
|
Fix Edit -> Export Entities exporting gzipped json
We were not respecting the doGzip flag.
|
2018-03-01 16:42:41 -08:00 |
|
samcake
|
5440f62860
|
fixing a bad key /pipeline pair
|
2018-03-01 10:46:47 -08:00 |
|
samcake
|
9f9214e808
|
getting back the RC65 version for a few files
|
2018-03-01 09:33:48 -08:00 |
|
samcake
|
dc286544c5
|
Merging with nissim's pr
|
2018-02-28 17:54:54 -08:00 |
|
samcake
|
a7542d5b90
|
fixing the shadow
|
2018-02-28 17:46:22 -08:00 |
|
Sam Gondelman
|
b90af9e3b5
|
Merge pull request #12523 from samcake/punk
Adding more detailed stats
|
2018-02-28 12:18:07 -08:00 |
|
NissimHadar
|
5d7e6651a7
|
Use correct pixel shader.
|
2018-02-28 11:05:02 -08:00 |
|
samcake
|
9e5ed7b905
|
Add more timing stats in explanded mode
|
2018-02-28 10:48:35 -08:00 |
|
Elisa Lupin-Jimenez
|
061a189e9f
|
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam
Fixed log spam undefined error
|
2018-02-28 09:37:17 -08:00 |
|
samcake
|
9580258589
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-28 09:00:55 -08:00 |
|