Commit graph

54488 commits

Author SHA1 Message Date
Andrew Meadows
e44c2c8da3 init zero gravity to agree with init hover state 2017-05-08 12:47:32 -07:00
Andrew Meadows
d9e893ac21 minior optimization/cleanup 2017-05-08 11:02:11 -07:00
Andrew Meadows
0f643b7d66 add check to avoid divide by zero 2017-05-08 10:59:15 -07:00
Andrew Meadows
f00a3cafb6 cleanup logic to be more readable 2017-05-08 10:52:54 -07:00
Andrew Meadows
2bfbb63906 remove unused variable 2017-05-05 09:37:01 -07:00
Andrew Meadows
8ed93783bd fix step up velocity calculation 2017-05-05 09:37:01 -07:00
Andrew Meadows
cd7be46b70 tweak threshold for minimum stepheight 2017-05-05 09:37:01 -07:00
Andrew Meadows
6e8d90e3b6 restore clear of follow accumulators 2017-05-05 09:37:01 -07:00
Andrew Meadows
63042eea3a fix flawed fix of bad rebase 2017-05-05 09:37:00 -07:00
Andrew Meadows
41ad25ade1 fix bad rebase of changed menu option 2017-05-05 09:37:00 -07:00
Andrew Meadows
fe401c7488 improved management of collisionless avatar state 2017-05-05 09:37:00 -07:00
Andrew Meadows
95a4bb9ef4 fix transition height from hover to stand 2017-05-05 09:35:49 -07:00
Andrew Meadows
e449c48888 remove one more line of cruft 2017-05-05 09:35:49 -07:00
Andrew Meadows
d34b667e82 remove kinematic character controller implemention 2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c even more correct API: MyAvatar.collisionsEnabled 2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5 restore MyAvatar.setCharacterControllerEnabled() 2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838 fix driving motion of collisionless avatars 2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c support collisionless avatar when playing recording 2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a help avatar walk up steps 2017-05-05 09:35:49 -07:00
Andrew Meadows
a31a861e19 fix typo: physcis --> physics 2017-05-05 09:33:50 -07:00
Andrew Meadows
f809afae2f Merge pull request #10363 from jherico/qmlspam
Removing logspam on toggling scripts window
2017-05-05 08:29:12 -07:00
Howard Stearns
d9540d7ece Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3
Lots of Snapshot app improvements, Round Three
2017-05-04 17:05:37 -07:00
Howard Stearns
fc9e9e1d28 Merge pull request #10374 from howard-stearns/notification-circumstances
Notification circumstances
2017-05-04 16:18:58 -07:00
Zach Fox
6a33ef49c2 New language for unshareable snaps 2017-05-04 16:17:33 -07:00
Zach Fox
2ad3346697 Are there bugs? 2017-05-04 16:05:20 -07:00
Clément Brisset
d80704bfbf Merge pull request #10375 from Atlante45/feat/store-irradiance
Store irradiance in cached KTX files
2017-05-04 16:00:44 -07:00
Chris Collins
7c36dd3282 Merge pull request #10359 from samcake/ambient
Fixing the by region update transfer of the compressed texture
2017-05-04 15:52:38 -07:00
Chris Collins
98085b6d26 Merge pull request #10386 from ZappoMan/MyAvatarAttachmentsNotVisibleBug
fix issue with not seeing your own attachments
2017-05-04 15:51:46 -07:00
Chris Collins
7d1ffe181f Merge pull request #10340 from huffman/fix/obj-atp
Fix OBJ material loading not working over ATP
2017-05-04 15:50:52 -07:00
Zach Fox
946c5e7662 Almost finished with not-logged-in and not-shareable 2017-05-04 15:24:51 -07:00
ZappoMan
43a177cf9a CR feedback 2017-05-04 15:22:44 -07:00
ZappoMan
0e3b65abde Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug 2017-05-04 15:06:31 -07:00
howard-stearns
25ab8e7e94 debugging on call, but mostly, specify json headers, etc. 2017-05-04 14:45:58 -07:00
howard-stearns
9954380ce3 don't filter out the place you're at anymore 2017-05-04 14:44:48 -07:00
Brad Davis
9def788956 Merge pull request #10314 from jherico/avatars-renderer
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
f4df1a3a05 Merge pull request #10382 from jherico/3d_crash
Prevent crash on switching to 3D display twice
2017-05-04 14:16:49 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Anthony Thibault
7006fa6da4 Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update
grab is driven by timer rather than update, load tablet model with high priority
2017-05-04 14:07:21 -07:00
ZappoMan
e87f8dfe45 fix issue with not seeing your own attachments 2017-05-04 13:31:24 -07:00
Brad Davis
fb995bebf1 Prevent crash on switching to 3D display twice 2017-05-04 12:04:21 -07:00
Zach Fox
b08d23924a Keep hover status of both images in sync 2017-05-04 11:00:13 -07:00
Andrew Meadows
7cb2bff4c5 Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash
Fix vr 2d vr tablet crash
2017-05-04 10:08:55 -07:00
Zach Fox
b01bff061e Hover lock when uploading 2017-05-04 10:06:52 -07:00
Zach Fox
c7f5115e26 Move help text to above buttons 2017-05-04 10:06:52 -07:00
howard-stearns
a7e3fad23e Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances 2017-05-04 10:03:57 -07:00
Seth Alves
ecd690e5e9 Merge pull request #10348 from ctrlaltdavid/21311
Don't sort recordings
2017-05-04 09:59:12 -07:00
Seth Alves
006c5a3c20 Merge pull request #10347 from ctrlaltdavid/21310
Don't warn that recording didn't start playing if you stop it
2017-05-04 09:58:25 -07:00
anshuman64
9cee7ce483 Merge pull request #10360 from ctrlaltdavid/21314
Fix reliability of keyboard enabling in tablet Web pages
2017-05-04 09:57:02 -07:00
Seth Alves
19327ef5a7 Merge pull request #10354 from zzmp/fix/tablet-deadlock
Fix deadlock from accessing an initializing tablet
2017-05-04 09:52:50 -07:00
David Rowe
30604ab901 Fix some typos noticed in passing 2017-05-04 16:56:18 +12:00