Seth Alves
|
749b02cfb8
|
get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor
|
2018-09-30 15:12:49 -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 |
|
Kerry Ivan Kurian
|
440e2062f5
|
Fix application uninstall in marketplace item tester
|
2018-09-27 22:14:02 -07:00 |
|
John Conklin II
|
cd18578061
|
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
|
2018-09-27 18:08:25 -07:00 |
|
Howard Stearns
|
f96c7f4db4
|
minimal time handshake
|
2018-09-27 17:05:18 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Kerry Ivan Kurian
|
28ec98be9e
|
Uninstall marketplace item tester on wallet shutdown
|
2018-09-25 19:24:46 -07:00 |
|
luiscuenca
|
754653b093
|
Fix warnings
|
2018-09-25 17:31:18 -07:00 |
|
luiscuenca
|
82b08f1a93
|
Wait until skeleton is loaded to locate the avatar
|
2018-09-25 16:21:05 -07:00 |
|
John Conklin II
|
3d71dfc467
|
Merge pull request #14072 from SamGondelman/highlight
Fix avatar highlighting
|
2018-09-25 16:13:14 -07:00 |
|
Kerry Ivan Kurian
|
e6249e690e
|
Remove duplicate line
|
2018-09-25 15:52:26 -07:00 |
|
John Conklin II
|
19438d143e
|
Merge pull request #14073 from jherico/fix/18069_test
Working on Vive shutdown issues
|
2018-09-25 15:41:32 -07:00 |
|
Kerry Ivan Kurian
|
276125937c
|
Eliminate double equals
|
2018-09-25 15:18:12 -07:00 |
|
Kerry Ivan Kurian
|
4e7b03883f
|
Use triple equals
|
2018-09-25 15:13:26 -07:00 |
|
Roxanne Skelly
|
3deb3bc771
|
Coding standard issue found during CR
|
2018-09-25 14:17:15 -07:00 |
|
Roxanne Skelly
|
cbb4bff2db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-25 14:16:43 -07:00 |
|
Roxanne Skelly
|
ac2ad7fc81
|
Fix some coding standard issues found during CR
|
2018-09-25 14:13:25 -07:00 |
|
Brad Davis
|
15de0590e8
|
Cleaning up commented out code
|
2018-09-25 13:18:49 -07:00 |
|
Brad Davis
|
5adc4c2290
|
Protect against null pointer usage in sound scripting wrapper
|
2018-09-25 13:17:49 -07:00 |
|
sabrina-shanman
|
55ab0a394b
|
Return std::make_shared
|
2018-09-25 12:21:22 -07:00 |
|
SamGondelman
|
21cd3948ae
|
improve blender queuing
|
2018-09-25 12:07:05 -07:00 |
|
sabrina-shanman
|
6e83e96d1c
|
Check type in Pointer::getPickResultCopy
|
2018-09-25 12:05:47 -07:00 |
|
sabrina-shanman
|
660bdf36d0
|
Check if pick result is null when building visual pick result
|
2018-09-25 09:56:51 -07:00 |
|
sabrina-shanman
|
8dd36e465b
|
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
|
2018-09-25 09:22:30 -07:00 |
|
sabrina-shanman
|
eca31e7a99
|
Fix instantiating abstract class when creating visual pick result for pointers
|
2018-09-25 09:20:57 -07:00 |
|
Kerry Ivan Kurian
|
ff83713365
|
Use persistent object id counter
|
2018-09-25 00:58:01 -07:00 |
|
Kerry Ivan Kurian
|
ca1da9c830
|
Implement delete-from-list functionality in marketplace item tester
|
2018-09-25 00:57:59 -07:00 |
|