John Conklin II
|
890a63afb4
|
Merge pull request #12833 from ElderOrb/FB14015_RC66
Close 'goto' app on pressing 'forward' / 'backward' buttons
|
2018-04-09 11:42:17 -07:00 |
|
John Conklin II
|
be3d5d03cc
|
Merge pull request #12808 from ElderOrb/FB13962_RC66
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
|
2018-04-09 09:42:00 -07:00 |
|
Alexander Ivash
|
faddc556d7
|
FB14015 - Go To app does not close when selecting forward and back arrows on desktop
|
2018-04-07 17:57:22 +03:00 |
|
Alexander Ivash
|
557b7ded66
|
fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear)
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
|
2018-04-06 03:00:44 +03:00 |
|
Seth Alves
|
8de545acdf
|
add new address accessor for 'public' addresses, use it for snapshot and stream
|
2018-04-05 13:39:51 -07:00 |
|
Seth Alves
|
4b0d338e57
|
on first run, send user to serverless tutorial rather than checking for a local sandbox
|
2018-04-04 18:00:11 -07:00 |
|
howard-stearns
|
01d90ea1a5
|
Introduce safeLoading.
|
2018-04-03 13:49:09 -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
|
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
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
d01a58517f
|
Fix serverless content not using correct directories
|
2018-03-26 14:32:52 -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 |
|
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 |
|
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 |
|
Howard Stearns
|
113670e33b
|
Merge pull request #12638 from zfox23/commerce_upgrades_1
Commerce: Item Updates!
|
2018-03-22 15:40:22 -07:00 |
|
John Conklin II
|
6d9892856d
|
Merge pull request #12510 from sethalves/serverless-domains
Serverless domains
|
2018-03-22 14:06:49 -07:00 |
|
Sam Gondelman
|
bbded2215d
|
Merge pull request #12665 from gcalero/android_bottombar_resize
Android - Resize bottombar after window size changes (to always fill …
|
2018-03-22 11:15:02 -07:00 |
|
John Conklin II
|
b6920a503c
|
Merge pull request #12618 from vladest/hificonstants_as_object
Hificonstants as object
|
2018-03-22 11:03:05 -07:00 |
|
Seth Alves
|
6c1d713968
|
review
|
2018-03-21 19:21:57 -07:00 |
|
Seth Alves
|
ed0778a68a
|
remove unused json file
|
2018-03-21 17:07:31 -07:00 |
|
Seth Alves
|
916ed3a0d4
|
review
|
2018-03-21 16:18:31 -07:00 |
|
Seth Alves
|
196f621a60
|
remove unneeded setSessionUUID
|
2018-03-21 15:21:49 -07:00 |
|
Seth Alves
|
bea7ee42e2
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-21 14:30:07 -07:00 |
|
Seth Alves
|
ef52ae13ee
|
rearrange domain-url-changed signals
|
2018-03-21 14:30:00 -07:00 |
|
John Conklin II
|
5bd3d0fab9
|
Merge pull request #12647 from birarda/feat/client-only-installer
add a CLIENT_ONLY build option and handle for installer
|
2018-03-21 11:20:36 -07:00 |
|
Seth Alves
|
4033af9b11
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-21 11:11:43 -07:00 |
|
Ken Cooke
|
f5f4e2a780
|
Merge pull request #12635 from ctrlaltdavid/21776
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
|
2018-03-21 09:27:51 -07:00 |
|
Sam Gateau
|
5cc0e24921
|
Merge pull request #12666 from jherico/fix/web_overlay_crash
Fix invalid QML surface cache interaction
|
2018-03-20 14:26:39 -07:00 |
|
Stephen Birarda
|
1405c8fcb3
|
add a client only option to cmake
|
2018-03-20 14:20:58 -07:00 |
|
Stephen Birarda
|
0074c0470d
|
Merge pull request #12524 from birarda/feat/runtime-beside-exe
switch back to app-local VC runtimes and UCRT
|
2018-03-20 14:07:27 -07:00 |
|
Seth Alves
|
585a523823
|
unmangle merge
|
2018-03-20 11:17:56 -07:00 |
|
John Conklin II
|
40d6e51da8
|
Merge pull request #12597 from ElderOrb/FB12956
Fix for broken 'toggle audio meter' button
|
2018-03-20 11:03:32 -07:00 |
|
Seth Alves
|
bd10cd6fa9
|
'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)
|
2018-03-20 10:53:17 -07:00 |
|
Stephen Birarda
|
cd887b5faf
|
Merge pull request #12654 from huffman/feat/content-zip-upload
Add support for .content.zip content uploads
|
2018-03-20 10:07:53 -07:00 |
|
Seth Alves
|
f61504b814
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-19 14:59:18 -07:00 |
|