Ken Cooke
|
ff6c9f3127
|
Merge pull request #12704 from ElderOrb/FB13057
Improve audio devices selection logic
|
2018-03-30 11:18:05 -07:00 |
|
Zach Fox
|
32e5e9986f
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-30 10:10:43 -07:00 |
|
Ken Cooke
|
a2be291363
|
Merge pull request #12715 from ctrlaltdavid/21677
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-30 09:41:54 -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 |
|
Alexander Ivash
|
814cfa4587
|
fix TabletAssetServer
|
2018-03-30 00:09:28 +03: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 |
|
Alexander Ivash
|
e5da59a62f
|
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
|
2018-03-29 23:01:59 +03:00 |
|
Olivier Prat
|
5f8693aae2
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 15:52:38 -04: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 |
|
John Conklin II
|
379df87d0c
|
Merge pull request #12697 from misslivirose/feat/disable-add-without-url
Disable Add Button in Model Modal until user has entered text in the model URL
|
2018-03-29 11:39:48 -07:00 |
|
Dante Ruiz
|
f7a081c9ec
|
minimize diff
|
2018-03-29 11:24:31 -07:00 |
|
Dante Ruiz
|
420672a769
|
fix-qml-confict
|
2018-03-29 11:24:08 -07:00 |
|
Dante Ruiz
|
e738274e90
|
map flying down back to C key
|
2018-03-29 11:10:39 -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 |
|
amantley
|
3f44b88d2d
|
added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class
|
2018-03-29 10:09:51 -07:00 |
|
John Conklin II
|
97d9c1b735
|
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
|
2018-03-29 09:37:23 -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 |
|
Olivier Prat
|
3c8cd48dfb
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 07:21:01 -04:00 |
|
Liv Erickson
|
387ff680d5
|
support deleted scenario
|
2018-03-28 18:12:30 -07:00 |
|
Liv Erickson
|
b78f00342e
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
|
2018-03-28 17:53:42 -07:00 |
|
Sam Gondelman
|
d2a74e5713
|
Merge pull request #12686 from gcalero/android_ui_not_move_camera
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
|
2018-03-28 17:14:42 -07:00 |
|
Stephen Birarda
|
35ee1bec09
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:56:53 -07:00 |
|
Stephen Birarda
|
0172c24cf2
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:47:09 -07:00 |
|
amantley
|
90d87c5b5d
|
changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety
|
2018-03-28 14:00:36 -07:00 |
|
John Conklin II
|
790162c88b
|
Merge pull request #12689 from ctrlaltdavid/21808
Reinstate Overlays.getOverlayObject API function
|
2018-03-28 14:00:28 -07:00 |
|
Cristian Luis Duarte
|
f0bcaa47c8
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-28 16:47:21 -03:00 |
|
amantley
|
4b1f974561
|
fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h
|
2018-03-28 11:57:48 -07:00 |
|
Zach Fox
|
0175028a88
|
Ensure location is correctly updated when replacing set from Checkout page
|
2018-03-28 11:31:51 -07:00 |
|
amantley
|
95f1d0e4fa
|
added get and set functions for the activate recenter variables
|
2018-03-28 10:33:00 -07:00 |
|
Zach Fox
|
ca2fba675d
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-28 10:28:32 -07:00 |
|
Brad Hefta-Gaub
|
16df773de4
|
Merge pull request #12721 from highfidelity/RC66
RC66 - Mergeback
|
2018-03-28 09:55:46 -07:00 |
|
John Conklin II
|
586fb4829c
|
Merge pull request #12637 from druiz17/fix-asset-server-qml
Fix asset server qml sorting
|
2018-03-28 09:35: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 |
|
Olivier Prat
|
7fa5e384b9
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-28 11:21:07 -04:00 |
|
Seth Alves
|
46fb2033f2
|
Merge pull request #12574 from druiz17/remap-keybaord
changing keyboard mapping
|
2018-03-27 19:00:05 -07:00 |
|
Seth Alves
|
bb101956a6
|
fix entity importing
|
2018-03-27 18:25:43 -07:00 |
|
amantley
|
9f3b82a417
|
added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly
|
2018-03-27 18:21:14 -07:00 |
|
Dante Ruiz
|
ad9ca0da20
|
fix tablet version
|
2018-03-27 16:03:06 -07:00 |
|
John Conklin II
|
a258a330d3
|
Merge pull request #12676 from druiz17/fix-keyboard
fixing AddressManager keyboard when switching domains
|
2018-03-27 15:34:23 -07:00 |
|
Dante Ruiz
|
197662fd5e
|
fix contextOverlay highlighing all entities
|
2018-03-27 15:22:22 -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 |
|
David Rowe
|
d1d58eceab
|
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-27 13:04:50 +13:00 |
|
Zach Fox
|
db2f3451bd
|
Support .content.zip content sets
|
2018-03-26 16:20:29 -07:00 |
|
Zach Fox
|
bf48ecda6d
|
Fix cert location for content sets
|
2018-03-26 14:48:05 -07:00 |
|
Alexander Ivash
|
06410ec342
|
temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged
|
2018-03-27 00:44:17 +03: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 |
|
Dante Ruiz
|
1f23e7ab8b
|
fixing more edge cases
|
2018-03-26 10:15:15 -07:00 |
|
Dante Ruiz
|
b8796db1e5
|
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
|
2018-03-26 09:13:58 -07:00 |
|
Cristian Luis Duarte
|
6cb5cd7f92
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-26 11:19:42 -03:00 |
|
Alexander Ivash
|
8e551f4dc0
|
re-select re-plugged device
|
2018-03-25 13:49:59 +03:00 |
|
Alexander Ivash
|
3c45f17d70
|
remove unused code
|
2018-03-25 13:44:16 +03:00 |
|
Alexander Ivash
|
f6bbdec902
|
remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged
note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop
|
2018-03-25 13:43:51 +03:00 |
|
Dante Ruiz
|
96707a2568
|
fix mappoing conflicts
|
2018-03-23 16:43:36 -07:00 |
|
Cristian Luis Duarte
|
686af4ff77
|
Clean code that manually checked for windows coordinates to disable radar touch
|
2018-03-23 20:02:51 -03:00 |
|
Cristian Luis Duarte
|
242b009562
|
Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.
|
2018-03-23 18:59:55 -03:00 |
|
Dante Ruiz
|
28e61bcbb1
|
fix typo
|
2018-03-23 11:57:01 -07:00 |
|
Dante Ruiz
|
a14d5c6546
|
make alternate keys work
|
2018-03-23 11:55:16 -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 |
|
Dante Ruiz
|
f36a916fb6
|
revert comment change
|
2018-03-22 17:44:17 -07:00 |
|
Dante Ruiz
|
4d52caccde
|
making some more requested changes
|
2018-03-22 17:39:22 -07:00 |
|
Dante Ruiz
|
1d17658c80
|
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
|
2018-03-22 16:29:16 -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 |
|
Liv Erickson
|
1244559618
|
remove spaces for clean-ness
|
2018-03-22 15:37:12 -07:00 |
|
Liv Erickson
|
0647155c30
|
re-add experimental image removal
|
2018-03-22 15:33:23 -07:00 |
|
Liv Erickson
|
f62e1ed54e
|
disable add button on model until text is entered
|
2018-03-22 15:29:41 -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 |
|
Dante Ruiz
|
9d8770b134
|
changing speed
|
2018-03-21 13:25:50 -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 |
|
Dante Ruiz
|
cce77e3e68
|
made requested changes
|
2018-03-21 10:15:42 -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 |
|
Dante Ruiz
|
86cd5ffa30
|
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
|
2018-03-21 08:49:25 -07:00 |
|
David Rowe
|
8df6cd58c6
|
Document Overlays.getOverlayObject's use for web3d event bridge
|
2018-03-21 15:50:22 +13:00 |
|
David Rowe
|
05efc5a231
|
Revert "Remove Overlays.getOverlayObject() from JavaScript API"
This reverts commit 8e2a3e8c99.
|
2018-03-21 15:36:39 +13:00 |
|
Olivier Prat
|
143a315f1d
|
Fade edited objects are now selected with ray picking
|
2018-03-20 15:29:50 -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 |
|