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 |
|
Brad Davis
|
2f59283053
|
Fix initialization of QML overlay surfaces
|
2018-03-16 14:48:08 -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
|
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 |
|
Zach Fox
|
a0eb7e0712
|
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-07 15:01:12 -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 |
|
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 |
|
John Conklin II
|
b4000c04bc
|
Merge pull request #12432 from highfidelity/feat/content-settings
Add content archives to domain server web interface
|
2018-02-27 13:30:53 -08:00 |
|
Howard Stearns
|
1fb0f898b4
|
Merge pull request #12505 from howard-stearns/wallet-help
new wallet help
|
2018-02-27 13:18:36 -08:00 |
|
Howard Stearns
|
0e4f3460b3
|
Merge pull request #12497 from howard-stearns/end-seeding
End seeding
|
2018-02-27 13:18:13 -08:00 |
|
howard-stearns
|
30896c264b
|
reduced text
|
2018-02-27 12:04:41 -08:00 |
|
howard-stearns
|
53b976b400
|
fix typo in bank href
|
2018-02-27 11:46:06 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21 , reversing
changes made to c0f20900a0 .
|
2018-02-27 11:33:05 -08:00 |
|
Stephen Birarda
|
9cc348ef27
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-27 09:59:37 -08:00 |
|
Zach Fox
|
9170244312
|
Make WindowScriptingInterface available to tablet
|
2018-02-27 09:36:02 -08:00 |
|
howard-stearns
|
053640f216
|
a guess a linking bank
|
2018-02-27 08:36:45 -08:00 |
|
howard-stearns
|
ce0ae61947
|
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
|
2018-02-27 08:10:17 -08:00 |
|
John Conklin II
|
48f0cded05
|
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
|
2018-02-27 07:53:25 -08:00 |
|
John Conklin II
|
25144f0fec
|
Merge pull request #12456 from Atlante45/fix/min-spec-crash
Fix crash when passing --checkMinSpec flag
|
2018-02-26 17:35:46 -08:00 |
|
Clément Brisset
|
2a7a71db13
|
Merge pull request #12477 from Atlante45/new-master
Merge stable back into master
|
2018-02-26 17:18:24 -08:00 |
|
howard-stearns
|
eb683d4793
|
mail is a link
|
2018-02-26 17:09:33 -08:00 |
|
Stephen Birarda
|
aa7bd2066a
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-26 17:02:00 -08:00 |
|
howard-stearns
|
2f6e2f6b84
|
new wallet help
|
2018-02-26 16:52:41 -08:00 |
|
Zach Fox
|
0802bd2c21
|
Fix going to marketplace main page from WalletChoice
|
2018-02-26 14:27:59 -08:00 |
|
Zach Fox
|
8223ebf393
|
Correctly handle referrer from WalletChoice
|
2018-02-26 12:44:41 -08:00 |
|
howard-stearns
|
4e4aebc7ee
|
get WalletChoice setup flow from My Purchases and confirmation. Still
not correct referrer.
|
2018-02-26 12:02:56 -08:00 |
|
John Conklin II
|
4feea929ce
|
Merge pull request #12449 from misslivirose/fix/atp-collisions
change default add to world shape for asset browser
|
2018-02-26 11:15:01 -08:00 |
|
John Conklin II
|
6316f33282
|
Merge pull request #12485 from dback2/avatarMotors
Add dynamic mode for scripted avatar motor
|
2018-02-26 11:03:30 -08:00 |
|
howard-stearns
|
2de72c125d
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 10:54:22 -08:00 |
|
John Conklin II
|
e586a35d38
|
Merge pull request #12489 from vladest/fix_table_sort_indicator
Make sure sort indicator is attached to the right of title
|
2018-02-26 10:33:27 -08:00 |
|
howard-stearns
|
a5cedde3c8
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 10:33:03 -08:00 |
|
John Conklin II
|
3201d2ba21
|
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-02-26 10:13:40 -08:00 |
|
NissimHadar
|
c0f20900a0
|
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
Corrected edge case of creating a snapshot with "" as the filename.
|
2018-02-26 09:39:16 -08:00 |
|
howard-stearns
|
30a6cca4b3
|
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
|
2018-02-26 09:26:09 -08:00 |
|
Zach Fox
|
b5c42bfeca
|
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps
Commerce: Extended Certificates - Apps!
|
2018-02-26 08:24:53 -08:00 |
|