John Conklin II
|
c3cad62bff
|
Merge pull request #12774 from howard-stearns/RC66-commerce-workaround-for-broken-qt5.10
Rc66 commerce workaround for broken qt5.10
|
2018-04-04 11:39:44 -07:00 |
|
howard-stearns
|
01d90ea1a5
|
Introduce safeLoading.
|
2018-04-03 13:49:09 -07:00 |
|
howard-stearns
|
f229e24e60
|
fix help.js noisy log reference to undefined string#startsWith
|
2018-04-03 13:48:51 -07:00 |
|
John Conklin II
|
5151041e4a
|
Merge pull request #12770 from sethalves/pr12769-for-rc66
Fix move after import
|
2018-04-03 13:41:56 -07:00 |
|
John Conklin II
|
db56656fcc
|
Merge pull request #12768 from ElderOrb/FB13789_RC66
Fix regression with 'Log in/Sign up' dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-04-03 13:24:50 -07:00 |
|
Seth Alves
|
249a97b5d0
|
don't move or rotate children if a parent is being changed by the same action
|
2018-04-03 12:14:59 -07:00 |
|
Seth Alves
|
08b7326bd1
|
when moving a group of selections, don't move a child if a parent is being moved
|
2018-04-03 12:14:40 -07:00 |
|
Alexander Ivash
|
ccea3efe1e
|
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-04-03 21:43:40 +03:00 |
|
John Conklin II
|
aceb3d13b4
|
Merge pull request #12749 from samcake/rc66-mirror
RC66: Fix crash on Macos when looking at a mirror or when secondary camera is enabled
|
2018-04-02 10:16:04 -07:00 |
|
Sam Gateau
|
8178ee7f34
|
Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror
|
2018-03-30 17:00:11 -07:00 |
|
Sam Gateau
|
d5496d68fd
|
FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly
|
2018-03-30 16:58:41 -07:00 |
|
John Conklin II
|
8c8400947f
|
Merge pull request #12745 from SamGondelman/shadow
RC66: Fix shadows on primitives
|
2018-03-30 12:52:08 -07:00 |
|
SamGondelman
|
5a7e9d8e3e
|
fix shadows on primitives
|
2018-03-30 09:48:04 -07:00 |
|
John Conklin II
|
5013760aa1
|
Merge pull request #12742 from jherico/fix/rc66_crashes
Fix/rc66 crashes
|
2018-03-29 18:04:52 -07:00 |
|
John Conklin II
|
90dec1d3ef
|
Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66
RC66: fix cmake changes for script copy for dev builds
|
2018-03-29 13:57:45 -07:00 |
|
John Conklin II
|
b1ac2fd191
|
Merge pull request #12728 from SamGondelman/signedChar
Android: Fix octal code signed char issue
|
2018-03-29 13:56:06 -07:00 |
|
John Conklin II
|
c7f7e2487c
|
Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66
fix -- make drag-and-drop of json mean import again
|
2018-03-29 12:46:09 -07:00 |
|
John Conklin II
|
d6b652bdf3
|
Merge pull request #12735 from druiz17/RC66
Fix name conflict with c++ class and qml file(RC66)
|
2018-03-29 12:06:15 -07:00 |
|
Seth Alves
|
dcfebde54a
|
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
|
2018-03-29 10:50:43 -07:00 |
|
John Conklin II
|
c4b46d0a5f
|
Merge pull request #12719 from Atlante45/fix/ess-method-call
Fix ESS remote method calls for connect only users
|
2018-03-29 10:07:44 -07:00 |
|
SamGondelman
|
afe39aba46
|
fix octal code char issue
|
2018-03-29 10:05:08 -07:00 |
|
Dante Ruiz
|
0bdf26faaf
|
minimize diff
|
2018-03-29 09:29:01 -07:00 |
|
Dante Ruiz
|
8cdb59413d
|
fix-qml-confict
|
2018-03-29 09:26:05 -07:00 |
|
Stephen Birarda
|
35ee1bec09
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:56:53 -07:00 |
|
Clement
|
cb07fc47dc
|
Fix ESS remote method calls for connect only users
|
2018-03-28 14:01:03 -07:00 |
|
John Conklin II
|
d59a721f16
|
Merge pull request #12724 from sethalves/fix-entity-import
fix entity importing
|
2018-03-28 09:18:20 -07:00 |
|
Brad Davis
|
9be162de95
|
Synchronously shut down QML rendering threads
|
2018-03-28 09:13:46 -07:00 |
|
Brad Davis
|
aacfe92751
|
Don't trigger crashes from timers while waiting for some operation on exit
|
2018-03-28 09:09:56 -07:00 |
|
Seth Alves
|
bb101956a6
|
fix entity importing
|
2018-03-27 18:25:43 -07:00 |
|
Brad Davis
|
29106fbbbe
|
Prevent potential double delete of QML overlays
|
2018-03-27 14:18:19 -07:00 |
|
Brad Davis
|
eb20181b60
|
Shut down the overlay interface on exit
|
2018-03-27 14:18:01 -07:00 |
|
John Conklin II
|
0862f345fe
|
Merge pull request #12717 from sethalves/workaround-dialog-crash
fix -- work around asset-upload dialog crash
|
2018-03-27 13:35:50 -07:00 |
|
John Conklin II
|
7c505a0b85
|
Merge pull request #12711 from sethalves/serverless-tutorial-rc66
Serverless tutorial rc66
|
2018-03-27 11:17:07 -07:00 |
|
Seth Alves
|
4f7d856a1c
|
don't free dialogs to avoid crash in setKeyboardRaised
|
2018-03-27 09:28:55 -07:00 |
|
John Conklin II
|
3e23ad4900
|
Merge pull request #12709 from zfox23/RC66_commerce_fixCheckoutInfiniteLoad
RC66: Fix infinite loading when authing wallet during Checkout
|
2018-03-26 14:33:57 -07:00 |
|
Seth Alves
|
60ed033667
|
new content md5
|
2018-03-26 14:33:08 -07:00 |
|
Ryan Huffman
|
d01a58517f
|
Fix serverless content not using correct directories
|
2018-03-26 14:32:52 -07:00 |
|
Seth Alves
|
6948de7e24
|
default to serverless tutorial
|
2018-03-26 14:32:40 -07:00 |
|
Stephen Birarda
|
787947b6a8
|
add a default tutorial json for dev interface
|
2018-03-26 14:32:26 -07:00 |
|
Stephen Birarda
|
b52a877d8d
|
optionally grab serverless tutorial, on for installers
|
2018-03-26 14:32:11 -07:00 |
|
Zach Fox
|
a588776b47
|
Fix infinite loading when authing wallet during Checkout
|
2018-03-26 13:19:40 -07:00 |
|
Sam Gondelman
|
11f5e7812b
|
Merge pull request #12702 from SamGondelman/android
Android: Fix tonemapping
|
2018-03-23 17:43:57 -07:00 |
|
SamGondelman
|
a19f71e759
|
fix tonemapping on android
|
2018-03-23 14:16:47 -07:00 |
|
John Conklin II
|
563ff61325
|
Merge pull request #12661 from SamGondelman/android
Android: Stats, disable IK, reduce impact of InputRecorder
|
2018-03-23 11:08:50 -07:00 |
|
Ryan Huffman
|
e90c051744
|
Merge pull request #11872 from huffman/feat/version-wo
Add asset server baking versioning
|
2018-03-23 08:27:37 -07:00 |
|
John Conklin II
|
c61ed697df
|
Merge pull request #12552 from vladest/assetbrowser_cosmetics
Wrap text in query dialogs. Add right margins for input field and but…
|
2018-03-22 17:56:47 -07:00 |
|
John Conklin II
|
0bc23456c3
|
Merge pull request #12682 from ctrlaltdavid/21807
JSDoc that an entity's clientOnly property can be set at entity creation
|
2018-03-22 17:55:45 -07:00 |
|
Ryan Huffman
|
d2ae30f8e0
|
Disable support for baking scripts in the Asset Server
|
2018-03-22 16:22:59 -07:00 |
|
Howard Stearns
|
113670e33b
|
Merge pull request #12638 from zfox23/commerce_upgrades_1
Commerce: Item Updates!
|
2018-03-22 15:40:22 -07:00 |
|
Clément Brisset
|
feec59655c
|
Merge pull request #12692 from highfidelity/stable
Merge stable back into master
|
2018-03-22 15:08:30 -07:00 |
|