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 |
|
Alexander Ivash
|
02684e3fed
|
remove not used files
|
2017-11-27 22:49:11 +03:00 |
|
Alexander Ivash
|
da06b2656f
|
7991 Change Instances of Edit Mode to Create Mode
|
2017-11-27 22:47:42 +03:00 |
|
howard-stearns
|
1575119327
|
PR feedback
|
2017-11-27 10:46:57 -08:00 |
|
howard-stearns
|
2e919682a0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
|
2017-11-27 10:02:53 -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 |
|
vladest
|
6136a4cea6
|
Rounded background
|
2017-11-25 10:03:56 +01:00 |
|
vladest
|
73a557a8a4
|
Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views
|
2017-11-24 15:58:27 +01:00 |
|
vladest
|
b69b580a68
|
Use ScrollBar from QQC2 which is supports both mouse and touch events
|
2017-11-23 23:08:43 +01:00 |
|
vladest
|
22d57f1103
|
Fix click events from mouse
|
2017-11-23 14:56:15 +01:00 |
|
howard-stearns
|
899999a4c6
|
fix up dynamic ownership challenge
|
2017-11-22 15:58:30 -08:00 |
|
vladest
|
094cc0e251
|
Merge conflict
|
2017-11-22 20:50:15 +01: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 |
|
David Rowe
|
3535071178
|
Add "size" as synonym for "dimensions" in model overlay property setter
|
2017-11-22 21:04:04 +13:00 |
|
howard-stearns
|
16d6d8a361
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
|
2017-11-21 16:28:29 -08:00 |
|
howard-stearns
|
ca80c9b764
|
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
|
2017-11-21 16:28:08 -08: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 |
|
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 |
|
vladest
|
a56e4e10c3
|
Remove unused variables
|
2017-11-21 21:44:04 +01: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
|
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 |
|
vladest
|
0ea5a7635c
|
Added mouse press and release events to be sent along with touch events to Tablet
|
2017-11-21 16:32:57 +01: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 |
|
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
|
a54f4eca93
|
simplified naming of zip folders
|
2017-11-20 14:02:46 -08:00 |
|
Elisa Lupin-Jimenez
|
b6e75d1222
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-11-20 10:07:11 -08:00 |
|
Elisa Lupin-Jimenez
|
3aa7cb440d
|
file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url
|
2017-11-20 10:01:33 -08:00 |
|
Dante Ruiz
|
76935c1457
|
fixing merge conflict
|
2017-11-20 09:51:10 -08:00 |
|
Thijs Wenker
|
e94199acad
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName
|
2017-11-20 18:29:54 +01:00 |
|
Thijs Wenker
|
84ec9890ca
|
reverted special property case, parentJointName is now only parsed from the JSON import
|
2017-11-20 18:29:33 +01:00 |
|
Seth Alves
|
df07b66872
|
Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes
|
2017-11-20 07:47:19 -08:00 |
|
howard-stearns
|
07d52306c4
|
consolidated blockchain history log
|
2017-11-19 22:51:36 -08:00 |
|
ZappoMan
|
04ee1adabd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-19 14:40:31 -08:00 |
|
Brad Hefta-Gaub
|
e070033ce4
|
Merge pull request #11793 from ElderOrb/FB9032
9032 - Current display mode can be deselected in the toolbar/tablet menu
|
2017-11-19 11:25:35 -08:00 |
|
Brad Hefta-Gaub
|
ff8ca6da4c
|
Merge pull request #11303 from vladest/webbrowser_updates
Webbrowser updates
|
2017-11-19 11:11:09 -08:00 |
|
Brad Hefta-Gaub
|
e4a03a7d12
|
Merge pull request #11840 from ctrlaltdavid/21609
Fix typo in overlay "filled" property
|
2017-11-18 14:31:11 -08:00 |
|
Brad Hefta-Gaub
|
1de6ecec30
|
Merge pull request #11830 from ElderOrb/FB8244
8244 Rename captionColorOverride to captionColor
|
2017-11-18 14:28:32 -08:00 |
|
Alexander Ivash
|
c4aa937108
|
adjust to coding standards
|
2017-11-18 11:16:40 +03:00 |
|
Brad Hefta-Gaub
|
28b75abcee
|
Merge pull request #11816 from druiz17/fix-bringing-up-logs
Fix issue of User is unable to bring up the High Fidelity Interface log.
|
2017-11-17 17:02:50 -08:00 |
|
Brad Hefta-Gaub
|
0678a7c9df
|
Merge pull request #11718 from kencooke/audio-louder-mastergain
Adjustable master avatar volume
|
2017-11-17 16:58:27 -08:00 |
|
Brad Hefta-Gaub
|
592f4921bc
|
Merge pull request #11825 from druiz17/fix-tablet-rez
fix tablet rez point for commence button
|
2017-11-17 16:51:52 -08:00 |
|
SamGondelman
|
033f658fff
|
Merge remote-tracking branch 'upstream/master' into pointers
|
2017-11-17 16:10:20 -08:00 |
|
Zach Fox
|
ec16f16757
|
Remove debug buttons from wallet
|
2017-11-17 15:21:18 -08:00 |
|
David Back
|
4be29c5a7a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
|
2017-11-17 15:15:22 -08:00 |
|
Zach Fox
|
f47f259816
|
Turn Commerce on by default
|
2017-11-17 15:12:49 -08:00 |
|
Zach Fox
|
4cc8db8aff
|
Merge pull request #11843 from zfox23/commerce_fixMyItems
Fix 'My Items' display
|
2017-11-17 12:59:51 -08:00 |
|
Stephen Birarda
|
239b116874
|
Merge pull request #11835 from birarda/bug/octree-connection-id
Reset EntityTreeSendThread known state if client disconnects from Entity Server
|
2017-11-17 12:56:25 -08:00 |
|
Dante Ruiz
|
4de0fdf7d1
|
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
|
2017-11-17 11:45:40 -08:00 |
|
Zach Fox
|
f570e3c874
|
Fix 'My Items' display
|
2017-11-17 11:27:00 -08:00 |
|
SamGondelman
|
61c7ccde6e
|
cleanup
|
2017-11-17 10:45:39 -08:00 |
|
H Q
|
11112bc2c5
|
syncing
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
|
2017-11-17 08:00:35 -08:00 |
|
H Q
|
21a28827c9
|
Remaining coding style changes, other small fixes
|
2017-11-17 07:59:52 -08:00 |
|
David Rowe
|
a33162d7ff
|
Fix typo in Base3DOverlay "filled" property
|
2017-11-17 21:07:43 +13:00 |
|
Zach Fox
|
57c86c3035
|
Merge pull request #11836 from zfox23/commerce_fixStepSkip
Fix skipping wallet setup step in certain cases
|
2017-11-16 16:01:10 -08:00 |
|
H Q
|
14890495a2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
Syncing
|
2017-11-16 12:38:45 -08:00 |
|
H Q
|
27350ddbfc
|
Coding style corrections
|
2017-11-16 12:35:00 -08:00 |
|
Zach Fox
|
7f64ede940
|
Fix skipping wallet setup step in certain cases
|
2017-11-16 11:44:52 -08:00 |
|
David Back
|
abba965328
|
todo comment
|
2017-11-16 11:41:28 -08:00 |
|
Stephen Birarda
|
eedb77dae9
|
add clearing of known state if client resets ES connection
|
2017-11-16 11:40:35 -08:00 |
|
SamGondelman
|
ac7242102c
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-16 09:47:29 -08:00 |
|
SamGondelman
|
e3aa79990b
|
merge with master
|
2017-11-16 09:45:32 -08:00 |
|
Brad Davis
|
7bbc719d79
|
Fix for black screen on HMD derived display plugins
|
2017-11-16 08:53:12 -08:00 |
|
Alexander Ivash
|
c5d2f598d7
|
8244 Rename captionColorOverride to captionColor
|
2017-11-16 15:46:49 +03:00 |
|
Seth Alves
|
93fd2a6a6b
|
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
|
2017-11-15 20:10:05 -08:00 |
|
David Back
|
4b2ff68fa3
|
var name and empty line
|
2017-11-15 19:05:44 -08:00 |
|
David Back
|
9bfbcb4434
|
code review updates
|
2017-11-15 18:06:49 -08:00 |
|
SamGondelman
|
3274c41aeb
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-15 17:45:45 -08:00 |
|
Dante Ruiz
|
dd8ea759d4
|
fix tablet rez for commence button
|
2017-11-15 15:48:39 -08:00 |
|
Ryan Huffman
|
60a222e4b4
|
Merge pull request #11810 from Atlante45/fix/stuck-acs
Fix stuck ACs
|
2017-11-15 14:59:51 -08:00 |
|
SamGondelman
|
7eb22b372f
|
merge with master
|
2017-11-15 14:35:30 -08:00 |
|
Zach Fox
|
9f80a5f081
|
Merge pull request #11817 from zfox23/commerce_rezFix
Fix rezzing non-JSON marketplace items
|
2017-11-15 14:17:05 -08:00 |
|
SamGondelman
|
8730a26d20
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
|
2017-11-15 14:12:16 -08:00 |
|
David Back
|
e0ce154472
|
remove includes, fix comment
|
2017-11-15 13:37:15 -08:00 |
|
David Back
|
0b8f888d9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
|
2017-11-15 12:50:03 -08:00 |
|
David Back
|
fee7701890
|
working mirror projection for secondary camera
|
2017-11-15 12:49:39 -08:00 |
|
Zach Fox
|
e8c4878c8f
|
Fix rezzing non-JSON marketplace items
|
2017-11-15 11:25:18 -08:00 |
|
Atlante45
|
e68ce97697
|
Remove the number of socket change tracking
|
2017-11-15 11:19:54 -08:00 |
|
Dante Ruiz
|
d83f3152dd
|
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-15 11:16:49 -08:00 |
|
Dante Ruiz
|
b633968865
|
fix-bringing-up-logs
|
2017-11-15 10:47:06 -08:00 |
|
John Conklin II
|
8592f3fd4d
|
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
|
2017-11-15 09:31:45 -08:00 |
|
Howard Stearns
|
1c293c4c48
|
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
Remove Marketplace's dependency on Edit.js for REZ/WEAR
|
2017-11-14 16:33:35 -08:00 |
|
H Q
|
0db9e876d6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
|
2017-11-14 15:40:44 -08:00 |
|
H Q
|
44f2c92d30
|
Final ECSDA and nonce modifications for this dev cycle
|
2017-11-14 15:40:29 -08:00 |
|
Zach Fox
|
f5994375cf
|
Remove Marketplace's dependency on Edit.js for rez
|
2017-11-14 14:29:49 -08:00 |
|