John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
...
Added _aboutToQuit guard on eventFilter()
2018-07-24 11:37:19 -07:00
SamGondelman
318ef907b8
parabola/polyvox, fixing some bugs
2018-07-24 10:08:35 -07:00
luiscuenca
e7d70a832d
Pole Vectors always calculated when arms are crossed
2018-07-24 08:58:17 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix
...
FB16870: Avatar Wearables showing incorrect number
2018-07-23 15:55:11 -07:00
howard-stearns
48184c102b
Merge branch 'master' of github.com:highfidelity/hifi into forget-you
2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad
pal refresh that remembers your place
2018-07-23 15:25:06 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings
...
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
2018-07-23 15:19:46 -07:00
MuteTab
52e5bdb360
Added _aboutToQuit guard on eventFilter()
2018-07-23 14:27:38 -07:00
luiscuenca
2adb334034
unused code deleted
2018-07-23 14:25:30 -07:00
Alexander Ivash
fd7fb424f5
apply updated image from Mukul
2018-07-23 23:48:06 +03:00
Alexander Ivash
e12569c747
FB16992 - Layout changes to the two lightboxes in the Avatar app
2018-07-23 23:24:17 +03:00
luiscuenca
9d2d7c3aa4
Redesign and enable hand's Pole Vectors for elbow simulation
2018-07-23 13:16:11 -07:00
Alexander Ivash
091de4a9b5
Avatarapp: hover animate 'get more avatars'
2018-07-23 22:33:47 +03:00
Alexander Ivash
33c858774b
fix coding standard compliance
2018-07-23 21:01:43 +03:00
Seth Alves
ae83c33621
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master
...
put back old-style avatar-attachments menu-item
2018-07-23 10:25:23 -07:00
r3tk0n
bc91affa70
Bring this PR inline with RC70.1 PR.
2018-07-20 15:13:44 -07:00
SamGondelman
763e6465a2
followNormal, fixin stuff
2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648
add check for SELF_ID
2018-07-20 19:33:16 +03:00
Alexander Ivash
849c91d8f6
remove not necessary EntityTreeRenderer from removeAvatarEntities's condition
2018-07-20 19:32:58 +03:00
r3tk0n
3108d650de
Restore original menu string for flying
...
Restore the original menu string for flying as it apparently *does* effect jumping.
2018-07-20 08:29:11 -07:00
Cristian Luis Duarte
9bb4bada8a
Merge remote-tracking branch 'hifi/master' into android_loading_stuck
2018-07-19 21:45:03 -03:00
Cristian Luis Duarte
eb5cc00fff
newlines
2018-07-19 21:24:29 -03:00
Alexander Ivash
fb8640de47
FB16870: Avatar Wearables showing incorrect number
2018-07-20 02:51:17 +03:00
Cristian Luis Duarte
6d239f40fb
Android - Freeze at startup problem - remove logs
2018-07-19 20:47:05 -03:00
Ryan Huffman
1f259d235d
Fix computePickRay when in mirror mode
...
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
MuteTab
dfcf47e8ee
Removed useless comment.
2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193
Remove one change, turned out to be unnecessary.
2018-07-19 14:43:46 -07:00
MuteTab
3080539b63
Make getFlyingEnabled() always true when in desktop.
2018-07-19 14:40:20 -07:00
MuteTab
97e5d65592
Added conditional check for VR vs non-VR menu.
2018-07-19 14:30:06 -07:00
MuteTab
b70b424447
Added new menu classification for VR vs non-VR movement.
2018-07-19 14:27:49 -07:00
Qliemillar
e779e42d90
Merge pull request #13635 from NissimHadar/bug16645
...
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
2018-07-19 14:43:04 -06:00
David Rowe
a3e677e64f
Code review
2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd
Re-added missing semi-colon.
2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da
Add first-run checks for flying settings.
2018-07-19 12:41:24 -07:00
SamGondelman
39fa3420ec
pointer rendering, update teleport.js
2018-07-19 12:02:39 -07:00
Brad Davis
63fa54ceda
Fix for audio continuing on destroyed Web 3D overlays
2018-07-19 11:50:18 -07:00
Seth Alves
965c35292c
put back old-style avatar-attachments menu-item
2018-07-19 11:32:19 -07:00
Qliemillar
566c837bba
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix
...
fix 'the drop down does not shows the wearable'
2018-07-19 12:23:48 -06:00
David Rowe
5e624246a8
Fix HMD.mountedChanged() API signal
2018-07-19 13:00:57 +12:00
NissimHadar
4c0b7ca24c
Updated per Samuel's/Austin's comments.
2018-07-18 17:30:46 -07:00
Wayne Chen
37131d75e9
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537
...
MS16537: Updating "Forgot Username/Forgot Password" behavior
2018-07-18 16:32:55 -07:00
NissimHadar
a882931c6b
Only show overlay if textures have loaded
2018-07-18 15:02:02 -07:00
NissimHadar
99b95acada
Merge branch 'master' of github.com:highfidelity/hifi into bug16645
2018-07-18 13:56:12 -07:00
NissimHadar
446ef97fc5
Only show overlay if textures have loaded
2018-07-18 13:54:03 -07:00
howard-stearns
0a47672d64
machinery for fetching next page of inifinite scroll before it really
...
needed, and use in our infinite scrolls
2018-07-18 13:00:03 -07:00
Alexander Ivash
fe96ad2389
fix 'the drop down does not shows the wearable'
2018-07-18 21:16:47 +03:00
Wayne Chen
0cbcae9181
reverting onLinkActivated brackets
2018-07-18 10:44:37 -07:00
Howard Stearns
db212a0c99
Merge pull request #13625 from zfox23/MS16802_openGlyph
...
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
2018-07-18 10:12:47 -07:00
Wayne Chen
c104e95ef4
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
2018-07-18 09:06:22 -07:00
Zach Fox
919bfce7ab
Simplify
2018-07-18 09:00:01 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler
...
Allow creators to disable hand touch from javascript
2018-07-18 08:16:37 -06:00
luiscuenca
e3594fe1b7
mutex added
2018-07-17 17:23:03 -07:00
Wayne Chen
3b7f88a4a8
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
2018-07-17 17:08:43 -07:00
luiscuenca
ba884f8a94
Forgotten coment
2018-07-17 16:42:59 -07:00
luiscuenca
6225435385
some ortographic fixes
2018-07-17 16:38:34 -07:00
luiscuenca
fcb7614f7e
Format and fixes
2018-07-17 16:34:30 -07:00
Zach Fox
ef4265de4b
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
2018-07-17 16:16:43 -07:00
SamGondelman
86c56195d3
refactoring common path pointer functionality
2018-07-17 16:15:20 -07:00
SamGondelman
845ddda695
parabola-overlay and -avatar intersection, handle case where acceleration == 0
2018-07-17 12:41:03 -07:00
Cristian Luis Duarte
c664ce7671
Android - bypass settings reset dialog with cli option
2018-07-17 15:05:56 -03:00
Qliemillar
d498d6bb3d
Merge pull request #13617 from amantley/rotateRecenter
...
Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage
2018-07-17 08:57:24 -06:00
luiscuenca
82a3b73de8
Added disable hand touch for entityID
2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379
Allow creator to disable hand touch
2018-07-16 17:03:50 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup
...
Fix MS16562: Massive PAL speedup!
2018-07-16 16:45:01 -07:00
amantley
abb2c7ef14
Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter.
2018-07-16 11:29:49 -07:00
Zach Fox
ac2351e49f
Make JSDoc happy
2018-07-16 11:00:27 -07:00
Cristian Luis Duarte
f9baeaf151
Android - logs during startup - weirdly did not get stuck during tests
2018-07-16 12:28:44 -03:00
Zach Fox
4daa0c6537
CR feedback
2018-07-13 12:47:45 -07:00
John Conklin II
33fb759c0a
Merge pull request #13599 from danteruiz/fix-combobox
...
fixing combo boxes
2018-07-13 10:33:33 -07:00
Zach Fox
5e2074c06a
Merge pull request #13603 from zfox23/MS16701_uninstallFirst
...
Fix MS16701: Uninstall installed app before updating
2018-07-13 10:18:16 -07:00
Zach Fox
2da911ad84
Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup
2018-07-13 09:47:49 -07:00
Seth Alves
5085112722
Merge pull request #13594 from ctrlaltdavid/21677-a
...
Remove deprecated Window.raiseMainWindow API function
2018-07-12 19:48:33 -07:00
Zach Fox
04f856019d
Fix MS16701: Uninstall installed app before updating
2018-07-12 16:27:19 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg
...
Android - Prevent pending downloads to happen when going back to home
2018-07-12 15:22:56 -07:00
Zach Fox
92756d81ad
Implement MS16562: Massive PAL speedup!
2018-07-12 15:05:31 -07:00
Wayne Chen
089831b6ee
Adding potential fix
2018-07-12 14:15:16 -07:00
Dante Ruiz
1c64ebc3ca
fixing combo boxes
2018-07-12 13:57:48 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls
...
Rollback PR 12888 by deleting alternative +android files
2018-07-12 12:06:35 -07:00
Zach Fox
f57fe892c3
Merge pull request #13590 from zfox23/MS16615_openFromPurchases
...
Fix MS16615: Don't early-remove .app.json we JUST installed
2018-07-12 11:51:52 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale
...
Render Scale Resolution applied only to 3D rendering not HUD
2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539
...
MS9539: Update Controls Reference pages
2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac
...
Add Crashpad to Mac
2018-07-11 19:16:24 -07:00
David Rowe
46c9853152
Remove deprecated Window.raiseMainWindow API function
2018-07-12 14:04:08 +12:00
Cristian Luis Duarte
b1d39e4959
Rollback PR 12888 by deleting alternative +android files
2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667
Fix MS16615: Don't early-remove .app.json we JUST installed
2018-07-11 15:27:43 -07:00
Wayne Chen
cea2b94d2b
removing debug print statements
2018-07-11 11:58:17 -07:00
Wayne Chen
179ba6506e
Adding check for WindowsMR to the showHelp menu
2018-07-11 11:56:14 -07:00
Wayne Chen
f7e906440f
Merge branch 'master' of https://github.com/highfidelity/hifi into updateControlsReference-case-9539
2018-07-11 11:20:10 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze
...
Fix haze on Mac (bug #15515 )
2018-07-11 20:04:22 +02:00
Olivier Prat
703fc20856
Separate scale between 3D rendering and HUD
2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85
Not using render resolution scale in application and display plugin
2018-07-11 10:11:49 +02:00
Clement
85f56e2aa7
Remove Mac domain exception
2018-07-10 17:41:07 -07:00
Wayne Chen
81aac274ed
Updating controls reference page
2018-07-10 17:34:03 -07:00
Clement
b5252da3f2
CR
2018-07-10 16:53:11 -07:00
Zach Fox
d3c0236602
Merge branch 'master' of github.com:highfidelity/hifi into MS16480_disableOverlays
2018-07-10 15:02:05 -07:00
howard-stearns
8b713a437f
don't store undefined in a qml int.
2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1
expose totalPages and totalEntries, and use the later to display
...
connections count
2018-07-10 11:26:23 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping
...
Step Detection From Head and Hands Tracking
2018-07-10 09:59:22 -07:00
Wayne Chen
8f23fb01a4
removing unused variables
2018-07-10 07:30:02 -07:00
