Wayne Chen
07599c02c8
true reversion of scrips param
2018-12-05 08:16:54 -08:00
Wayne Chen
4daa943510
fixing scripts param/reverting some qml
2018-12-04 17:17:58 -08:00
Wayne Chen
57b21730de
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 17:01:56 -08:00
Wayne Chen
3951203b55
adding tablet bg/no movement in login state
2018-12-04 16:50:01 -08:00
Brad Hefta-Gaub
77e1c98264
Merge pull request #14528 from sethalves/fix-delete-home
...
work around menu-item name hash collision for Home
2018-12-04 15:04:25 -08:00
John Conklin II
725cf6c526
Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets
...
Head and Hand offsets for Vive Trackers now function as expected
2018-12-04 14:25:02 -08:00
Wayne Chen
2d8b638370
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 14:19:28 -08:00
Wayne Chen
a24cd41367
getting textfield into focus
2018-12-04 14:19:09 -08:00
Adam Smith
763e6d1a95
Merge pull request #14444 from SamGondelman/actionData
...
Case 19861: Fix: Shouldn't be able to write actionData from script
2018-12-04 11:25:00 -08:00
Adam Smith
864e9ca8ae
Merge pull request #14443 from SamGondelman/hud
...
Case 19660: Fix HUD crash
2018-12-04 11:10:43 -08:00
John Conklin II
e4b68f1d38
Merge pull request #14455 from samcake/one
...
case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine
2018-12-04 10:46:45 -08:00
Wayne Chen
1375e85f2c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 10:21:12 -08:00
Wayne Chen
e7e42e3430
adding steam linking
2018-12-04 10:03:40 -08:00
Sam Gateau
d2ff4d4674
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-12-03 20:52:43 -08:00
Seth Alves
541d0ab4d6
work around menu-item name hash collision for Home
2018-12-03 17:33:04 -08:00
Wayne Chen
dc3381d4a9
updating artwork
2018-12-03 17:28:10 -08:00
Wayne Chen
22bf4fc5c4
removing fromBody
2018-12-03 16:11:13 -08:00
Wayne Chen
5beb810604
adding more steam login flow
2018-12-03 16:09:10 -08:00
Clément Brisset
56ac34f9d1
Merge pull request #14506 from Atlante45/fix/misc-agent
...
Fix various AC bugs
2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
...
Fix Agent crash on shutdown
2018-12-03 14:17:35 -08:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval
...
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-12-03 10:27:32 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
Wayne Chen
43b5a14180
fixing missing header function
2018-11-30 20:25:35 -08:00
Wayne Chen
ef12b1128b
Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2
2018-11-30 20:18:04 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle
...
Swap key light directions in Create
2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable
...
Fix draggable inputs not being tabbable
2018-11-30 19:28:11 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field
...
Fix empty rgb field in Create going black
2018-11-30 18:19:44 -08:00
Clément Brisset
0dac8580ee
Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master
...
Fix audio mixer crash
2018-11-30 17:03:36 -08:00
Zach Fox
051b7cfbb8
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-11-30 16:12:21 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2
2018-11-30 13:05:17 -08:00
Wayne Chen
c8783776fe
removing mousearea, fixing continue button
2018-11-30 13:02:29 -08:00
Shannon Romano
f3c0118602
Merge pull request #14454 from NissimHadar/19991-MacAppData
...
case 19991 - implement AppData for Mac
2018-11-30 11:38:21 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
...
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
...
suppress 'No instance available' messages during shutdown. try a dif…
2018-11-30 10:10:43 -08:00
Shannon Romano
0bf5be57f8
Merge pull request #14488 from danteruiz/limit-avatar-entity-data
...
don't save joint information for avatar entities in avatarbookmarks.json
2018-11-30 09:49:01 -08:00
Shannon Romano
41ce976869
Merge pull request #14481 from danteruiz/master-mallets
...
fixing keyboard mallets dimensions (Master)
2018-11-30 09:46:32 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option
...
Keyboard menu option in general settings
2018-11-30 09:43:10 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988
...
Fix memory accumulating while Interface is minimized
2018-11-30 09:39:14 -08:00
Shannon Romano
08bbe27522
Merge pull request #14489 from ctrlaltdavid/M17990-a
...
Remove unused avatar attachment constant
2018-11-30 09:37:40 -08:00
Jeff Clinton
04f09d70e3
Merge pull request #14464 from ctrlaltdavid/M17406
...
Fix fax grab to near grab transition and haptic pulses
2018-11-30 09:18:51 -08:00
Wayne Chen
5e82bc78b7
fixing sign up screen
2018-11-29 20:17:18 -08:00
NissimHadar
8973b7caea
Merge branch 'master' into 19991-MacAppData
2018-11-29 17:45:58 -08:00
NissimHadar
87c863584d
Just to remove conflict.
2018-11-29 17:43:19 -08:00
Clement
c53c52c7a0
Fix various Agent bugs
2018-11-29 17:42:04 -08:00
Wayne Chen
707339dd2a
allowing clicking any mousearea back to the textfield/disable movement ctrls
2018-11-29 17:18:40 -08:00
Wayne Chen
e033492472
enable mouse capture upon resume
2018-11-29 15:40:00 -08:00
Wayne Chen
62848700f3
disable mouse capture in login state
2018-11-29 15:37:35 -08:00
Wayne Chen
a80017c8c3
fixing typo
2018-11-29 15:04:34 -08:00
Sam Gateau
1dcddb9541
Merge pull request #14440 from NissimHadar/19942-MacInstall
...
19942 Mac installation procedure
2018-11-29 14:38:07 -08:00
Wayne Chen
ba62cbf45c
making lasers appear on the tip of the mallets
2018-11-29 14:17:39 -08:00
