Commit graph

74352 commits

Author SHA1 Message Date
Wayne Chen
1a86b8d172 50% opacity/bold shortcut text 2018-12-06 14:58:39 -08:00
Wayne Chen
1ddba8e787 KB following updated login screen/keep login screen active 2018-12-06 14:58:06 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
Ryan Huffman
13c3b410d8
Merge pull request #14495 from dback2/draggableNumberFixes76-master
Draggable numbers - RC76 fixes to master
2018-12-06 09:47:38 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug
removed the code that turns off inactive hands in MyAvatar.cpp
2018-12-06 09:42:34 -08:00
Jeff Clinton
e65e8d29a1
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake
Ensure that hand is in grasp pose during desktop handshake animation
2018-12-06 09:41:29 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching
Respect changed audio settings when switch displays (Master)
2018-12-06 09:13:47 -08:00
Jeff Clinton
7f242b8c0e
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
2018-12-06 09:11:49 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc cleaning up commented code 2018-12-06 09:04:57 -08:00
Wayne Chen
f8a55a9196 25% opacity from PM req/fixing error message in profile body 2018-12-05 19:42:44 -08:00
Wayne Chen
a3a575acd1 updating background img binaries 2018-12-05 19:12:21 -08:00
Wayne Chen
f7265378bd updating background img 2018-12-05 19:11:58 -08:00
Wayne Chen
037abd9b5e don't allow PC keyboard in HMD login/fix sign up password 2018-12-05 18:14:59 -08:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching
Case 19473: Reduce branching in our shaders
2018-12-05 16:42:42 -08:00
Wayne Chen
11c40666e4 removing trailing tests 2018-12-05 11:29:58 -08:00
Wayne Chen
27e4e1c245 pitch updates login pos/fix signup errors 2018-12-05 11:24:27 -08:00
Dante Ruiz
3123bb37e4 fix audio switching issue 2018-12-05 10:34:47 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
Fix minor avatar-mixer memory leaks
2018-12-05 10:29:29 -08:00
Wayne Chen
eb51a5b7b6 changing opacity to 0.5 2018-12-05 10:16:48 -08:00
Wayne Chen
37beab3ab3 fixing the desktop tablet problem again 2018-12-05 09:36:56 -08:00
Wayne Chen
40053ef13a make sure android still functions as expected 2018-12-05 09:10:17 -08:00
Wayne Chen
328e1ebc27 autotester param fully functional 2018-12-05 08:51:13 -08:00
Wayne Chen
3d99ffc459 outing oculus login 2018-12-05 08:25:01 -08:00
Wayne Chen
a2a4d2ff89 removing trailing debug 2018-12-05 08:21:11 -08:00
Wayne Chen
a30f4ed0b3 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-05 08:17:06 -08:00
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
2a77a29f8a
Delete LoginScreenDialog.qml 2018-12-04 17:07:03 -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
Thijs Wenker
f38f39c84d ignore shortcuts in TEXTAREA elements 2018-12-03 19:42:57 +01:00