Dante Ruiz
|
024dbcd712
|
fix scrolling
|
2017-11-30 09:07:19 -08:00 |
|
Dante Ruiz
|
7b95cd091b
|
Merge branch 'master' of github.com:highfidelity/hifi into laser-allwaysOn
|
2017-11-29 11:14:27 -08:00 |
|
Anthony Thibault
|
16ca1a9ec6
|
Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head
Head tracking bug fix for vive HMD users
|
2017-11-28 16:30:26 -08:00 |
|
Dante Ruiz
|
70820e6075
|
laser allways on prototype
|
2017-11-28 15:37:36 -08:00 |
|
David Back
|
1904daf623
|
Merge pull request #11869 from dback2/mirrorissues
prevent spectator cam from updating secondary cam aspect ratio when it's in use by mirrors
|
2017-11-28 14:05:47 -08:00 |
|
Anthony J. Thibault
|
8364700b7a
|
Head tracking bug fix for vive HMD users
|
2017-11-28 12:19:16 -08:00 |
|
Brad Hefta-Gaub
|
e6c6e5f239
|
Merge pull request #11883 from birarda/feat/kick-on-fingerprint
add option to kick logged in users by fingerprint too
|
2017-11-28 08:29:46 -08:00 |
|
Stephen Birarda
|
e2082c0bcf
|
apply machine fingerprint permissions if username absent
|
2017-11-27 19:02:40 -08:00 |
|
Stephen Birarda
|
8978254037
|
kick logged in by fingerprint/ip if enabled in DS settings
|
2017-11-27 18:23:14 -08:00 |
|
MiladNazeri
|
83d13717fe
|
Merge pull request #11752 from Menithal/21539
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
|
2017-11-27 16:02:01 -08:00 |
|
Brad Hefta-Gaub
|
6d6ac0a5a9
|
Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash
avoid a crash during domain change while wearing something
|
2017-11-27 13:01:48 -08:00 |
|
Brad Hefta-Gaub
|
068b93fc30
|
Merge pull request #11838 from druiz17/fix-grabbing
fixing setting incorrect parent when grabbing entities
|
2017-11-27 08:27:42 -08:00 |
|
Menithal
|
693da50a68
|
21539: Fixed None Checkmark being on Desktop mode
|
2017-11-27 07:59:04 +02:00 |
|
Menithal
|
5d52b9936b
|
21539: Updated Logic to match request
|
2017-11-27 07:42:18 +02:00 |
|
Menithal
|
ba1cd74ffe
|
21539: Moved Desktop HMD to None
|
2017-11-26 21:58:16 +02:00 |
|
Seth Alves
|
56e299c205
|
Merge pull request #11875 from samcake/orange
Fix the spot light direction
|
2017-11-23 11:11:31 -08:00 |
|
Sam Gateau
|
9a31a3dc95
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-22 23:29:55 -08:00 |
|
Sam Gateau
|
9c53ab719a
|
Merge branch 'orange' of https://github.com/samcake/hifi into orange
|
2017-11-22 23:29:25 -08:00 |
|
Seth Alves
|
9ccc416e80
|
avoid a crash during domain change
|
2017-11-22 16:34:56 -08:00 |
|
Clément Brisset
|
e20555bf38
|
Merge pull request #11870 from Atlante45/feat/update-default-perms
Add tmpRezCertified to default perms
|
2017-11-22 14:57:22 -08:00 |
|
Atlante45
|
b398e235a2
|
Add tmpRezCertified to default perms
|
2017-11-22 13:40:44 -08:00 |
|
David Back
|
1aeadcbc64
|
prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors
|
2017-11-22 11:38:52 -08:00 |
|
Zach Fox
|
fada02a76c
|
Merge pull request #11864 from zfox23/commerce_newHelpText
New Help questions/answers/link
|
2017-11-22 12:53:16 -05:00 |
|
Sam Gateau
|
8389137caa
|
Merge pull request #11834 from highfidelity/pointers
UI Pointer Optimization
|
2017-11-21 16:01:52 -08:00 |
|
Zach Fox
|
d2ebfbf064
|
New Help questions/answers/link
|
2017-11-21 18:55:48 -05:00 |
|
Brad Hefta-Gaub
|
c66a500fcf
|
Merge pull request #11861 from druiz17/fix-modal
Fix replace content dialog not closing
|
2017-11-21 15:43:20 -08:00 |
|
samcake
|
a0e40efdc8
|
Fixing all the changes of interface name coming from upstream
|
2017-11-21 14:55:58 -08:00 |
|
Dante Ruiz
|
767b0fa4af
|
remove unused variable warning
|
2017-11-21 14:45:55 -08:00 |
|
samcake
|
ebd701a1ab
|
Merging with master
|
2017-11-21 14:40:37 -08:00 |
|
samcake
|
84ff40c717
|
Merging with master
|
2017-11-21 14:12:47 -08:00 |
|
Dante Ruiz
|
c9ad7b1db5
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-modal
|
2017-11-21 13:56:22 -08:00 |
|
Dante Ruiz
|
88c3adbff1
|
change askToReplaceDomainContent to use async question and warning
|
2017-11-21 13:56:11 -08:00 |
|
Dante Ruiz
|
56972d1547
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing
|
2017-11-21 13:09:45 -08:00 |
|
Brad Hefta-Gaub
|
817afcd083
|
Merge pull request #11741 from ZappoMan/entityItemCleanup
Entity item cleanup
|
2017-11-21 12:24:46 -08:00 |
|
Brad Hefta-Gaub
|
5914f27027
|
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
QML & Web generated audio now follow the client audio device selection
|
2017-11-21 11:29:48 -08:00 |
|
ZappoMan
|
3a967ca895
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-21 10:53:29 -08:00 |
|
Brad Hefta-Gaub
|
0945c1c50b
|
Merge pull request #11851 from Atlante45/feat/wizard
Reworked wizard congratulation page.
|
2017-11-21 09:15:59 -08:00 |
|
Brad Hefta-Gaub
|
4d1e90dfca
|
Merge pull request #11821 from dback2/mirrorfanciness3
Mirror projection for Secondary Camera
|
2017-11-21 07:59:07 -08:00 |
|
Brad Hefta-Gaub
|
5dadec0b93
|
Merge pull request #11845 from thoys/feat/parentJointName
Import JSON parentJointName value
|
2017-11-21 07:58:13 -08:00 |
|
ZappoMan
|
b44ced4c21
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-20 17:19:18 -08:00 |
|
Thijs Wenker
|
627fee80ec
|
added support for exporting parentJointName
|
2017-11-21 01:49:56 +01:00 |
|
Howard Stearns
|
89425ca210
|
Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log
consolidated blockchain history log
|
2017-11-20 16:19:27 -08:00 |
|
Howard Stearns
|
4018b99118
|
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
Turn Commerce on by default!
|
2017-11-20 16:18:53 -08:00 |
|
Elisa Lupin-Jimenez
|
3211aa7d13
|
Merge pull request #11849 from elisa-lj11/blocks
Zip file structures replicated in asset server
|
2017-11-20 16:13:51 -08:00 |
|
Brad Hefta-Gaub
|
50ff782ab5
|
Merge pull request #11829 from sethalves/av-ent-misc-fixes
misc avatar-entity fixes
|
2017-11-20 16:05:39 -08:00 |
|
Bradley Austin Davis
|
7a5dc9e00b
|
remove test code disabling the script cache
|
2017-11-20 15:57:44 -08:00 |
|
Clément Brisset
|
381fbe833d
|
Merge pull request #11855 from highfidelity/stable
Merge stable back into master
|
2017-11-20 15:40:14 -08:00 |
|
Elisa Lupin-Jimenez
|
fb6287503e
|
hopefully fixed build error resulting from escape sequence
|
2017-11-20 15:12:11 -08:00 |
|
Thijs Wenker
|
c3754d6369
|
smart pointer
|
2017-11-20 23:24:03 +01:00 |
|
Elisa Lupin-Jimenez
|
ecd45534dd
|
merge conflict
|
2017-11-20 14:04:29 -08:00 |
|