Commit graph

72789 commits

Author SHA1 Message Date
Seth Alves
f6e57f54b0 don't call enterEntity until script preload has finished 2018-09-21 10:26:55 -07:00
Seth Alves
d5c0c05ab2 wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded. 2018-09-21 10:26:55 -07:00
David Back
506b9d8645 more fixes for deleting/selecting, potential optimizations 2018-09-21 10:02:41 -07:00
John Conklin II
9c2a7931fb
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning
tweak avatar update priority coefficients for load tests
2018-09-21 09:44:15 -07:00
Zach Fox
e75a45af92 Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-21 09:43:30 -07:00
David Back
33ef4e8179 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-21 08:53:43 -07:00
sam gateau
aa02dcb087 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-21 08:19:50 -07:00
Alexander Ivash
1461fdf350 FB17835 - On clean installs, default avatarbookmarks.json file is read-only; bookmarks reset every launch until replaced or unmarked 2018-09-21 12:19:23 +03:00
David Rowe
b1bbcb9e5e Tidying 2018-09-21 13:48:28 +12:00
David Rowe
9426f72652 Make mini tablet disappear when using grip the same as the trigger 2018-09-21 13:45:10 +12:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
David Rowe
eac1666e01 Disable grabbing the mini tablet with the grip button 2018-09-21 12:44:55 +12:00
sam gateau
cae2c60e7f Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:29:31 -07:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
Stephen Birarda
eb7b7440bf changes for cmake 3.12 and MacOS 10.14 2018-09-20 17:12:30 -07:00
David Rowe
0ae7fdc7b1 Remove ability to grab the mini tablet with the other hand 2018-09-21 12:02:46 +12:00
Stephen Birarda
e624b0ce8e bump deployment target to 10.9 so libc++ is default 2018-09-20 17:00:11 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
sam gateau
5d80a89094 Apply fix to gl41 backend needed for proper Resource BUffer on gl41 2018-09-20 16:09:08 -07:00
Roxanne Skelly
6e051b7431 Checkpoint tray notifications
* Fix app launch
* refactor notifications code
* fixup wording
2018-09-20 15:55:35 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Wayne Chen
3907eaf68f changing show password image 2018-09-20 14:40:19 -07:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Thijs Wenker
1094b6722f self-CR 2018-09-20 23:36:53 +02:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Thijs Wenker
d1f35c8c54 update the entityList update with newly added Entities.getMultipleEntities function 2018-09-20 22:48:56 +02:00
Thijs Wenker
e2cb96193d JSDocs 2018-09-20 22:47:14 +02:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Zach Fox
87e91a4401 GOTO doesn't care about SINCE; reduce data for PEOPLE 2018-09-20 13:36:50 -07:00
Thijs Wenker
6d72881f3f remove commented out test code 2018-09-20 21:14:30 +02:00
Stephen Birarda
5c4f6c741c fix agent audio packet send when encoder is flushed 2018-09-20 11:55:55 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
David Back
e1758c7974 CR changes 2018-09-20 11:08:01 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
Andrew Meadows
cf85c617a2 tweak avatar update priority coefs for load tests 2018-09-20 09:56:50 -07:00
sam gateau
b04cbbb0ac Apply fix to gl41 backend needed for proper Resource BUffer on gl41 2018-09-20 09:16:43 -07:00
NissimHadar
0ff8060791 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-09-20 08:08:12 -07:00
Sam Gateau
377464f5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-19 19:00:30 -07:00
sam gateau
6b6551c8bd the missing file 2018-09-19 17:29:10 -07:00
sam gateau
4fc6466250 update shaders 2018-09-19 17:27:58 -07:00
Wayne Chen
8770c363df change button text to have a space 2018-09-19 17:02:05 -07:00
Howard Stearns
391128ef77 Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2 2018-09-19 16:46:09 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00