Wayne Chen
|
e7e42e3430
|
adding steam linking
|
2018-12-04 10:03:40 -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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
59b7cdf318
|
Fix empty rgb field in Create going black
|
2018-11-29 14:10:22 -08:00 |
|
David Rowe
|
dc05cdee5a
|
Merge branch 'master' into M17406
# Conflicts:
# scripts/system/controllers/controllerModules/nearParentGrabEntity.js
|
2018-11-30 09:44:09 +13:00 |
|
Jeff Clinton
|
be0a1ed2f8
|
Merge pull request #14498 from kencooke/audio-options-pitch-bugfix
Fix the audio injector "pitch" property
|
2018-11-29 10:07:07 -08:00 |
|
Wayne Chen
|
5fb183285e
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-11-29 09:25:23 -08:00 |
|
Seth Alves
|
87e4c17194
|
Merge pull request #14429 from danteruiz/disable-highlighting
Remove entity highlighting
|
2018-11-29 09:04:56 -08:00 |
|
Ken Cooke
|
88d935a28e
|
Fix the audio injector "pitch" property
|
2018-11-29 08:12:14 -08:00 |
|
Wayne Chen
|
295d40724a
|
adding difference in text shown between tablet/other mode
|
2018-11-28 19:24:47 -08:00 |
|
Wayne Chen
|
34fb7159e2
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-11-28 19:24:20 -08:00 |
|
Wayne Chen
|
b0fb7778cf
|
fixing some text, turning off lasers until they intersect login overlay
|
2018-11-28 19:17:30 -08:00 |
|
Wayne Chen
|
9deb15b9f6
|
Merge branch 'master' into loginInitiative2
|
2018-11-28 19:10:20 -08:00 |
|
Shannon Romano
|
f4535e6784
|
Merge pull request #14493 from kencooke/audio-asan-warnings2
Fix UBSAN warning
|
2018-11-28 18:09:36 -08:00 |
|
Ken Cooke
|
11252a8f56
|
Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values
|
2018-11-28 16:48:34 -08:00 |
|
Clement
|
c29f6346d8
|
Clear mixing structures when we stop mixing for node
|
2018-11-28 16:09:04 -08:00 |
|
Wayne Chen
|
527f8a2b59
|
UI feedback + new overlay position update
|
2018-11-28 15:38:37 -08:00 |
|
Jeff Clinton
|
f98f070c8b
|
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
|
2018-11-28 14:19:53 -08:00 |
|
David Rowe
|
1683179fe5
|
Remove unused constant
|
2018-11-29 09:14:10 +13:00 |
|
Seth Alves
|
0de011dd71
|
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes
Fix script engine crashes when reloading scripts.
|
2018-11-28 12:04:52 -08:00 |
|
Shannon Romano
|
ff934a8f87
|
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
|
2018-11-28 11:10:27 -08:00 |
|
Dante Ruiz
|
8be775c2b7
|
don't save joint information for avatar entities
|
2018-11-28 10:54:39 -08:00 |
|
Zach Fox
|
022fea107f
|
Merge pull request #14476 from zfox23/payIn1
Pay-In API Frontend, Part One
|
2018-11-28 10:32:01 -08:00 |
|