Wayne Chen
|
69b547a9fe
|
text overlays for consistency
|
2018-10-01 16:11:27 -07:00 |
|
Wayne Chen
|
5f05be554f
|
check for hard refusal to 404
|
2018-10-01 10:06:13 -07:00 |
|
Wayne Chen
|
eab57633a5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
|
2018-10-01 09:21:26 -07:00 |
|
John Conklin II
|
130e8dfbe9
|
Merge pull request #14023 from dback2/selectEntityEveryFrameFix
Only call selectEntity once triggered when using edit handles
|
2018-09-28 16:38:10 -07:00 |
|
John Conklin II
|
1135228b3b
|
Merge pull request #14095 from kencooke/audio-hrtf-reset
Audio-mixer optimizations
|
2018-09-28 16:34:38 -07:00 |
|
John Conklin II
|
789062d0b9
|
Merge pull request #14103 from howard-stearns/shorter-handshake
minimal time handshake
|
2018-09-28 16:29:38 -07:00 |
|
John Conklin II
|
11492ce8ee
|
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
don't call enterEntity before the entity's script is loaded
|
2018-09-28 16:07:08 -07:00 |
|
John Conklin II
|
5d00aa0bdb
|
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
fix scaling of worn shape entities
|
2018-09-28 13:08:46 -07:00 |
|
John Conklin II
|
b4abaabe5e
|
Merge pull request #14107 from kkurian/hotfix-marketplace-item-tester
Fix application uninstall in marketplace item tester
|
2018-09-28 12:58:33 -07:00 |
|
Wayne Chen
|
a8b86bd555
|
removing debug statement
|
2018-09-28 08:44:49 -07:00 |
|
Kerry Ivan Kurian
|
440e2062f5
|
Fix application uninstall in marketplace item tester
|
2018-09-27 22:14:02 -07:00 |
|
Wayne Chen
|
5c9094d81f
|
removing debug print statement
|
2018-09-27 21:24:04 -07:00 |
|
Wayne Chen
|
d5950db2a4
|
fix for showing the text overlay in mac
|
2018-09-27 21:20:06 -07:00 |
|
John Conklin II
|
cd18578061
|
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
|
2018-09-27 18:08:25 -07:00 |
|
Wayne Chen
|
5d27cddab5
|
consolidating getting oops message
|
2018-09-27 17:16:18 -07:00 |
|
Howard Stearns
|
f96c7f4db4
|
minimal time handshake
|
2018-09-27 17:05:18 -07:00 |
|
Wayne Chen
|
8b29f7c294
|
making text box smaller for no occlusion
|
2018-09-27 16:56:45 -07:00 |
|
Roxanne Skelly
|
eec565e7f4
|
Revert "Checkpoint sysTray Installer"
This reverts commit 7257a99414.
|
2018-09-27 12:58:33 -07:00 |
|
Roxanne Skelly
|
af6db93b70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-27 12:05:21 -07:00 |
|
Roxanne Skelly
|
330789471d
|
Fix merge conflict and set proper polling times
|
2018-09-27 12:03:37 -07:00 |
|
John Conklin II
|
0b185c6890
|
Merge pull request #14031 from zfox23/notificationsForFourApps
Discovery Notifications Project: Notifications for PEOPLE, WALLET, MARKET, and GOTO
|
2018-09-27 11:34:05 -07:00 |
|
Wayne Chen
|
9079c8a6b7
|
adding log for redirect cases
|
2018-09-27 10:42:21 -07:00 |
|
Wayne Chen
|
747aab2097
|
persisting signed values
|
2018-09-27 10:16:11 -07:00 |
|
Wayne Chen
|
03d2fa2787
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
|
2018-09-27 09:47:08 -07:00 |
|
Ken Cooke
|
9dc0aa5c8d
|
HRTF starts in silent state
|
2018-09-26 18:23:26 -07:00 |
|
Ken Cooke
|
a8f7ff7d8a
|
Add HRTF reset()
|
2018-09-26 18:18:20 -07:00 |
|
Wayne Chen
|
813defebfc
|
Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged
|
2018-09-26 16:45:22 -07:00 |
|
Wayne Chen
|
33db8e1f24
|
only allow right-click for buttons
|
2018-09-26 16:40:43 -07:00 |
|
John Conklin II
|
7701cfd9c8
|
Merge pull request #14084 from luiscuenca/appearOnFloorFix
Fix avatars loading below the ground bug
|
2018-09-26 16:00:53 -07:00 |
|
Wayne Chen
|
fda3ec87ce
|
removing lingering print statement
|
2018-09-26 15:57:57 -07:00 |
|
Wayne Chen
|
afae4f3b96
|
adding toolbar reappearing
|
2018-09-26 15:33:57 -07:00 |
|
John Conklin II
|
70c7ffcc71
|
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002
fix MyAvatar-vs-OtherAvatar collisions
|
2018-09-26 15:21:18 -07:00 |
|
Wayne Chen
|
db77cbcbc1
|
new location drop - unparent overlays
|
2018-09-26 15:12:48 -07:00 |
|
Zach Fox
|
6a3fa28fad
|
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
|
2018-09-26 15:12:04 -07:00 |
|
John Conklin II
|
b02e2c8123
|
Merge pull request #14081 from SamGondelman/blendshapes
Improve ModelBlender queuing
|
2018-09-26 15:10:02 -07:00 |
|
Zach Fox
|
9a21354c27
|
Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps
|
2018-09-26 15:08:20 -07:00 |
|
Zach Fox
|
6877af04f1
|
Fix GOTO notifs; fix WALLET notifs (pending backend change)
|
2018-09-26 14:57:32 -07:00 |
|
Wayne Chen
|
db41a1c16b
|
error state signal for 404/interstitial
|
2018-09-26 13:48:15 -07:00 |
|
John Conklin II
|
c1dc0ff2ec
|
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
Prevent thread issues with PickResults modified by Pointers
|
2018-09-26 12:12:58 -07:00 |
|
John Conklin II
|
7df90881cd
|
Merge pull request #14007 from kkurian/marketplace-item-tester
Marketplace item tester interface
|
2018-09-26 11:25:53 -07:00 |
|
John Conklin II
|
6c47ba0dc7
|
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
Use C++ chrono system_clock for timestamps
|
2018-09-26 11:22:49 -07:00 |
|
John Conklin II
|
d1771b2928
|
Merge pull request #14058 from danteruiz/fix-dispacther-module-order
fix equip while keeping new functionality
|
2018-09-26 11:06:45 -07:00 |
|
Dante Ruiz
|
7e138ebfff
|
update to new enabling method
|
2018-09-26 10:52:45 -07:00 |
|
Roxanne Skelly
|
7257a99414
|
Checkpoint sysTray Installer
|
2018-09-26 10:46:19 -07:00 |
|
John Conklin II
|
0de433c7c7
|
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
fix for deadlock in other avatar entity removal from tree
|
2018-09-26 09:58:26 -07:00 |
|
Dante Ruiz
|
fa5dfb6e28
|
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
|
2018-09-26 09:18:12 -07:00 |
|
Wayne Chen
|
4a87773986
|
fixing interstitial page, clearing up debug statements
|
2018-09-26 07:41:18 -07:00 |
|
Wayne Chen
|
de5614500a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
|
2018-09-25 21:52:01 -07:00 |
|
John Conklin II
|
c5ff72bd20
|
Merge pull request #14024 from wayne-chen/toggle404Redirect
Toggle going to 404 redirect domain
|
2018-09-25 20:44:57 -07:00 |
|
Wayne Chen
|
3e5e324c7e
|
parenting text to head
|
2018-09-25 20:39:22 -07:00 |
|