Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 22:41:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70106 commits 25 branches 0 tags 1.1 GiB
Commit graph

26105 commits

Author SHA1 Message Date
John Conklin II
bc3edbc7fc
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash 
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
 2018-06-08 15:14:32 -07:00
howard-stearns
210cb23de6 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-08 14:54:15 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
howard-stearns
36a0adf553 strip snapshot stacking code - we'll do it on server or not at all 2018-06-08 14:24:24 -07:00
Zach Fox
95faad23e2
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep 
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
 2018-06-08 14:20:21 -07:00
Zach Fox
812c28ef48 Fix MS13761: Change the move conditions under which overlays hide 2018-06-08 14:15:42 -07:00
SamGondelman
310e2ee063 attempt to fix first time model overlay loading 2018-06-08 13:56:21 -07:00
Dante Ruiz
5843c24309 adding perfectly straight model and adjusting ovelray 2018-06-08 13:56:00 -07:00
howard-stearns
3ade31bdf6 always show edition 2018-06-08 12:57:40 -07:00
howard-stearns
dd0f3c64ec Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-08 12:12:21 -07:00
Zach Fox
9f0864944c Fix Friending in Connections tab - READ FIXME 2018-06-08 11:37:02 -07:00
SamGondelman
a7d75b121f fix avatarHash crash 2018-06-08 11:20:41 -07:00
Dante Ruiz
5d570f030f fixing calibration 2018-06-08 11:18:52 -07:00
Zach Fox
d4a19e7bc9 Fix MS15721: Delete app.json if installed script isn't running 2018-06-08 10:52:14 -07:00
David Back
e8aece4c11
Merge pull request #13315 from dback2/avatarFeet 
Fix default avatar feet
 2018-06-08 10:00:43 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
Atlante45
83e1db14cf Set UAL default value earlier to be caught by crashpad 2018-06-07 19:40:30 -07:00
howard-stearns
595a0d8733 restore lost code 2018-06-07 19:24:05 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
SamGondelman
c7007c089f fix tablet not disappearing 2018-06-07 16:35:22 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
Zach Fox
c1b971a269 Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider 2018-06-07 16:10:44 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains 
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
 2018-06-07 15:31:40 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
Zach Fox
f9b6e3e2ac
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks 
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
 2018-06-07 15:10:00 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
Zach Fox
7d8e02e714 Fix MS15663/15664: Don't set Wallet Status to 'ready' too early 2018-06-07 14:01:52 -07:00
amantley
97831e61f0 removed stray comments 2018-06-07 12:54:46 -07:00
Zach Fox
d33875e142
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak 
Fix MS15574: Tiny memory leak in Wallet.h
 2018-06-07 12:42:24 -07:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
John Conklin II
1646f543cd
Merge pull request #13273 from danteruiz/fix-show-overlays-menu 
fixing show overlays menu item on start up
 2018-06-07 11:34:30 -07:00
John Conklin II
3b413d0f72
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized 
MS14615: Prevent memory overuse when minimized
 2018-06-07 11:16:56 -07:00
David Back
ae5d056ca0
Merge pull request #13292 from dback2/fileChooser 
File Dialog Fixes
 2018-06-07 09:38:56 -07:00
Sam Gateau
146732a20f
Merge pull request #13317 from jherico/feature/mac_resources 
Use binary resources on OSX
 2018-06-07 09:38:00 -07:00
John Conklin II
2b6fdb6b69
Merge pull request #13217 from Atlante45/fix/ds-memory 
Fix uploaded content archives taking too much memory
 2018-06-07 09:37:41 -07:00
Zach Fox
7f04506020
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged 
Fix MS14925: Don't double-emit signal for display plugin change
 2018-06-07 09:32:50 -07:00
David Back
a246c9f0d1 fix fbx and textures 2018-06-06 15:47:29 -07:00
Dante Ruiz
6ddc768f57 making overlays use precisionPicking and adjust tablet screen position 2018-06-06 15:40:33 -07:00
howard-stearns
8185d1b5f5 cleanup and consistently don't getNextPage at beginning 2018-06-06 15:24:54 -07:00
Bradley Austin Davis
fa51c15849 Use binary resources on OSX 2018-06-06 15:10:52 -07:00
Zach Fox
6869718025 Fix MS14925: Don't double-call signal for display plugin change 2018-06-06 14:41:33 -07:00
Seth Alves
b70ffa5bae
Merge pull request #13297 from ctrlaltdavid/21835 
Remove some deprecated functions from the Controller API
 2018-06-06 14:06:34 -07:00
Sam Gondelman
b4afabee68
Merge pull request #13294 from SamGondelman/overlays 
Add isGroupCulled property to ModelOverlays
 2018-06-06 13:52:33 -07:00
Dante Ruiz
d57d087752 update tablet model again 2018-06-06 12:48:20 -07:00
David Back
c294dd4ac7 fix path and name 2018-06-06 12:32:47 -07:00
David Back
afd4b5a8ab update default avatar to fix non-flat feet 2018-06-06 11:48:04 -07:00
Sam Gateau
a1899e80c0
Merge pull request #13290 from AndrewMeadows/update-queryAACube 
update server-side bounding box more correctly for grabbed things
 2018-06-06 11:46:09 -07:00
Dante Ruiz
25305ab57f updating texture 2018-06-06 11:31:39 -07:00
Seth Alves
6c8e514367
Merge pull request #13224 from danteruiz/fix-key-conflicts 
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
 2018-06-06 11:08:04 -07:00
Dante Ruiz
995cfeb3c5 cleaning code 2018-06-06 10:42:12 -07:00
Dante Ruiz
59c50b7f26 remove highlight overlay in favor of materialEntity 2018-06-06 08:38:58 -07:00
MiladNazeri
082c1fce52
Merge pull request #13251 from ctrlaltdavid/21880 
JSDoc updates
 2018-06-05 19:04:54 -07:00
howard-stearns
335aeaeb38 purchases cleanup, wearables, and edition numbers when multiples seen. 2018-06-05 17:06:08 -07:00
howard-stearns
6aa551b35c Don't getNextPage when at beginning (even if that is also the end). 2018-06-05 17:04:29 -07:00
amantley
f21431ca88 added check for the actual face tracker in MyHead.cpp to prevent crash 2018-06-05 16:33:28 -07:00
Anthony J. Thibault
b5a3b25adc Tuned hip smoothing times. 2018-06-05 16:07:54 -07:00
Anthony J. Thibault
993d035d37 Smooth out fly to idle transition, to prevent hip thrusting and pops. 2018-06-05 15:45:19 -07:00
Dante Ruiz
b275bbe5a7 saving changes 2018-06-05 15:44:17 -07:00
howard-stearns
ce41b83bad Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-05 15:30:04 -07:00
SamGondelman
aec7206901 get rid of overlay pipelines and just use forward rendering 2018-06-05 14:44:44 -07:00
Bradley Austin Davis
e7e9ca4b2b Disable chromium distance field text rendering on ATI GPUs 2018-06-05 14:16:03 -07:00
howard-stearns
3d75a793cc Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-05 13:35:54 -07:00
amantley
5132466ca0 kept the transient coeff. and sending the blendshapes accross the 
network. and removed procedural updates to face from myhead.cpp
 2018-06-05 13:32:45 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
SamGondelman
968758a022 CR 2018-06-05 09:35:17 -07:00
Ken Cooke
aa19794a94
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete 
fix copy delete cut paste commands and menus
 2018-06-05 09:17:34 -07:00
Ken Cooke
83dda420ba
Merge pull request #13256 from danteruiz/remove-dead-code 
remove dead code in Application::keyPressEvent
 2018-06-05 09:16:28 -07:00
Anthony J. Thibault
558711f906 Smooth hips transition between idle and fly. 
Also, take dt into account for the critically damped spring lerp calculation.
 2018-06-04 16:57:41 -07:00
howard-stearns
f72f8c762b goto client-side filtering (preliminary) 2018-06-04 16:52:20 -07:00
Andrew Meadows
d220d437cc remove payloadGetLayer() from GameWorkloadRenderer 2018-06-04 16:39:29 -07:00
amantley
61592cdada completed first try at all changes for scripted blendshapes 2018-06-04 16:37:47 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Dante Ruiz
f5e2a6834b fixing some issues 2018-06-04 16:09:31 -07:00
David Back
7b2a9770ba Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser 2018-06-04 16:00:13 -07:00
David Rowe
a7a0cfeef2 Remove some deprecated functions from the Controller API 2018-06-05 10:56:19 +12:00
David Back
6b7d9586d1 apply fixes to other file dialogs and fix tablet dialog buttons 2018-06-04 15:56:10 -07:00
howard-stearns
25ee948662 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-04 15:30:10 -07:00
Dante Ruiz
48c0b7379a fix vive configuration page 2018-06-04 15:16:11 -07:00
Sam Gondelman
38e7b31c32
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity 
Try reducing concurrent downloads
 2018-06-04 14:48:46 -07:00
Zach Fox
60aff7a224 Whoops 2018-06-04 14:41:18 -07:00
David Rowe
b5028a9626 Merge branch 'master' into 21880 
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
 2018-06-05 09:13:54 +12:00
Zach Fox
7407507f0b Fix MS15574: Tiny memory leak in Wallet.h 2018-06-04 14:13:25 -07:00
howard-stearns
5a1b56d573 checkpoint with goto feeds working (but without filtering) 2018-06-04 13:11:06 -07:00
howard-stearns
e40fc20cb6 fix some bugs that had been introduced by various out-of-team prs. 2018-06-04 13:00:08 -07:00
SamGondelman
bde3382657 merge with master 2018-06-04 12:55:17 -07:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
Alexander Ivash
9bf3759e8d allow control spinbox with mouse wheel 2018-06-04 21:27:00 +03:00
Alexander Ivash
826d853edf fix blinking 'up' indicator on pressing 'down' 2018-06-04 21:26:59 +03:00
Alexander Ivash
56466e61d3 fix binding loops disallowing to increment/decrement spinbox value under certain conditions 2018-06-04 21:26:57 +03:00
Alexander Ivash
8d213efa75 introduce test 'controls gallery' application for controls testing 2018-06-04 21:26:56 +03:00
howard-stearns
24a67c6008 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-04 11:15:39 -07:00
David Back
074892591d fix auto-selecting subdir and not showing Choose when no row selected 2018-06-04 11:13:03 -07:00
John Conklin II
08fcad1932
Merge pull request #13227 from SamGondelman/entityMirror 
Add local-only isVisibleInSecondaryCamera flag to entities
 2018-06-04 11:06:00 -07:00
howard-stearns
bf7453482a Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-04 10:26:49 -07:00
John Conklin II
29f2ab01d8
Merge pull request #13244 from danteruiz/fix-shortcuts 
fix copy delete cut paste commands and menus (RC68)
 2018-06-04 10:02:49 -07:00
Anthony J. Thibault
c3d1daf855 Merge branch 'master' into nativeCGCode 2018-06-04 09:32:38 -07:00
Dante Ruiz
606b6d8947 fix code standard issue 2018-06-04 09:16:39 -07:00
Andrew Meadows
9ae19714b5 also update queryAACube for children of worn entities 2018-06-01 16:38:57 -07:00
John Conklin II
378e84b7ce
Merge pull request #13257 from danteruiz/rc68-reload-scripts 
adding back reload scripts shortcut and clean up AboutUtil(RC68)
 2018-06-01 15:10:28 -07:00
Zach Fox
7f344c33a7 Docs update 2018-06-01 13:51:18 -07:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
amantley
01848fafe0 made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present 2018-06-01 11:37:11 -07:00
Simon Walton
f58e1ebdd9 Only take down tablet if it was brought up 2018-06-01 10:41:08 -07:00
howard-stearns
84f5f0a653 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-01 09:58:08 -07:00
John Conklin II
194c33bf19
Merge pull request #13254 from danteruiz/add-back-reload-scripts 
adding back reload scripts shortcut and clean up AboutUtil
 2018-06-01 09:31:13 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
Sam Gateau
f372e25a9f
Merge pull request #13247 from NissimHadar/DailyTests 
Daily tests
 2018-05-31 14:50:32 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
Simon Walton
7598c7aaf3 Remove tablet message-box when required 
Desktop request was being honoured but not HMD.
 2018-05-31 13:52:06 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Dante Ruiz
caa7f64865 fixing show overlays menu item 2018-05-31 10:58:04 -07:00
amantley
7cc5e96f2d Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes 
merging hifi master to update the branch
 2018-05-31 10:35:31 -07:00
Zach Fox
259803f856 MS14615: Prevent memory overuse when minimized 2018-05-31 10:30:25 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
NissimHadar
bea21e3a68 WIP. 2018-05-30 17:06:49 -07:00
NissimHadar
6717a16098 WIP. 2018-05-30 17:04:19 -07:00
NissimHadar
51b1188bdb WIP. 2018-05-30 17:01:47 -07:00
NissimHadar
df668e44ca WIP. 2018-05-30 16:59:53 -07:00
NissimHadar
c1bc3bd154 WIP. 2018-05-30 16:58:35 -07:00
NissimHadar
d01d774f76 WIP. 2018-05-30 16:51:17 -07:00
NissimHadar
78f04f84c5 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 16:45:53 -07:00
NissimHadar
c8a04911f4 Interface respects Show Overlay menu checkbox on start up. 2018-05-30 16:45:29 -07:00
samcake
37c1f4fc06 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-30 16:05:46 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Gabriel
6fa58fce1f Update Application.cpp 
Remove the mic bar for android
 2018-05-30 15:40:05 -03:00
Sam Gondelman
46a6334c72
Merge pull request #13249 from gcalero/android_remove_mic_bar 
Android: Update Application.cpp
 2018-05-30 14:31:31 -04:00
Dante Ruiz
646b852aef fix headers 2018-05-30 11:15:58 -07:00
Dante Ruiz
3942f397d0 adding back reload scripts 2018-05-30 11:15:47 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
Dante Ruiz
c4358aad81 remove dead code in Application::keyPressEvent 2018-05-30 07:33:32 -07:00
Dante Ruiz
543a721a11 fix headers 2018-05-29 17:55:42 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Dante Ruiz
ea10dc176a adding back reload scripts 2018-05-29 17:38:02 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
David Rowe
08cb5c7191 Fix JSDoc example typo 2018-05-30 10:25:16 +12:00
David Rowe
0db440931e Miscellaneous JSDoc fixes 2018-05-30 10:02:30 +12:00
Andrew Meadows
57138b5fb7 disable workload region regulation by default 
also set default region radiuses large
 2018-05-29 14:21:16 -07:00
Gabriel
cf499ca047
Update Application.cpp 
Remove the mic bar for android
 2018-05-29 16:42:09 -03:00
NissimHadar
5fb7ec7b72 Updated jsdoc 2018-05-29 11:50:23 -07:00
NissimHadar
855084b6d5 Updated jsdoc. 2018-05-29 11:29:59 -07:00
NissimHadar
c49bcbe4e9 Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands. 2018-05-29 11:20:29 -07:00
milad
3455dd296b Vec3 fix 2018-05-29 09:57:10 -07:00
NissimHadar
0af1599b53 Added jsdoc to TestScriptingInterface. 2018-05-29 09:45:03 -07:00
samcake
82503a9e64 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-29 08:59:37 -07:00
NissimHadar
658c0e329f Corrected comment. 2018-05-28 19:57:54 -07:00
David Rowe
a9c4eab099 Fix up JSDoc for Window.takeSnapshot() and related 2018-05-28 12:46:51 +12:00
David Rowe
b31a4d0b64 Add JSDoc stubs for new HifiAbout API 2018-05-28 10:40:42 +12:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
NissimHadar
20d2128a10 Corrected timing bug. 2018-05-25 17:36:55 -07:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
Dante Ruiz
68b18def22 fix copy delete cut paste commands and menus 2018-05-25 15:49:19 -07:00
Dante Ruiz
9a25a74834 fix copy delete cut paste commands and menus 2018-05-25 15:34:17 -07:00
howard-stearns
d30d84f1bd checkpoint that has two ways to do filtering 2018-05-25 15:30:27 -07:00
NissimHadar
00300f4b2f Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 15:02:43 -07:00
NissimHadar
87220e501a Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail) 2018-05-25 15:02:00 -07:00
John Conklin II
eeed3ae82d
Merge pull request #13211 from druiz17/login-fix 
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
 2018-05-25 11:33:29 -07:00
John Conklin II
1d9f33a637
Merge pull request #13220 from NissimHadar/fixCameraMode 
Correct `Camera.mode` command.
 2018-05-25 10:47:31 -07:00
John Conklin II
82bb664cb3
Merge pull request #13235 from druiz17/fix-qml-crash-v2 
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
 2018-05-25 10:46:11 -07:00
samcake
051776ab1d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-25 10:30:45 -07:00
Andrew Meadows
cd568867b2 disable regulation of workload views by default 2018-05-25 08:30:11 -07:00
Andrew Meadows
85beca6b67 tweak to dynamic workload regions regulation 2018-05-25 08:30:11 -07:00
NissimHadar
54b64c59d7 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 08:29:09 -07:00
John Conklin II
0d8fb90fa8
Merge pull request #13222 from SamGondelman/mirror 
Fix image and text overlay drifting
 2018-05-25 08:26:33 -07:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -07:00
Dante Ruiz
adee5e9ef7 fix crash 2018-05-24 18:02:15 -07:00
Dante Ruiz
e34d67fee4 fix crash 2018-05-24 17:54:53 -07:00
NissimHadar
d01482bf68 Now looks for an actual change in the boom length (vs a change has been requested). 2018-05-24 17:44:39 -07:00
NissimHadar
9ed8c04097 Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode 2018-05-24 17:40:21 -07:00
Clement
19100c9550 Coding Standard 
Spacing
    Self-Sufficient Headers
 2018-05-24 17:30:32 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
NissimHadar
77d6ea6bec Added hide/show for task bar (Windows only). 2018-05-24 16:48:03 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07:00
David Rowe
bc757ddd41 Fix typo 2018-05-25 09:04:06 +12:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
55bf70991b cleanup wording and formatting for version in window title 2018-05-24 12:03:03 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
samcake
40370f860a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-23 17:26:08 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Dante Ruiz
c2ceb48a28 fixing key conflicts 2018-05-23 14:16:05 -07:00
SamGondelman
940b112f62 fix image and text overlay drifting 2018-05-23 11:58:50 -07:00
samcake
5bede45c85 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 11:26:07 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
NissimHadar
e07e716d40 Fixed stupid gcc warning. 2018-05-23 07:35:25 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
milad
1a4fa92a29 Merge commit 'refs/pull/13206/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-22 14:33:53 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Simon Walton
f702374db3 Just have one const for concurrent downloads 2018-05-22 10:16:44 -07:00
Dante Ruiz
5fb08d0d9c fix speech api not showing up 2018-05-21 14:21:21 -07:00
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
Alexander Ivash
d659696b60 FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-05-21 13:29:41 -07:00
howard-stearns
fc6bfe9e44 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-21 10:41:45 -07:00
samcake
b4807becb6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 10:41:25 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gondelman
6eb6a5b767
Merge pull request #13197 from gcalero/your_last_location 
Add "Your Last Location" to Android Home
 2018-05-21 09:28:56 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
milad
46efb2b868 merging onto mac 2018-05-19 22:44:18 -07:00
druiz17
bd3a9865bf moving control speech to developer menu 2018-05-19 18:27:28 -07:00
druiz17
f2807e38f9 fix goto shortcut 2018-05-19 17:36:46 -07:00
samcake
3aaa01788c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-18 17:42:30 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Dante Ruiz
8a2b54c2b7 fixing mistakes 2018-05-18 17:09:41 -07:00
howard-stearns
d385a255c4 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-18 16:53:08 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
Dante Ruiz
6eb5a78611 fixing code that breaks andriod build 2018-05-18 10:33:03 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Dante Ruiz
ea771c2325 make final changes 2018-05-18 09:21:41 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
Gabriel Calero
7a6b7b8ba3 Add Your Last Location in Android Home 2018-05-18 12:26:41 -03:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
SamGondelman
c57c15f22c fix resolution option 2018-05-17 16:58:35 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
samcake
0cf87748cd Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-17 14:20:44 -07:00
Dante Ruiz
0f122e3dbc Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 13:33:34 -07:00
Dante Ruiz
e760912fd2 fix warning 2018-05-17 13:33:19 -07:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
vladest
eb25601856 Return back LOD tools 2018-05-17 20:41:50 +02:00
Dante Ruiz
ccea493498 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-17 11:36:03 -07:00
Dante Ruiz
201b8a5140 fixing the graphics preference 2018-05-17 11:35:34 -07:00
Gabriel Calero
5a73da6fdf Bugfix: stop audio when app starts 2018-05-17 14:05:49 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
vladest
95cd9476c3 Fixed modality in Desktop 2018-05-17 16:11:28 +02:00
David Rowe
d20cd6ad44 Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot() 2018-05-17 20:25:25 +12:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
samcake
ade1d6c056 use the correct call to toggle the debugFXAA on the AaConfig 2018-05-16 15:37:13 -07:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Zach Fox
bc590f556a Get first page 2018-05-16 14:43:43 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Zach Fox
486f33b4bd Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash 2018-05-16 14:14:35 -07:00
Dante Ruiz
237b0d7483 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 13:49:02 -07:00
Dante Ruiz
fbc3d97af3 adding back overlay menu and avatar size 2018-05-16 13:48:29 -07:00
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements 
Spectator Camera V2
 2018-05-16 13:38:07 -07:00
Zach Fox
97bb014734 Almost working for Purchases! 2018-05-16 13:20:23 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
John Conklin II
8d437892cb
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing 
Fix hips position when flying
 2018-05-16 12:37:07 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00
vladest
8c146521cf remove double crash options 2018-05-16 21:10:51 +02:00
vladest
7501b8818e removed shadows quality 2018-05-16 21:01:50 +02:00
Zach Fox
79f8232c14 Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel 2018-05-16 11:11:24 -07:00
Zach Fox
f8215b5999 Fix final? crash 2018-05-16 11:05:21 -07:00
Zach Fox
c3ea176b58 Give me my reticle back! 2018-05-16 10:54:58 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
luiscuenca
7b48dc2370 normalize vector 2018-05-16 10:17:38 -07:00
Zach Fox
c34605f686 GIF snapshots using the Snap app are still weird, but the bug is fixed 2018-05-16 10:15:51 -07:00
Zach Fox
012ae741a5 Fix MS15103: Interface crashes on snap if snap dir is deleted 2018-05-16 09:52:19 -07:00
Simon Walton
b43cb5b86f Take out VS's auto reformatting 2018-05-16 09:36:55 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions 
avatars collide again
 2018-05-16 09:25:05 -07:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
vladest
a9930d53a9 Reorder VR menu 2018-05-16 14:25:58 +02:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
Simon Walton
f4d24a3d0e Quiet MacOS warning 2018-05-15 16:40:21 -07:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
f629022b8c AvatarList API JSDoc stubs 2018-05-16 10:16:13 +12:00
John Conklin II
1313d28b9d
Merge pull request #13112 from sethalves/fix-overlay-asan-warning 
Fix overlay asan warning
 2018-05-15 14:51:05 -07:00
Simon Walton
2b30c1389e Try reducing concurrent downloads for Android 2018-05-15 14:30:08 -07:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
luiscuenca
4b09f1dc30 Fix vector transformation when calculating flying hip position 2018-05-15 14:19:17 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
Andrew Meadows
c5773cbe84 restore 'virtual' keyword for overrides 2018-05-15 13:59:22 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
vladest
dd05afa974 Remove double setting 2018-05-15 21:43:43 +02:00
Thijs Wenker
8b4298514e send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false 2018-05-15 21:39:17 +02:00
Gabriel Calero
b80597a436 Restore display plugin activation/deactivation 2018-05-15 15:51:11 -03:00
Zach Fox
bccaa2dbe5 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-15 11:50:38 -07:00
Zach Fox
ccab2dd641 Starting the work 2018-05-15 11:48:33 -07:00
Dante Ruiz
c6ff301aac Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-15 11:32:23 -07:00
Dante Ruiz
71633105de adding back some menus 2018-05-15 11:31:58 -07:00
Gabriel Calero
306b8cc68a Set HomeActivity transparent to avoid texture corruption (black and white) 2018-05-15 15:14:17 -03:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866 
Don't unnecessarily scroll HTML content when keyboard is raised
 2018-05-15 11:00:38 -07:00
Seth Alves
78a8e8e500 quiet asan warning 2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan 
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
 2018-05-15 10:58:00 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1 
Added method to test namespace to save JSON object to a file.
 2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item 
OpenVR: Remove reference to HMD Standing Mode menu item
 2018-05-15 10:30:00 -07:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
Thijs Wenker
bfe210da75 Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-05-15 16:48:51 +02:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
David Rowe
b7a0ff523a LaserPointers API JSDoc stubs 2018-05-15 17:36:23 +12:00
David Rowe
8e9799b80f Pointers API JSDoc fix up 2018-05-15 16:36:42 +12:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
Zach Fox
e607c68bea Thanks Mukul! 2018-05-14 16:48:40 -07:00
David Rowe
9040e45be7 RayPick API JSDoc stubs 2018-05-15 11:43:49 +12:00
NissimHadar
d4d2f3c957 Moved ownership of test location into the Test Scripting class. 2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 16:23:36 -07:00
David Rowe
3fb6fd1afb Picks API JSDoc stubs 2018-05-15 11:22:47 +12:00
Zach Fox
43254e2981 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-14 15:12:44 -07:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item 
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
 2018-05-14 13:51:13 -07:00
Anthony J. Thibault
ec638d9d91 Avatar can now look straight down without spinning 180. 
Also, come code clean up and removal of unnecessary Y_180 flips.
 2018-05-14 13:48:04 -07:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
NissimHadar
5f219e27f7 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:35:48 -07:00
Andrew Meadows
a30e06d594 don't blend avatar position when far from target 2018-05-14 09:58:16 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
Anthony J. Thibault
1cc7eb635f Fix ubuntu warning by removing cancelOutRollAndPitch2() 2018-05-14 09:13:26 -07:00
Anthony J. Thibault
274ac98bd6 Merge branch 'master' into nativeCGCode 2018-05-14 09:12:08 -07:00
David Rowe
77021f3236 Fix up Stats JSDoc 2018-05-14 17:32:18 +12:00
David Rowe
d0596f8205 Fix Wallet JSDoc stubs 2018-05-14 10:43:55 +12:00
David Rowe
5378d64913 Remove erroneously added function declarations 2018-05-13 18:06:30 +12:00
David Rowe
176dbb5557 Wallet API JSDoc stubs 2018-05-13 11:02:09 +12:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
David Rowe
81a621890a Stats API JSDoc stubs 2018-05-12 18:01:55 +12:00
David Rowe
74617822fa Snapshot API JSDoc stubs 2018-05-12 16:32:33 +12:00
David Rowe
bf7863ad10 LocationBookmarks API JSDoc stubs 2018-05-12 14:23:03 +12:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00
Gabriel Calero
db460e9856 Put back the worker thread for account manager in android 2018-05-11 16:09:40 -03:00
Seth Alves
c624528f72
Merge pull request #13157 from druiz17/fix-qml-crash 
fix qml crash on start up
 2018-05-11 11:38:12 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2 
Additional work on splash screen
 2018-05-11 11:26:37 -07:00
Dante Ruiz
4eba727849 fix qml crash on start up 2018-05-11 10:47:41 -07:00
Zach Fox
a6dd95e31b
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose 
don't enable so much logging when 'verbose logging' is turned on
 2018-05-11 10:44:48 -07:00
Dante Ruiz
9e9852d67b
Merge pull request #12989 from Triplelexx/21774_file_browser 
Worklist #21774: Fix Windows.browseAssets() bugs
 2018-05-11 08:50:17 -07:00
David Rowe
fb175d7110 AudioEffectOptions API JSDoc stubs 2018-05-11 20:36:10 +12:00
NissimHadar
1364f4391d Can store JSON object. 2018-05-10 18:02:44 -07:00
Anthony J. Thibault
0ac12fa317 Bug fix for Vive Tracker Calibration Settings 
This issue was inadvertently introduced by the name change of the Vive display plugin.
 2018-05-10 17:56:54 -07:00
Seth Alves
826c427e2a trying to sort-out audio-stream logging 2018-05-10 15:42:59 -07:00
Seth Alves
32d10641dc don't enable so much logging when 'verbose logging' is turned on 2018-05-10 14:41:54 -07:00
Gabriel Calero
a1a48d9b9e Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-10 18:24:26 -03:00
Triplelexx
a061e84ad7 remove unused commented code 2018-05-10 19:40:02 +01:00
Zach Fox
0236bc0c44 Cleanup after merge conflict 2018-05-10 09:51:45 -07:00
Zach Fox
ce575d367a Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-10 09:31:02 -07:00
vladest
a3f8148165 Added enable disable shadows menu 2018-05-10 12:40:13 +02:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
vladest
399e18dfc1 Disable non implemented sound notifications until further notice 2018-05-10 10:28:48 +02:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
Zach Fox
44cfa95830 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-09 15:01:24 -07:00
amantley
20c960c0da removed white space in MyAvatar.cpp 2018-05-09 15:00:20 -07:00
amantley
eff84de99f added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT 2018-05-09 14:55:10 -07:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix 
MS14937: Fix Replace button for content sets during Checkout
 2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08 use setFilterRules rather than specifying each logging category to suppress 2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
amantley
50f225777a removed debug code from cg code in MyAvatar.cpp 2018-05-09 11:31:19 -07:00
amantley
a7955b642a removed the follow hips code from pre physics update 2018-05-09 11:27:04 -07:00
amantley
77aedc1512 changed lerp to saferLerp in cg code 2018-05-09 11:14:13 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound 
MS14951: Fix Snapshot hotkey sound playback
 2018-05-09 11:07:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester 
Command line parameters for autotester
 2018-05-09 10:51:31 -07:00
Gabriel Calero
843282739e Remove unused includes and white spaces 2018-05-09 14:16:51 -03:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue 
Do not open help on first run
 2018-05-09 18:48:05 +02:00
Zach Fox
542e707de8 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:40:51 -07:00
Zach Fox
06c6f55069 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:35:42 -07:00
Gabriel Calero
b0fee3fd8b Improve code based on changes requested in the PR 2018-05-09 11:06:32 -03:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
NissimHadar
175fa9108e Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 15:52:15 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
Gabriel Calero
5e337e90a3 Deactivates display plugin when qt app goes to background 2018-05-08 16:55:04 -03:00
Gabriel Calero
da69c9d077 Make qt application not stop in background and remove separete thread 2018-05-08 15:45:33 -03:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -07:00
amantley
6051f4b8ff Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode 
synching the branch with the remote repo
 2018-05-08 10:55:14 -07:00
amantley
544967ef3b added test function to cancel out roll and pitch 2018-05-08 10:55:10 -07:00
amantley
bbf8c73572 code review changes to declare functions static 2018-05-08 10:52:28 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
NissimHadar
8ad13826bd Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441 Use 'standard' format for command line parameter with multiple options. 2018-05-07 13:01:18 -07:00
Gabriel Calero
9b63b76b68 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-07 16:06:02 -03:00
Gabriel Calero
66b975192d Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login 2018-05-07 15:56:43 -03:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818 
Fix for 'Login page for steam is blank'
 2018-05-07 11:26:39 -07:00
John Conklin II
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors 
don't spam resetSensors function when holding down Qt::Key_Apostrophe
 2018-05-07 10:52:51 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
Alexander Ivash
b4cfea2fbc FB14818 Login page for steam is blank 2018-05-06 17:17:06 +03:00
vladest
afe04f3a4f cleanup 2018-05-06 14:24:54 +02:00
vladest
1794113f37 Check global switch as well 2018-05-06 12:51:59 +02:00
vladest
ac413c8854 Tablet opening notification sound settings added 2018-05-06 09:41:10 +02:00
Seth Alves
30c5fa6fa1 fix divide-by-zero asan warning in LODManager::autoAdjustLOD 2018-05-05 20:45:06 -07:00
vladest
c7ab1f3dbf Merge branch 'master' into menu-updates 2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02 Merge branch 'master' into menu-updates 2018-05-05 07:11:39 +02:00
Clement
5a3773ba72 Fix compile error on linux/windows 2018-05-04 18:18:46 -07:00
David Rowe
5021778dc0 Merge branch 'master' into 21866 2018-05-05 12:17:18 +12:00
David Rowe
5e6b83a634 Lint 2018-05-05 12:14:51 +12:00
David Rowe
1be948ee28 Scroll element into view if it's been moved off the screen 2018-05-05 12:03:18 +12:00
Bradley Austin Davis
38f43bdc68 Disable current splash frame implementaton 2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6 Alternate shader 2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Cristian Luis Duarte
03ca427234 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 20:18:15 -03:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode 
MS14699: Prevent Wallet passcode from being sticky in certain cases
 2018-05-04 15:22:41 -07:00
Gabriel Calero
087c6ff730 Patch for secondary camera assert error on Android 2018-05-04 18:45:39 -03:00
Cristian Luis Duarte
8c96d2be3c Patch for secondary camera assert error on Android 2018-05-04 18:44:07 -03:00
Clement
ad60a79180 Fix for android builds 2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Cristian Luis Duarte
9f5365a277 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 18:38:08 -03:00
Gabriel Calero
1330132a32 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-04 18:35:51 -03:00
Liv Erickson
ee0af079cf merge from upstream master and fix conflict 2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-04 14:13:43 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
vladest
9e5dbf9a99 Snapshot notification sound settings 2018-05-04 22:01:44 +02:00
NissimHadar
aef5ea0936 Correct usage of the test script URL. 2018-05-04 12:30:13 -07:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639 
Fix for crash deep in QML after useFullAvatarURL
 2018-05-04 11:33:28 -07:00
Zach Fox
1da840984b Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-04 10:24:28 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
David Rowe
03da2f0946 Only scroll keyboard if necessary 2018-05-04 20:32:53 +12:00
milad nazeri
b32039f895 Merge branch 'master' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-03 23:08:06 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e Update avatar query names 2018-05-03 18:19:30 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
NissimHadar
2c6c0a25fc Add testSnapshotLocation parameter to takeSnapshot. 2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7 Added quitWhenFinished parameter to the command line. 2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g 
JSDoc fixes
 2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-03 14:06:06 -07:00
Gabriel Calero
a767540b76 Fix connection issue syncing two AccountManagers 2018-05-03 17:53:18 -03:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
NissimHadar
46f461dcdb Don't display crash message if running from command line with a test script. 2018-05-03 11:20:37 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation 
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
 2018-05-03 10:02:20 -07:00
NissimHadar
8b3c451f91 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 08:25:19 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g 
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
 2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing 
fixing avatr attachments not being visible when coming out of first person
 2018-05-02 18:50:41 -07:00
samcake
1dc6988f41 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-02 17:36:26 -07:00
Andrew Meadows
99a75c5a87 Merge 'master' into 'workload' 2018-05-02 17:28:36 -07:00
Zach Fox
56ba59681a Fix MS14741, allowing uninstall of apps whose scripts are no longer running 2018-05-02 16:12:55 -07:00
Zach Fox
900486ed01 Don't use entity scripting interface 2018-05-02 16:03:50 -07:00
Gabriel Calero
ec838b1417 Trying to fix non-android builds 2018-05-02 18:51:44 -03:00
NissimHadar
5cbb8674ec Use default parameter for saveSnapshot(). 2018-05-02 14:45:28 -07:00
Gabriel Calero
88f0c2d700 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 18:42:10 -03:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 14:17:22 -07:00
NissimHadar
e0b16dfe03 Allow use of --url command line argument in test mode. 2018-05-02 14:17:01 -07:00
Cristian Luis Duarte
843aa9e261 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-02 18:06:56 -03:00
Gabriel Calero
e4fdd81148 Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login 2018-05-02 17:23:25 -03:00
Gabriel Calero
d0ab81d1f9 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 17:00:32 -03:00
Cristian Luis Duarte
c460f8bf1e Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-02 16:35:13 -03:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
Zach Fox
57993cfdd0 Cleanup 2018-05-02 11:22:42 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Gabriel Calero
a653c7df0b Fix build 2018-05-02 14:59:46 -03:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics 
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
 2018-05-02 10:51:00 -07:00
vladest
14dfafa815 Brings logging back 2018-05-02 19:46:18 +02:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Zach Fox
ecae3ceb9d Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-02 10:05:15 -07:00
vladest
53350b471b Merge branch 'master' into menu-updates 2018-05-02 19:02:11 +02:00
vladest
ea66e04ab8 Removed unwanted code 2018-05-02 18:58:40 +02:00
NissimHadar
3edfdae6b2 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 08:35:59 -07:00
Gabriel Calero
e83f1a8ec7 Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login 2018-05-02 12:20:23 -03:00
Gabriel Calero
0f08bd8fa1 Use a single AccountManager for android. 2018-05-02 12:11:11 -03:00
Gabriel Calero
3a1bfefc22 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 10:09:56 -03:00
David Rowe
3febdcb141 Miscellaneous JSDoc tidying 2018-05-02 16:15:35 +12:00
Clement
a283d28686 Send number of frustums in packet 2018-05-01 18:03:21 -07:00
Clement
ddde0228ba Fix AC not sending Avatar Mixer a frustum 2018-05-01 18:03:21 -07:00
Clement
538f24162f Define ViewFrustums type alias 2018-05-01 18:03:21 -07:00
Clement
1b2b70b769 Send both frustums to Avatar Mixer 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Atlante45
0820ef3c95 Account for secondary view when deciding to query 2018-05-01 18:02:29 -07:00
Clement
4c90763236 Correctly update secondary camera frustum 2018-05-01 18:02:29 -07:00
Clement
fea49744ed Add comment for future work 2018-05-01 18:02:29 -07:00
Clement
98cf48694e Expose secondary camera to game logic 2018-05-01 18:02:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -07:00
John Conklin II
256154202e
Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash 
RC67: Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 17:39:43 -07:00
Zach Fox
d5f809c3c0 Actually fix 2018-05-01 14:49:44 -07:00
Zach Fox
d1bb37874d Prevent crash in ImageProvider when tablet isn't yet initialized 2018-05-01 14:49:37 -07:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" 
This reverts commit acb21cc96a.
 2018-05-01 14:15:12 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
NissimHadar
e9d28cf275 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-01 13:26:58 -07:00
Zach Fox
249e2a2bac Tons of stability and clarity improvements 2018-05-01 13:00:04 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
vladest
aef62d09c7 Merge branch 'master' into menu-updates 2018-05-01 21:47:46 +02:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e 
Fix LODManager JSDoc
 2018-05-01 12:25:37 -07:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash 
Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 11:55:15 -07:00
samcake
b3408ae4c0 Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-05-01 11:39:54 -07:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
Zach Fox
cd76336e6a Actually fix 2018-05-01 09:54:23 -07:00
luiscuenca
2ac7fcadd2 load scripts once on rigReady 2018-05-01 09:37:01 -07:00
NissimHadar
97152ef9c1 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-01 09:33:07 -07:00
milad nazeri
aeb78e69f6 Merge commit 'refs/pull/13061/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-01 06:12:00 -07:00
David Rowe
65f5915372 Add JSDoc for startFarTrigger etc. calls on entity scripts 2018-05-01 21:55:27 +12:00
NissimHadar
d5610a2f37 WTF... 2018-04-30 17:52:44 -07:00
NissimHadar
c01fd02de2 Corrected parameter type. 2018-04-30 17:23:49 -07:00
NissimHadar
6d8eee6b32 Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester 2018-04-30 17:19:29 -07:00
Zach Fox
f69ee41074 Prevent crash in ImageProvider when tablet isn't yet initialized 2018-04-30 17:13:44 -07:00
milad nazeri
8845094afb Added Lod fix 2018-04-30 16:55:42 -07:00
David Rowe
f9bda6df15 Fix LODManager JSDoc 2018-05-01 11:36:37 +12:00
luiscuenca
50ca09b3b4 minor fixes 2018-04-30 16:26:04 -07:00
Zach Fox
eab2feb543 Lots of little improvements and stability fixes 2018-04-30 13:54:10 -07:00
Atlante45
250806252e Don't use unique_ptr to store CrashpadClient 2018-04-30 12:37:18 -07:00
Atlante45
5ab16302ca Keep CrashpadClient around 2018-04-30 12:36:17 -07:00
Zach Fox
aafcf056c4 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-04-30 12:36:00 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
Liv Erickson
b994776ebd do not open help on first run 2018-04-30 12:01:37 -07:00
vladest
4adfe94ed5 Removed check for updates menu item. POC: settings for advanced movements mappings 2018-04-30 20:43:36 +02:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson 
Enable sideloading .app.json Apps from local disk
 2018-04-30 11:14:24 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67 
Fix missed revert of PR 12969 for RC67
 2018-04-30 11:11:38 -07:00
Cristian Luis Duarte
401bf2f2a4 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-30 14:38:32 -03:00
John Conklin II
b6afaccdf3
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix 
New model dialog fix
 2018-04-30 10:08:54 -07:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1 
Backtrace Attributes
 2018-04-30 10:07:11 -07:00
Thijs Wenker
9e086dda3c Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-30 17:32:49 +02:00
vladest
a16b2c0d20 Restore preferences dialogs buttons spacing 2018-04-29 12:38:37 +02:00
vladest
deaecc7050 Added notifications settings 2018-04-29 11:19:01 +02:00
vladest
be22f49c32 Merge branch 'master' into menu-updates 2018-04-28 20:22:28 +02:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
NissimHadar
cf9b089a3c Added option to set snapshot location (for this execution only) from the command line. 2018-04-27 17:18:16 -07:00
samcake
023941a133 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-27 15:19:23 -07:00