WolfGang
|
787127b149
|
move subImage recalculation to it's own method
|
2018-04-04 22:10:54 +01:00 |
|
WolfGang
|
f9bcd23463
|
make subimage update the image anchors
|
2018-04-04 17:28:55 +01:00 |
|
John Conklin II
|
86afa211eb
|
Merge pull request #12674 from highfidelity/RC65.1
Beta Release 65.1, includes up to build 7977
|
2018-03-21 10:34:44 -07:00 |
|
John Conklin II
|
9219868406
|
Merge pull request #12667 from jherico/fix/web_overlay_crash
HOTFIX RC65: Fix invalid QML surface cache interaction
|
2018-03-19 10:37:48 -07:00 |
|
John Conklin II
|
c1f087dd81
|
Merge pull request #12678 from zfox23/RC65.1_editHandleFix
RC65.1: Fix ray cast checks on tablet ID lists in edit.js
|
2018-03-19 08:29:26 -07:00 |
|
David Back
|
3f2a49d243
|
fix list of tablet IDs ray cast checks in edit.js
|
2018-03-17 10:59:18 -07:00 |
|
John Conklin II
|
0934a7d467
|
Merge pull request #12673 from huffman/fix/ie-edge-ds-settings-failure
Fix DS settings issues on IE and Edge
|
2018-03-16 17:35:56 -07:00 |
|
Ryan Huffman
|
fdca6e0832
|
Update direct _requestHeaders access to be consistent with other reads
|
2018-03-16 15:28:27 -07:00 |
|
John Conklin II
|
1bf2da5119
|
Merge pull request #12670 from SamGondelman/modelCrash
RC65 Hotfix: Model behaves correctly if missing material
|
2018-03-16 15:00:29 -07:00 |
|
Brad Davis
|
2f59283053
|
Fix initialization of QML overlay surfaces
|
2018-03-16 14:48:08 -07:00 |
|
Stephen Birarda
|
debea3791d
|
Fix DS content backups not loading on IE
IE does not support Object.assign
|
2018-03-16 14:30:03 -07:00 |
|
Ryan Huffman
|
3a98cf284f
|
Fix DS not handling lowercase header keys
|
2018-03-16 14:30:03 -07:00 |
|
SamGondelman
|
1e89debc4e
|
model behaves correctly if missing material
|
2018-03-16 13:38:45 -07:00 |
|
Brad Davis
|
1dfde86680
|
Fix typo
|
2018-03-16 11:11:08 -07:00 |
|
Brad Davis
|
ca38b9fe34
|
Fix invalid QML surface cache interaction
|
2018-03-16 10:53:59 -07:00 |
|
John Conklin II
|
0d343ee827
|
Merge pull request #12522 from highfidelity/RC65
Beta Release 65 - includes up to Developer Release 7911
|
2018-03-15 14:30:55 -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 |
|