Sam Gateau
|
12ec56875e
|
Merge pull request #13867 from SamGondelman/recurse
findRayIntersection/findParabolaIntersection performance improvements
|
2018-08-30 09:49:16 -07:00 |
|
Sam Gondelman
|
cfffa65819
|
Merge pull request #13899 from SamGondelman/pointerPerf
Improve Pointer performance
|
2018-08-29 16:57:43 -07:00 |
|
John Conklin II
|
7298cb4654
|
Merge pull request #13888 from dback2/editControllerMapping
Edit mode controller mapping using new platform state variables
|
2018-08-29 16:06:47 -07:00 |
|
Zach Fox
|
67e57a9487
|
Merge pull request #13849 from zfox23/MS16003_backCloses
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
|
2018-08-29 14:29:12 -07:00 |
|
SamGondelman
|
cda8b82ead
|
improve pointer performance
|
2018-08-29 13:32:53 -07:00 |
|
David Back
|
96d2ba660c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-29 12:05:51 -07:00 |
|
John Conklin II
|
4ab45e70a4
|
Merge pull request #13887 from sethalves/fix-pick-reg-point-1
fix far-grab laser-lock on entities with non-default registration point
|
2018-08-29 10:42:03 -07:00 |
|
SamGondelman
|
0c8a4cc81e
|
merge with master
|
2018-08-28 17:31:51 -07:00 |
|
Sam Gondelman
|
89bd24dd54
|
Merge pull request #13880 from SamGondelman/matCrash
Fix crash on shutdown in domain with material
|
2018-08-28 11:48:35 -07:00 |
|
Sam Gateau
|
d9d23e7fcf
|
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
|
2018-08-28 09:02:13 -07:00 |
|
Seth Alves
|
52bbb4d2ab
|
fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.
|
2018-08-27 16:21:01 -07:00 |
|
SamGondelman
|
aae06e8f49
|
faster aabox ray intersection and pre-computed inverse direction
|
2018-08-27 15:40:33 -07:00 |
|
David Back
|
b6edb2c9d6
|
platform states, edit controller mapping, separate mac/win delete
|
2018-08-27 14:53:13 -07:00 |
|
SamGondelman
|
98d145dc24
|
fix crash on shutdown in domain with material
|
2018-08-24 15:19:48 -07:00 |
|
SamGondelman
|
70f4d0c634
|
Merge remote-tracking branch 'upstream/master' into perf
|
2018-08-24 14:04:37 -07:00 |
|
John Conklin II
|
477fba4b15
|
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
workload tracks other avatars and adds/removes from physics simulation accordingly
|
2018-08-24 12:43:51 -07:00 |
|
luiscuenca
|
ddbadf5a69
|
change to Test API
|
2018-08-24 11:59:46 -07:00 |
|
SamGondelman
|
3d048c77ba
|
Merge remote-tracking branch 'upstream/master' into recurse
|
2018-08-24 11:39:05 -07:00 |
|
SamGondelman
|
b5b7167644
|
add to stats
|
2018-08-23 17:56:24 -07:00 |
|
Andrew Meadows
|
10d0833c19
|
use DynamicsWorld::numCollisionObjects instead of our own count
|
2018-08-23 15:57:54 -07:00 |
|
Zach Fox
|
dddb2141f0
|
Implement Wallet Security feature - Auto Logout checkbox
|
2018-08-23 15:45:29 -07:00 |
|
Zach Fox
|
a1d88a8588
|
Merge howard/wallet-locker2 into my branch
|
2018-08-23 14:45:16 -07:00 |
|
Andrew Meadows
|
abf4a926d8
|
cleanup
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
8f2141b592
|
fix compile error
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
777b90bdc0
|
add 'physics body count' to debug stats
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
f5cae61b43
|
fix typo causing compile failure
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
87223946ad
|
add/remove avatars according to workload region
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
3ecabb6583
|
cleanup after removing spaghetti
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
99aafb1f95
|
move code from Avatar to OtherAvatar
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
615b8addd0
|
fix order of includes
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
598a227f1a
|
use OtherAvatar instead of Avatar in AvatarMotionState
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
3c01433e12
|
stub for avatars changing workload regions
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
21adbf49c0
|
remove cruft
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
15665b25e8
|
give OtherAvatars a proxy in workload
|
2018-08-23 12:59:28 -07:00 |
|
John Conklin II
|
1320a34a18
|
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON
Don't include old attachment data on new avatar recordings
|
2018-08-23 10:51:33 -07:00 |
|
John Conklin II
|
5dd64645eb
|
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes
Fix safe-landing protocol for sparse domains
|
2018-08-23 10:17:08 -07:00 |
|
SamGondelman
|
c474f38860
|
force coarse picking, sort avatars
|
2018-08-22 18:07:16 -07:00 |
|
SamGondelman
|
5c0b12abf6
|
ordered ray/parabola intersection code
|
2018-08-22 16:29:17 -07:00 |
|
Wayne Chen
|
4daa30c1d0
|
changing text for check preference
|
2018-08-22 15:58:37 -07:00 |
|
Wayne Chen
|
9518b8cdaf
|
rearrangement
|
2018-08-22 15:46:02 -07:00 |
|
Wayne Chen
|
c32cc1ead2
|
adding implementation
|
2018-08-22 15:42:15 -07:00 |
|
Simon Walton
|
dd098f05c2
|
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
|
2018-08-22 14:54:07 -07:00 |
|
luiscuenca
|
b3d127c953
|
Fix flickering
|
2018-08-22 14:31:34 -07:00 |
|
John Conklin II
|
50684f00c8
|
Merge pull request #13856 from sethalves/dont-squash-delete-events
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
|
2018-08-22 12:44:35 -07:00 |
|
Seth Alves
|
579b2435c2
|
don't squash delete events during shutdown so that QWebEngine process gets destroyed
|
2018-08-22 11:04:26 -07:00 |
|
John Conklin II
|
04d72ea39d
|
Merge pull request #13850 from samcake/punk
Adjust Workload Region to be bigger
|
2018-08-22 10:21:14 -07:00 |
|
John Conklin II
|
32562511e8
|
Merge pull request #13782 from ElderOrb/FB17184
Add Support for Managing Avatar Entities to the Avatar App
|
2018-08-22 10:20:04 -07:00 |
|
luiscuenca
|
5f4903f884
|
Record entities
|
2018-08-22 08:53:51 -07:00 |
|
Sam Gateau
|
0f6f465e7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-08-21 19:23:33 -07:00 |
|
Alexander Ivash
|
cfb820762d
|
bulk adjusting to coding guidelines
|
2018-08-22 00:42:01 +03:00 |
|