John Conklin II
|
3b1e0dc7d9
|
Merge pull request #13987 from zfox23/discovery_appUi
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
|
2018-09-19 12:38:28 -07:00 |
|
John Conklin II
|
60c07280f8
|
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
|
2018-09-19 11:46:24 -07:00 |
|
Zach Fox
|
23fab0985b
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
|
2018-09-17 11:11:21 -07:00 |
|
John Conklin II
|
be76c43aec
|
Merge pull request #13999 from gcalero/dont_popup_login_android
Don't popup login dialog in android
|
2018-09-14 16:06:03 -07:00 |
|
John Conklin II
|
cb8e3c6452
|
Merge pull request #14003 from danteruiz/snap-fix
Fix snapshot settings issue in HMD
|
2018-09-14 15:34:22 -07:00 |
|
John Conklin II
|
65ef04ae75
|
Merge pull request #13937 from luiscuenca/stt_teleport_wip
Safe Teleport Target
|
2018-09-14 15:11:18 -07:00 |
|
Zach Fox
|
9c5544af39
|
Merge in big work from appui_notifications branch
|
2018-09-14 14:37:04 -07:00 |
|
Zach Fox
|
9e50904376
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
|
2018-09-14 14:36:22 -07:00 |
|
Dante Ruiz
|
ff52639bc3
|
fix update
|
2018-09-14 14:10:36 -07:00 |
|
Dante Ruiz
|
4eb5c9714b
|
fix snapshot settings
|
2018-09-14 12:59:28 -07:00 |
|
Gabriel Calero
|
72eeeac2ba
|
Don't popup login dialog in android
|
2018-09-14 14:40:30 -03:00 |
|
sam gateau
|
b35f09fead
|
Address review comments
|
2018-09-14 08:43:35 -07:00 |
|
Sam Gateau
|
eccca053f9
|
Clean changes
|
2018-09-13 23:58:40 -07:00 |
|
Sam Gateau
|
1438643a5f
|
Adding extra sanity checks on all time dependant values to avoid bad behavior maybe
|
2018-09-13 23:48:50 -07:00 |
|
Wayne Chen
|
bf7dd94db7
|
button was clipped; adding higher res img
|
2018-09-13 17:25:33 -07:00 |
|
Wayne Chen
|
2b8aebdb6b
|
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
|
2018-09-13 17:21:29 -07:00 |
|
Wayne Chen
|
40451a1fc1
|
Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial""
This reverts commit c5468fd8e9.
|
2018-09-13 17:21:07 -07:00 |
|
Wayne Chen
|
c5468fd8e9
|
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
|
2018-09-13 17:18:49 -07:00 |
|
Wayne Chen
|
b4b0c519f3
|
Merge branch 'master' into fixGoToButtonInterstitial
|
2018-09-13 17:11:34 -07:00 |
|
Wayne Chen
|
db1acb87b8
|
button was clipped; adding higher res img
|
2018-09-13 15:38:24 -07:00 |
|
luiscuenca
|
c5669ef1f5
|
better property names
|
2018-09-13 15:22:18 -07:00 |
|
John Conklin II
|
0bf064c451
|
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
Fixing Error State for Timeout/localhost Redirection
|
2018-09-13 15:19:55 -07:00 |
|
luiscuenca
|
6a9a898b62
|
make updateCollisionCapsule private
|
2018-09-13 15:07:34 -07:00 |
|
luiscuenca
|
ceccc6d6ec
|
make getCollisionCapsule thread safe
|
2018-09-13 14:49:35 -07:00 |
|
John Conklin II
|
8e5f2d0e08
|
Merge pull request #13983 from danteruiz/disable-interstitial
disable interstitial by default and fix crash
|
2018-09-13 14:01:28 -07:00 |
|
Wayne Chen
|
647c4e1694
|
adding true fix for localhost timeouts
|
2018-09-13 13:51:42 -07:00 |
|
John Conklin II
|
b675e6cc6b
|
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
Performance improvements for Avatar Mixer
|
2018-09-13 13:43:18 -07:00 |
|
Wayne Chen
|
380f24b37f
|
adding fix, changing window title
|
2018-09-13 11:53:21 -07:00 |
|
Wayne Chen
|
bcd014ddc8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor
|
2018-09-13 10:29:02 -07:00 |
|
Dante Ruiz
|
dca34c7cbe
|
remove warning for GCC
|
2018-09-13 08:32:47 -07:00 |
|
Wayne Chen
|
5902699870
|
adding updated models for redirect
|
2018-09-12 22:54:23 -07:00 |
|
Wayne Chen
|
fc007982e0
|
muting opt out activity if login fail/success
|
2018-09-12 21:25:41 -07:00 |
|
luiscuenca
|
b517808bc2
|
Fix smaller size avatar capsule and land on detailed mesh
|
2018-09-12 21:24:19 -07:00 |
|
Wayne Chen
|
be650d5af0
|
changing when to log - there is broken code in bodyLoader
|
2018-09-12 16:00:43 -07:00 |
|
Zach Fox
|
01073ca18d
|
Lots of changes; marketplaces.js working now
|
2018-09-12 15:46:17 -07:00 |
|
Dante Ruiz
|
d76a2c1add
|
disable interstitial by default and fix crash
|
2018-09-12 15:31:03 -07:00 |
|
Stephen Birarda
|
b1f44d2ad7
|
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
|
2018-09-12 12:30:15 -07:00 |
|
luiscuenca
|
fa3c6932c6
|
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
|
2018-09-12 11:47:18 -07:00 |
|
sabrina-shanman
|
d2c41f02e5
|
Avoid unnecessary type conversion in CollisionPick::getHUDIntersection
|
2018-09-12 10:36:00 -07:00 |
|
sabrina-shanman
|
87b5605d69
|
Add normalOnPick to CollisionPickResult
|
2018-09-12 10:36:00 -07:00 |
|
Zach Fox
|
de2548d926
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
|
2018-09-12 09:30:00 -07:00 |
|
John Conklin II
|
f67deb9f65
|
Merge pull request #13938 from wayne-chen/interstitalMerged
Interstitial Page with 404 Redirect
|
2018-09-12 08:39:52 -07:00 |
|
Wayne Chen
|
20cab87a17
|
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
|
2018-09-11 18:53:06 -07:00 |
|
Wayne Chen
|
30e9d57026
|
adding pattern for during timeout to put into error state
|
2018-09-11 18:52:28 -07:00 |
|
Wayne Chen
|
a7321f950a
|
pushing requested changes - adding timeout refusal
|
2018-09-11 18:32:17 -07:00 |
|
Brad Hefta-Gaub
|
d319bea2ac
|
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
Avatar loading orb now indicates loading status
|
2018-09-11 18:01:40 -07:00 |
|
Wayne Chen
|
2267085dbf
|
removing unused counter variable
|
2018-09-11 17:46:01 -07:00 |
|
Wayne Chen
|
cb0aa8055f
|
Merge pull request #13961 from wayne-chen/loginOnLaunch
Pop up login dialog on launch
|
2018-09-11 17:43:29 -07:00 |
|
Wayne Chen
|
63ad85215b
|
Merge branch 'master' into interstitalMerged
|
2018-09-11 17:17:33 -07:00 |
|
Wayne Chen
|
84f95dd4b8
|
updating typo
|
2018-09-11 17:03:06 -07:00 |
|