Zach Fox
|
a2f5891a0b
|
Cleanup 'Private' HMD Preview State Machine Logic
|
2018-04-10 16:00:18 -07:00 |
|
Zach Fox
|
ffab27d442
|
Commerce: Fix Certificate Info error
|
2018-04-10 15:54:55 -07:00 |
|
Zach Fox
|
a9b9a1cb10
|
Commerce: Gifts
|
2018-04-10 15:54:19 -07:00 |
|
Clément Brisset
|
c62a701a2d
|
Merge pull request #12838 from highfidelity/RC66
RC66 merge back to master
|
2018-04-09 13:17:12 -07:00 |
|
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 |
|
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 |
|
Stephen Birarda
|
1d76dea9f6
|
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
|
2018-04-06 10:43:01 -07: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 |
|
Howard Stearns
|
3a428bc44f
|
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1
Fix 'Private' HMD preview texture enable/disable...again
|
2018-04-04 10:03:18 -07:00 |
|
Seth Alves
|
2df334c50e
|
Merge pull request #12663 from ElderOrb/FB12870
Fix for not updating checkbox state on 'baking' / 'unbaking'.
|
2018-04-04 09:03:03 -07:00 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -07:00 |
|
howard-stearns
|
01d90ea1a5
|
Introduce safeLoading.
|
2018-04-03 13:49:09 -07:00 |
|
Zach Fox
|
f20eddefc8
|
Fix 'Private' HMD preview texture enable/disable...again
|
2018-04-03 13:46:02 -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
|
53a5261905
|
Merge pull request #12712 from zfox23/newUpdateCertLocation
Fix cert location for content sets; handle .content.zip content sets
|
2018-04-03 09:10:11 -07:00 |
|
Seth Alves
|
e8a62d2943
|
Merge pull request #12740 from druiz17/fix-scope
Fix name conflict with c++ class and qml file(master)
|
2018-03-30 15:41:42 -07:00 |
|
Zach Fox
|
32e5e9986f
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-30 10:10:43 -07:00 |
|
Alexander Ivash
|
814cfa4587
|
fix TabletAssetServer
|
2018-03-30 00:09:28 +03:00 |
|
Alexander Ivash
|
e5da59a62f
|
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
|
2018-03-29 23:01:59 +03: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 |
|
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
|
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 |
|
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 |
|
Cristian Luis Duarte
|
f0bcaa47c8
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-28 16:47:21 -03:00 |
|
Zach Fox
|
0175028a88
|
Ensure location is correctly updated when replacing set from Checkout page
|
2018-03-28 11:31:51 -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 |
|
Seth Alves
|
46fb2033f2
|
Merge pull request #12574 from druiz17/remap-keybaord
changing keyboard mapping
|
2018-03-27 19:00:05 -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 |
|
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 |
|
Seth Alves
|
4f7d856a1c
|
don't free dialogs to avoid crash in setKeyboardRaised
|
2018-03-27 09:28:55 -07: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 |
|
Zach Fox
|
a588776b47
|
Fix infinite loading when authing wallet during Checkout
|
2018-03-26 13:19:40 -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 |
|
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 |
|
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
|
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 |
|