Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 15:17:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

25335 commits

Author SHA1 Message Date
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
SamGondelman
215193ad90 try to improve performance 
(cherry picked from commit a5f5f9fc5d)
 2017-10-04 13:50:35 -07:00
Nissim Hadar
eef778a463 Replaced uint8_t with uint32_t in server packet. 2017-10-04 13:47:13 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Nissim Hadar
62cfaaaf38 Sam's corrections. 2017-10-04 12:56:14 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
SamGondelman
a5f5f9fc5d try to improve performance 2017-10-04 12:05:13 -07:00
Nissim Hadar
2ce86ebfae WIP - working on byte order in server messages. 2017-10-04 11:56:35 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Nissim Hadar
3f677ec7c9 WIP - working on byte order in server messages. 2017-10-04 10:23:59 -07:00
Zach Fox
2cdd5c29f3 Uncertified rez rights 2017-10-04 09:58:29 -07:00
Nissim Hadar
8c430d36fa WIP - working on byte order in server messages. 2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741 WIP - working on byte order in server messages. 2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb WIP - working on byte order in server messages. 2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10 WIP - working on byte order in server messages. 2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00 WIP - working on byte order in server messages. 2017-10-03 21:34:21 -07:00
Nissim Hadar
16a10a8a0c WIP - working on byte order in server messages. 2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e Moved _hazeProperties.getProperties(properties); into the ReadLock 2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468 Replaced HazeMode with uint8_t in transport protocol. 2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
Nissim Hadar
48e5b9d1bc Haze enable/disable from UI works. 2017-10-03 17:42:04 -07:00
Zach Fox
ed40e41b94 Potential progress? Not totally sure 2017-10-03 16:18:29 -07:00
Seth Alves
75d2a2bd47 Merge pull request #11517 from SamGondelman/registration 
Fix entities with registration points rendering in the wrong place
 2017-10-03 16:09:27 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
Seth Alves
6040c4a3e8 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 14:06:01 -07:00
Anthony Thibault
2dc080479c Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock 
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
 2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 13:11:03 -07:00
SamGondelman
a6f2545511 fix local t pose 2017-10-03 12:51:37 -07:00
Andrew Meadows
46e809bbb2 use a better variable name 2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851 expose performance hot spot in stats details 2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
409360e55d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 11:17:38 -07:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Nissim Hadar
1cf7f5a732 For testing. 2017-10-03 09:54:44 -07:00
Seth Alves
41dfdf4d82 Merge pull request #11509 from druiz17/fix-hud-module 
Hud module. check if laser is pointing at UI element without moving the reticle first
 2017-10-03 09:44:45 -07:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb Fix Animation hue bug. 2017-10-03 15:25:54 +01:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
Nissim Hadar
93a2776cb5 Changes for debug 2017-10-02 18:13:23 -07:00
Nissim Hadar
999c3201c3 Merge branch 'master' into hazeZone 2017-10-02 16:54:45 -07:00
Nissim Hadar
cdbf067a24 Rename (haze)getParametersBuffer to getHazeParametersBuffer. 
Add corrections from Sam
 2017-10-02 16:54:02 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Seth Alves
e7fa8131ea make json importer understand AVATAR_SELF_ID 2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e allow importing of avatar entities from json 2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
Nissim Hadar
ca4c5969d9 Clean-up. 2017-10-02 14:36:45 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713 fix warning about double-to-float conversion 2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81 faster rate counting 2017-10-02 13:08:17 -07:00
Nissim Hadar
29d5e772d4 Removed "..Is.." from various methods. 2017-10-02 12:42:46 -07:00
Howard Stearns
7b0321c1e1 guess for mac/linux openssl 2017-10-02 12:30:25 -07:00
beholder
cc8f1352da 7951 Reload button in Running Scripts dialog stops script 2017-10-02 22:18:03 +03:00
Nissim Hadar
93bc3bec52 Removed (unused) _haze. 2017-10-02 12:14:21 -07:00
Nissim Hadar
48fb7522c0 Removed blank line 2017-10-02 11:42:04 -07:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Nissim Hadar
20a42d6fbd Fixed model name string 2017-10-02 10:11:34 -07:00
Howard Stearns
0f6884dd80 fix mac/linux compiler error 2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
Nissim Hadar
97756146b1 Attempt to add qml configuration 2017-10-02 09:09:36 -07:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
Nissim Hadar
bdd469cec4 Integrated haze shader into this branch. 2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb Some clean-up. 2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c Merging haze branch. 2017-09-30 00:04:28 -07:00
Nissim Hadar
95f8f1ffc5 Added Varying8 2017-09-29 18:05:48 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
Nissim Hadar
951ce247a2 Working on adding zone to haze. 2017-09-29 17:36:14 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12 animation url and computing certificateID 2017-09-29 16:32:25 -07:00
Nissim Hadar
2e1919eba5 Merge branch 'master' into hazeZone 2017-09-29 15:16:46 -07:00
Nissim Hadar
f26345a3f0 Working on adding zone to haze. 2017-09-29 15:15:49 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
SamGondelman
b8ea6c22fa no tpose when switching avatars 
(cherry picked from commit fcfac9efc0)
 2017-09-29 13:47:09 -07:00
Sam Gateau
fb5fd346ff Merge pull request #11492 from SamGondelman/tPose 
Fix getting stuck in T-Pose on avatar switch
 2017-09-29 13:37:31 -07:00
Zach Fox
96b6a2f013 Fix entity add after incomplete rezCertified implementation 
(cherry picked from commit 0f66fb41fd)
 2017-09-29 13:27:21 -07:00
humbletim
fd917917c4 include the source basename in Script.print() && QML/Script console.*() debug output 2017-09-29 14:48:01 -04:00
Andrew Meadows
8134e2b7f9 fix const violation 2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40 use [this] for lambda capture list 2017-09-29 11:34:35 -07:00
Andrew Meadows
f5f1a64c92 use const ref on pointer, and use dynamic_cast 2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026 remove dupe addToNeedsParentFixupList() call 2017-09-29 11:34:35 -07:00
Andrew Meadows
0c934e863b clarify some comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496 namechange: apparentAngle --> angularDiameter 2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173 fix Differential scan logic for LOD culling 2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38 small fixes and LOD cull children instead of parent 2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056 use 20 degrees of OVERSEND 2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8 fix isVerySimilar 2017-09-29 11:34:35 -07:00
Andrew Meadows
355a59edb1 fix missing entities in differential traversal 2017-09-29 11:34:35 -07:00
Andrew Meadows
d55d45f6aa check radius in ViewFrustum::isVerySimilar() 2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff remove ViewFrustum::calculateProjection() 2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100 zero out OVERSEND hack 2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d reasonable values for iitial OctreeQueryNode view 
make sure newViewFrustum is fully initialized before using it
 2017-09-29 11:34:34 -07:00
Andrew Meadows
0597970bb4 faster, more correct ViewFrustum::isVerySimilar() 
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
 2017-09-29 11:34:34 -07:00
SamGondelman
defed80be7 edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes 2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7 full scene traversal and json filters 2017-09-29 11:34:34 -07:00
SamGondelman
0ad5f47bfd trying to fix entity editing bugs, needs testing 2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd add state to entity tree send thread 2017-09-29 11:34:34 -07:00
Andrew Meadows
b6818c4369 first-pass sending entities from _sendQueue 2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e cherrypick traverseTreeAndBuildNextPacketPayload() 2017-09-29 11:34:34 -07:00
Andrew Meadows
cf2e500ec4 remove unnecessary const qualifiers 2017-09-29 11:34:33 -07:00
SamGondelman
bb5368eb55 use correct rootSizeScale 2017-09-29 11:34:33 -07:00
Andrew Meadows
0b0de96894 use memcpy instead of copying one byte at a time 2017-09-29 11:34:33 -07:00
Andrew Meadows
7597088c7c simpler logic flow 2017-09-29 11:34:33 -07:00
Andrew Meadows
3e50d01734 more correct handling of LOD 2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1 add LOD culling in DiffTraversal 2017-09-29 11:34:33 -07:00
Andrew Meadows
0758b60afc abstract DiffTraversal out of EntityTreeSendThread 2017-09-29 11:34:33 -07:00
Andrew Meadows
8d535f9c5a remove bump to changeFromRemote for server case (revert) 2017-09-29 11:34:33 -07:00
Andrew Meadows
3665a3fbee libraries/entities/src/EntityTreeElement.cpp 2017-09-29 11:34:33 -07:00
Andrew Meadows
dd1febba2f add missing bump to element changed content 2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386 on server: note time of entity edit by remote 2017-09-29 11:34:33 -07:00
Andrew Meadows
2b31a746e3 add content timestamp for EntityTreeElement 2017-09-29 11:34:32 -07:00
Andrew Meadows
ca470d67b4 fix indentation 2017-09-29 11:34:32 -07:00
Andrew Meadows
7edd99ca0b add basics for send queue and tree traversal 2017-09-29 11:34:32 -07:00
Andrew Meadows
82ed19386f make Octree::readBitstreamToTree() virtual 2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a don't use octcode data in entity update packets 2017-09-29 11:34:32 -07:00
Andrew Meadows
55e9ced5c3 cleanup MovingEntitiesOperator 2017-09-29 11:34:32 -07:00
Andrew Meadows
4fa60f5108 cleanup AddEntityOperator 2017-09-29 11:34:32 -07:00
SamGondelman
fcfac9efc0 no tpose when switching avatars 2017-09-29 11:14:29 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
3265fe62ad Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 09:09:27 -07:00
Nissim Hadar
0acf4b9de9 Working on adding zone to haze. 2017-09-28 23:53:53 -07:00
Seth Alves
72cacc4cef server only deletes and entity if it's still the child of an avatar, not if it has ever been 2017-09-28 19:56:15 -07:00
Howard Stearns
d1350a03c2 working checkpoint, but with a lot of debug/development stuff 2017-09-28 17:06:07 -07:00
Zach Fox
0f66fb41fd Fix entity add after incomplete rezCertified implementation 2017-09-28 16:07:15 -07:00
utkarshgautamnyu
5c14c7c3b9 Update JSBaker.cpp 2017-09-28 13:24:03 -07:00
utkarshgautamnyu
463afd6be5 made updates to fix building 2017-09-28 11:12:26 -07:00
Zach Fox
b5dc6b791b Fix commerce setting handle 2017-09-28 10:42:45 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
Nissim Hadar
9d0cf16c20 Fixed Ubuntu warnings. 2017-09-27 19:33:04 -07:00
Nissim Hadar
784f928433 After merge. 2017-09-27 18:46:55 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1 Implemented HazePropertyGroup and added the haze shader. Shader does not work yet! 2017-09-27 17:43:09 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash 
Fix mirror and fade threading crashes
 2017-09-27 16:17:04 -07:00
utkarshgautamnyu
fbe3f2fbe3 Update JSBaker.h 2017-09-27 15:26:17 -07:00
Ryan Huffman
0e3c2f2e50 Fix ambiguous conversion to QVariant in StatTracker 2017-09-27 15:22:23 -07:00
utkarshgautamnyu
4486212e05 Update JSBaker.cpp 2017-09-27 15:20:30 -07:00
Sam Gateau
f25e4203fd Merge pull request #11469 from SamGondelman/tPose 
Don't constantly reload animGraph if URL didn't change
 2017-09-27 14:46:05 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
utkarshgautamnyu
5ad1efb923 Update JSBaker.h 2017-09-27 10:49:48 -07:00
utkarshgautamnyu
d4b8559cb2 Update JSBaker.cpp 2017-09-27 10:49:10 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Nissim Hadar
eaab056d66 Adding HazeStage 2017-09-27 09:12:57 -07:00
Daniela
c22d2add17 Resolve conflict with hifi/master. 2017-09-27 17:06:12 +01:00
Nissim Hadar
4d501d6510 Adding HazeStage 2017-09-27 08:01:19 -07:00
utkarshgautamnyu
70a39f03f7 Update JSBaker.h 2017-09-26 19:36:41 -07:00
utkarshgautamnyu
167dda9f80 made bakeJS a static function 2017-09-26 19:35:54 -07:00
Nissim Hadar
2394d0931c Adding HazeStage 2017-09-26 19:05:11 -07:00
SamGondelman
306cf883fe don't reload animGraph if url didn't change 2017-09-26 18:18:41 -07:00
Nissim Hadar
f92707a00c WIP 2017-09-26 18:08:41 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface 
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
 2017-09-26 17:40:23 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00
SamGondelman
49512c95d7 possibly fix threading crashes, mirror and fade 2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
samcake
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -07:00
Howard Stearns
eeab07cd27 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-26 15:16:28 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Howard Stearns
4403c27b52 working checkpoint. still needs verification/hashing, etc. 2017-09-26 14:14:37 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA 
Text3D Overlays and Entities fixes and no-AA
 2017-09-26 12:26:08 -07:00
Seth Alves
51d5f86989 Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926 
remove asserts that break Debug build
 2017-09-26 12:22:31 -07:00
utkarshgautamnyu
4fd0452694 Update JSBaker.cpp 2017-09-26 12:04:03 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Stephen Birarda
608d42cdf7 Merge pull request #11461 from birarda/bug/too-much-logging 
remove noisy logging added by auto baking
 2017-09-26 13:29:42 -05:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
utkarshgautamnyu
0b387f5b38 Update JSBaker.cpp 2017-09-26 11:01:56 -07:00
utkarshgautamnyu
a9aab67a06 Update JSBaker.h 2017-09-26 11:01:26 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Stephen Birarda
b77ceab661 remove noisy logging added by auto-baking 2017-09-26 10:45:23 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks 
Laser Pointer fixes and updates
 2017-09-26 10:22:55 -07:00
Howard Stearns
81cd00527a Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-26 10:15:37 -07:00
utkarshgautamnyu
1ba7aefd03 Update JSBaker.h 2017-09-26 09:57:02 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
Sam Gateau
ff1101cc69 Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix 
Experimental Fix: Entity Shader Lightmap use / emissive
 2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff comment out asserts that fail to compile in Debug 2017-09-26 09:29:43 -07:00
utkarshgautamnyu
b86dd9dea4 Update JSBaker.cpp 2017-09-25 20:20:30 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
utkarshgautamnyu
209201e592 updates to handle white space within a single line comment 2017-09-25 15:55:12 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
utkarshgautamnyu
0a57874cc2 Made updates to JSBaker 2017-09-25 14:46:38 -07:00
Menithal
19a290be70 Fixed Entity Shader emmissive 
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
 2017-09-26 00:12:45 +03:00
vladest
074362b228 Remove logging 2017-09-25 23:10:26 +02:00
Howard Stearns
ee6bf7f761 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-25 12:37:28 -07:00
SamGondelman
a73fdf4397 fix pointer event properties 2017-09-25 10:19:42 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Olivier Prat
27b9f3516d Added mix parameter to blur and bloom 2017-09-25 18:05:30 +02:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +02:00
Olivier Prat
22b1507597 Fixed blur to work correctly on four sides of screen 2017-09-25 16:41:20 +02:00
vladest
5a452fa981 Merge branch 'master' into tablet_extended_sounds 2017-09-25 15:40:40 +02:00
Olivier Prat
443d6dfacb Added user definable taps in blur task 2017-09-25 14:24:40 +02:00
Olivier Prat
bcec3680b6 First draft 2017-09-25 11:51:23 +02:00
Olivier Prat
f31e9df21c Fixed incorrect pixel byte size computation in KTX 2017-09-25 10:31:49 +02:00
Olivier Prat
23c77d528a Merged with master with new abotProcessing in image 2017-09-25 09:48:24 +02:00
utkarshgautamnyu
6c40d39f81 refactored jsbaker.cpp 2017-09-24 20:53:09 -07:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
543bc5a71b HazeMode calls Haze::setIsHazeActive. 2017-09-24 18:25:20 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Nissim Hadar
678b4e35b1 Before replacing "Haze Active" checkbox with "Haze Mode" combo. 2017-09-24 14:06:00 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691 Merge pull request #11436 from SamGondelman/missingModels 
Fix missing models
 2017-09-23 13:56:50 -07:00
utkarshgautamnyu
cda5e94b33 Added JavaScript Baking 2017-09-22 20:57:18 -07:00
Nissim Hadar
c4419fede8 Bumped up the version number. 2017-09-22 19:07:05 -07:00
Nissim Hadar
c2eea7d40b Minor cleanup. 2017-09-22 18:37:21 -07:00
Nissim Hadar
736a6aa311 Haze checkbox in UI doesn't disable the UI. 2017-09-22 18:20:35 -07:00
samcake
59006411c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
Howard Stearns
8fdd405593 consistent comments 2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463 entityInstanceNumber 2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
SamGondelman
bc477608ee fix alpha on glowLines 2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Anthony Thibault
20cb02dabb Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering 
Fix for TextEntity rendering, the translation was incorrect
 2017-09-22 11:19:24 -07:00
samcake
47b7fcc532 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 11:03:05 -07:00
samcake
061ec69b09 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 10:52:30 -07:00
SamGondelman
be27376c52 add comment about bottleneck 2017-09-22 10:21:32 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
Anthony J. Thibault
d3c60f3057 Fix for TextEntity rendering, the translation was incorrect 
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
 2017-09-22 09:44:51 -07:00
Howard Stearns
6c47b71356 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-22 09:23:46 -07:00
Brad Davis
549cb77902 Fix dimensions of rendered web entities 2017-09-21 20:59:01 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
Cain Kilgore
0d33976035 Real time changes 2017-09-22 00:38:30 +01:00
Nissim Hadar
953ddfdcd3 First version of adding haze to the zone. 2017-09-21 14:54:16 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Ryan Huffman
abbe263142 Fix FBXBaker not properly handling textures with the same name 2017-09-21 13:40:39 -07:00
Howard Stearns
81585afb7c Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-21 12:46:34 -07:00
Ken Cooke
84786ac8e3 Merge pull request #11424 from ctrlaltdavid/21548 
Fix recording just made not playing back if reload it
 2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a Coding standard 2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
samcake
9a9d13e519 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-21 09:05:46 -07:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618 
6618 [Worklist] Add Input Field On Top of Keyboard
 2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c Merge pull request #11421 from jherico/fix/transform_log_spam 
Don't add items to the scene graph until they have a valid parent chain
 2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
Daniela
d960a7c42e Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 16:20:51 +01:00
Olivier Prat
98820f720d KTX serialization / unserialization working with compressed HDR. Not sure with packed floats 2017-09-21 13:17:25 +02:00
Olivier Prat
f4579d44bc Merge branch 'master' of git://github.com/highfidelity/hifi into hdrcube 2017-09-21 10:03:16 +02:00
Olivier Prat
5699dc6f42 Added KTX support of compressed HDR and HDR formats 2017-09-21 10:03:05 +02:00
Olivier Prat
5ec9c5bb45 Fixed some coding standard issues 2017-09-21 09:32:34 +02:00
samcake
ad1cab71f3 Merge branch 'master' of https://github.com/highfidelity/hifi into game_render_interface 2017-09-20 18:10:37 -07:00
David Rowe
4ce5e4ac46 Fix recording just made not playing back if reload it 2017-09-21 12:19:32 +12:00
Brad Davis
27350bd7de Don't add items to the scene graph until they have a valid parent chain 2017-09-20 16:52:23 -07:00
Cain Kilgore
45f79b4341 Small fix 2017-09-21 00:00:24 +01:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060 Cleanup from Merge 2017-09-20 23:37:33 +01:00
Cain Kilgore
f06c04e1b0 Fixed things 2017-09-20 23:24:56 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Cain Kilgore
4d904bd5ce Changed naming of avatarGrav 2017-09-20 18:43:16 +01:00
Cain Kilgore
506226ead0 Merge branch 'master' into 21542 2017-09-20 18:22:34 +01:00
Anthony J. Thibault
809e986738 Fixes for lasers on 2d HUD 2017-09-20 09:21:14 -07:00
samcake
fd8868f609 Moving the render transform evaualtion in game loop for Models 2017-09-19 17:30:20 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Chris Collins
0a213e24c4 Merge pull request #11389 from highfidelity/RC-55 
Beta Release 55 - Includes up to Developer Release 7127
 2017-09-19 14:23:58 -07:00
Ryan Huffman
20759b0c97 Merge pull request #11404 from birarda/feat/auto-bake 
add abort on shutdown to Baker/FBXBaker/TextureBaker
 2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4 address code review comments 2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12 Merge pull request #11402 from huffman/fix/remove-fbxcpp 
Remove FBX.cpp and other cleanup
 2017-09-19 13:54:50 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
vladest
50ee41e095 Fix file loading dialogs 2017-09-19 22:42:15 +02:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
Stephen Birarda
0d166cc250 Merge pull request #11400 from Atlante45/feat/auto-bake 
Remove unused Algorithms.h
 2017-09-19 12:44:15 -07:00
Ryan Huffman
5950006111 Remove extraneous logging 2017-09-19 11:18:25 -07:00
Ryan Huffman
641addf397 Remove FBX.cpp 2017-09-19 11:13:39 -07:00
Daniela
4568541737 Remove redundant variables. 2017-09-19 18:47:02 +01:00
Daniela
1426e10024 Fix texture loading issue with upstream master. Tune amount of points. 2017-09-19 17:47:00 +01:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Daniela
7e53f0b7dc Clean up. 2017-09-19 15:29:17 +01:00
vladest
5202d024a7 Merge branch 'master' into tablet_extended_sounds 2017-09-19 15:55:37 +02:00
Clément Brisset
108de209bb Merge pull request #11393 from birarda/feat/auto-bake 
don't export embedded textures with original, remove triangle warning
 2017-09-18 16:21:07 -07:00
Atlante45
b9e5957c9f Remove unused Algorithms.h 2017-09-18 16:14:06 -07:00
Anthony J. Thibault
73ad9051a4 Shapes now render at the correct size. 2017-09-18 15:27:58 -07:00
Stephen Birarda
608f8196c6 remove commented out removal of embedded media folder 2017-09-18 14:01:48 -07:00
Stephen Birarda
02a529923e don't export embedded textures, remove triangle warning 2017-09-18 14:00:03 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Anthony J. Thibault
5187ac4761 Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-18 10:57:04 -07:00
beholder
8b39c56aa1 rename 'target' to 'targetOverride' to indicate that parameter overrides default target 2017-09-18 20:40:22 +03:00
vladest
e26118254f Implemented Audio injector in Tablet scripting interface. Added missed sound events 2017-09-18 19:40:06 +02:00
Ryan Huffman
d80aa50e79 Remove support for QList in FBXWriter 2017-09-18 09:04:13 -07:00
Olivier Prat
037550f176 Switched back to R11G11B10 for HDR cube maps because of sometimes wrong hue shifts with RGB9E5 2017-09-18 10:58:38 +02:00
vladest
bb214d7bf3 Merge branch 'master' into tablet_extended_sounds 2017-09-17 16:16:03 +02:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Sam Gateau
84dfe53fee Merge pull request #11362 from jherico/crash/model-race 
Ensure thread-safety for model pointer access
 2017-09-16 10:45:09 -07:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
howard-stearns
b9f5810d99 snapshot 2017-09-15 17:09:07 -07:00
Stephen Birarda
1f961885cc Merge pull request #11369 from huffman/feat/bake-skinning-support 
Add animation support for draco encoded FBXs
 2017-09-15 15:21:35 -07:00
Ryan Huffman
2a4f7712c3 Replace magic number for compressed flag in FBXWriter 2017-09-15 14:41:38 -07:00
Ryan Huffman
c5852dfbe8 Add list compression to FBXWriter 2017-09-15 13:53:10 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c Merge pull request #11364 from sethalves/rework-scriptengine-lifetime 
Rework scriptengine lifetime
 2017-09-15 12:17:51 -07:00
samcake
a49b4dc31f Merge back blue-bis in 2017-09-15 11:40:26 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Artur Gomes
e37b98e0f5 Fix polyline optimization. 
Add more points to the polyline to check if the optimizations are
working.
 2017-09-15 19:20:33 +01:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
0526d32802 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-15 06:05:43 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
Ryan Huffman
fd1d4b9bd1 Update FBXBaker to only pack original indices if needed 2017-09-14 16:49:53 -07:00
Ryan Huffman
7db8d1dcbc Add support for baked skinned meshes 2017-09-14 16:43:52 -07:00
Ryan Huffman
3793062045 Add optional FBX 2015 encoding to FBXWriter 2017-09-14 16:31:10 -07:00
Stephen Birarda
2a62bac4f9 refuse to re-bake an already baked FBX 2017-09-14 16:08:11 -07:00
Brad Davis
d3ac7a388c Fix polyline rendering using default texture 2017-09-14 15:50:09 -07:00
Brad Davis
4c4df97c42 Fix transform of polylines with high update rates 2017-09-14 15:50:02 -07:00
Brad Davis
c0fb9dcf2e Fix polyline crash and flicker 2017-09-14 15:49:54 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Clément Brisset
cbe61871dc Merge pull request #11346 from birarda/feat/draco-in-baking 
Add mesh compression to baking library and FBXReader
 2017-09-14 15:32:58 -07:00
Stephen Birarda
43196cd0a6 fix buffer resizing to only occur when attribute is present 2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4 remove re-grabbing of draco faces 2017-09-14 14:42:40 -07:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Brad Davis
688ee68cf9 Ensure thread-safety for model pointer access 2017-09-14 12:29:23 -07:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
vladest
7c1827d672 use AduioEvent instead of string 2017-09-14 20:21:11 +02:00
samcake
3d33ab9686 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-14 11:18:25 -07:00
vladest
61b283743e Merge branch 'master' into tablet_extended_sounds 2017-09-14 19:52:35 +02:00
Brad Davis
aef85eb69d Fix polyline rendering using default texture 2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78 Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime 2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Brad Davis
501eee8b10 Fix transform of polylines with high update rates 2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b Fix polyline crash and flicker 2017-09-14 08:45:36 -07:00
Sam Gateau
e4a5b7f250 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-13 19:28:56 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Brad Davis
f4d8216501 Fix race condition accessing QString sub-properties in zones 2017-09-13 18:06:21 -07:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
1e6154fbc8 make draco compile flags OS X only 2017-09-13 13:45:26 -07:00
David Kelly
030b39050a Merge pull request #11343 from davidkelly/dk/oneFileWallet 
Wallet updates
 2017-09-13 11:15:03 -07:00
SamGondelman
f68a588323 rename isAA isAntiAliased 2017-09-13 10:24:10 -07:00
Olivier Prat
b8065d46ce Fixed bugs with conversion to packed floats 2017-09-13 19:15:51 +02:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Cain Kilgore
2427008ff3 Static 2017-09-13 17:40:04 +01:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01:00
Andrew Meadows
50b94887fa Merge pull request #11339 from ElderOrb/case7469 
7469 Mouse Pointer Depth is Incorrect in HMD Mode
 2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix 
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
 2017-09-13 08:05:53 -07:00
Luis Cuenca
68bce3c09c Qmap initialized 2017-09-13 07:04:50 -07:00
Olivier Prat
aab63bf109 Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash 2017-09-13 14:32:22 +02:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
Artur Gomes
b65520e788 Merge remote-tracking branch 'upstream/master' 2017-09-13 12:32:17 +01:00
Stephen Birarda
8a9e4029ae use explicit conversion from size_t to int 2017-09-13 00:23:52 -07:00
Stephen Birarda
4efd9b8453 set explicit draco encoding options 2017-09-12 23:45:34 -07:00
Ryan Huffman
087a95a625 Add explicit draco encoder options to FBXBaker 2017-09-12 23:15:35 -07:00
Stephen Birarda
c445d914d7 make sure material IDs are de-duplicated 2017-09-12 22:04:33 -07:00
Luis Cuenca
f25288178b endif fixed 2017-09-12 21:35:34 -07:00
Luis Cuenca
e1ac16498e Corrected Ubuntu Errors 
Corrected:
-endif
-extra qualification
-invalid initialization of non-const reference
 2017-09-12 20:19:44 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02:27 -07:00
Ryan Huffman
c9024f5e87 Update FBXBaker to bake triangleIndices and fix faces being lost 2017-09-12 19:59:43 -07:00
Stephen Birarda
b253d3b57c fix material triangle index insertion 2017-09-12 17:44:53 -07:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
Stephen Birarda
a25e5796dc use push_back instead of append for extracted mesh vectors 2017-09-12 16:35:21 -07:00
Stephen Birarda
bb7cd58e9a fix reference to part index 2017-09-12 16:28:12 -07:00
Stephen Birarda
5d9ed78369 fixes for extracted mesh construction 2017-09-12 16:09:40 -07:00
Stephen Birarda
cf282dd3fc add code to read draco mesh from FBX 2017-09-12 15:04:53 -07:00
samcake
216d74c112 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-12 14:36:12 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
Stephen Birarda
61314949ec add draco as external to FBX library 2017-09-12 14:10:27 -07:00
Ryan Huffman
395c9283dc Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter 2017-09-12 14:09:59 -07:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Stephen Birarda
2105f2da92 change unique ID for material and second tex coord 2017-09-12 10:27:07 -07:00
Ryan Huffman
9243cf7590 Remove extraneous logging in FBXWriter 2017-09-12 09:45:46 -07:00
Ryan Huffman
2d9d432221 Update FBXBaker to remove unused nodes from the Geometry node 2017-09-12 09:45:24 -07:00
Ryan Huffman
8fc8b8100d Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded 2017-09-12 09:44:44 -07:00
Artur Gomes
ae4e9b16e9 Fix some issues with the polyline optimizations. 2017-09-12 17:07:27 +01:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
Bradley Austin Davis
0f465da92f Various Mac fixes 2017-09-11 17:17:07 -07:00
Bradley Austin Davis
3a75dcf84d Fix crashes in entity rendering on OSX 2017-09-11 17:17:00 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
anshuman64
996277b34c Merge pull request #11335 from vladest/menu_fix 
Make sure root item is created before lambda gets called for desktop …
 2017-09-11 12:47:40 -07:00
Ryan Huffman
b1d0df06d9 Add error handling in FBXBaker for empty nodes and failed draco compression 2017-09-11 12:07:41 -07:00
Ryan Huffman
ebd925b966 Add proper per face materials and texCoords1 to fbx baking 2017-09-11 10:52:59 -07:00
vladest
34c1cb6579 Typos and naming fixes 2017-09-11 19:42:05 +02:00
Menithal
40d339a831 21484: Updated code to go with PR feedback 2017-09-11 20:36:29 +03:00
Andrew Meadows
ce3ed68861 Merge pull request #11333 from ctrlaltdavid/faster-fade-in 
Reduce entity fade-in time
 2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7 Merge pull request #11323 from jherico/mac_fixes 
Mac fixes
 2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d Merge pull request #11293 from jherico/fix_hmd_menu 
Fix access to menu on background thread
 2017-09-11 08:26:04 -07:00
vladest
dfaa8761e5 Make sure root item is created before lambda gets called for desktop loader 2017-09-10 20:08:40 +02:00
Cain Kilgore
f6e22b0733 Changes 
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
 2017-09-09 17:21:42 +01:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
Ryan Huffman
3d6d383a15 Clean up duplicate list code in encodeFBXProperty 2017-09-08 16:58:57 -07:00
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
Seth Alves
f5d77104c3 Merge pull request #11332 from sethalves/squelch-cannot-render 
suppress repeated 'item could not be rendered' messages
 2017-09-08 16:23:22 -07:00
Cain Kilgore
387e474889 WIP 2017-09-08 23:48:09 +01:00
Anthony Thibault
3de518a843 Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose 
Fix MyAvatar getting stuck in T-pose on loading
 2017-09-08 15:18:57 -07:00
Seth Alves
967d3f69d3 suppress repeated 'item could not be rendered' messages 2017-09-08 14:13:58 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
Cain Kilgore
7b39cb7791 Should work now 2017-09-08 21:44:38 +01:00
Cain Kilgore
dfbd25fd77 Now pls 2017-09-08 20:51:41 +01:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
Cain Kilgore
7f4cc0ed2a Should fix the Mac Build 2017-09-08 20:21:17 +01:00
Anthony J. Thibault
559ac6786d Fix MyAvatar getting stuck in T-pose on loading 
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene().  They both would end up setting the
Model::_addedToScene flag.  This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
 2017-09-08 11:44:06 -07:00
Stephen Birarda
0d7b50cfb6 remove old texture type method 2017-09-08 09:44:19 -07:00
Olivier Prat
d6d36cbd43 Outline working on voxels 2017-09-08 11:14:06 +02:00
vladest
832e4aa5eb Introducong tablet audio events 2017-09-08 09:51:10 +02:00
Cain Kilgore
b953c49461 Commit for Better Logger - WL 21537 2017-09-08 03:20:55 +01:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -07:00
Stephen Birarda
b153d1e177 use FBXReader/FBXWriter for texture baking in FBXBaker 2017-09-07 18:38:29 -07:00
Anthony J. Thibault
f4f9c29bff Fix for avatar scale preferences 2017-09-07 15:30:16 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982 Fix crashes in entity rendering on OSX 2017-09-07 14:32:50 -07:00
Ryan Huffman
7214f57376 Update FBXBaker::exportScene with FBXWriter 2017-09-07 14:12:15 -07:00
Ryan Huffman
b60d68c714 Replace FBX SDK loading of file in FBXBaker with FBXReader 2017-09-07 14:00:09 -07:00
Ryan Huffman
7a55c867be Fix _fbxNode rename to _rootNode in FBXReader 2017-09-07 12:56:46 -07:00
Ryan Huffman
aa1aad0a09 Add FBXWriter for serializing FBXNode 2017-09-07 12:56:36 -07:00
Brad Hefta-Gaub
6a1fe81832 Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 
split packet construction from packet sending in OctreeSendThread
 2017-09-07 12:36:29 -07:00
Stephen Birarda
1508edb459 use store/load to be clearer about atomics 2017-09-07 12:07:58 -07:00
Stephen Birarda
7859b3b11f remove image compression choices from Interface settings 2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Chris Collins
12d720805c Merge pull request #11319 from jherico/async_qml_load_crash 
Fix potential crash on asynchronous QML loads
 2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Olivier Prat
7fb7ebca57 Fixed warning on Mac 2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce Optimized by removing unnecessary Z buffer copy 2017-09-07 18:33:00 +02:00
Daniela
0655264b44 Replace bytes for uint8_t. 2017-09-07 14:21:41 +01:00
Olivier Prat
2003495166 Adjustments to half texel fix 2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b Modified outline shader to do fill branch on CPU. Fixed assymetric outline 
due to depth sample not offset by a half texel in shader.
 2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b Fixed non working outline in stereo with new changes 2017-09-07 10:33:55 +02:00
Daniela
608e4858fc Add Fix polyline crash and flicker 2017-09-06 19:06:05 +01:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
Menithal
e1acf9dbc9 Merge remote-tracking branch 'upstream/master' into 21484-Fix 2017-09-06 20:42:47 +03:00
Olivier Prat
17e992bd14 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-06 19:08:37 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Daniela
3c32171c15 Add pack and unpack optimization in Entity Properties 2017-09-06 18:02:36 +01:00
Olivier Prat
10643feb78 Working with specific zpass rendering for outline. Debug script needs relinking to correct config 2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3 Created outline task but still need to create specific render job with z-pass shaders 2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f Simplified version that works directly with metas 2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43 First working version of outline working with selection interface. 2017-09-06 15:47:10 +02:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
anshuman64
3a44c6977e Merge pull request #11300 from ElderOrb/case7196 
7196 Mouse pointer no longer visible in HMD mode
 2017-09-05 17:42:36 -07:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
Luis Cuenca
d7c525cf3a glTF importer Demo 
Imports a glTF model as the default avatar.
Geometry data and materials are imported.
No bone information is imported.
 2017-09-05 13:32:51 -07:00
Anthony J. Thibault
f0912987a3 Fix ray picks against HUD sphere at different sensor scale factors 2017-09-05 10:03:19 -07:00
Andrew Meadows
4b8840f307 Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1 
fix a bug that caused dynamic children to wink in and out and then vanish
 2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00
Menithal
856452405e Made Code abit more concise for better compilation 2017-09-05 08:46:37 +03:00
Menithal
119a2703f7 Removed Debug Joints that wasnt used anylonger 2017-09-04 22:20:00 +03:00
Menithal
03e076046b Added Joint Name check for translations 
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
 2017-09-04 22:16:02 +03:00
beholder
c62f9007e9 7196 Mouse pointer no longer visible in HMD mode 
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
 2017-09-03 15:20:59 +03:00
Clément Brisset
7d4f17506e Merge branch 'feat/auto-bake' into feat/bake-meta-errors 2017-09-01 17:33:25 -07:00
Seth Alves
0855dfc1c6 PR-11290 didn't actually bump protocol version 2017-09-01 17:26:32 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled 
Wire "Use baked" checkbox
 2017-09-01 16:25:49 -07:00
Ryan Huffman
c67fcc1384 Add RedirectFail to ResourceRequest::getResultString() 2017-09-01 10:41:31 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
Menithal
5506520226 Fixed missing semi colon 2017-09-01 08:20:54 +03:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Bradley Austin Davis
d0fdf175fd Fix access to menu on background thread 2017-08-31 16:30:17 -07:00
Ryan Huffman
bf53161a0b Fix comparison between signed and unsigned int in MappingRequest 2017-08-31 15:55:27 -07:00
Ryan Huffman
25f64e1aa9 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 15:17:40 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Ryan Huffman
d2c7235fed Fix update to count width in GetAllMappings 2017-08-31 14:41:29 -07:00
Menithal
0e3fc64f63 Fixed Inverse logic and Cleanup 2017-09-01 00:35:56 +03:00
Menithal
663e8514de Found the culprit. Was overriding the value 2017-09-01 00:00:24 +03:00
Atlante45
a9cfc01df3 Set Baking Enabled API 2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c Move constant to central location 2017-08-31 13:08:18 -07:00
Stephen Birarda
b1bc899121 Merge pull request #11270 from birarda/feat/auto-bake 
refuse to perform mapping operations in /.baked/
 2017-08-31 13:06:28 -07:00
Ryan Huffman
0cd8a5cd41 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 12:09:21 -07:00
Stephen Birarda
da8ae23756 move default to the bottom of bakingStatusToString 2017-08-31 11:52:42 -07:00
vladest
1b5e6fd5f8 Merge branch 'master' into modal_dialogs_async 2017-08-31 20:39:48 +02:00
Daniela
42be6434af Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-31 18:03:39 +01:00
Seth Alves
41b51804dc fix comment 2017-08-30 17:53:55 -07:00
Seth Alves
3f0a95d8db remove unneeded line 2017-08-30 17:53:20 -07:00
Seth Alves
ca86ce59c2 fix a bug that cuased dynamic children to wink in and out and then vanish 2017-08-30 17:44:42 -07:00
Stephen Birarda
84b5afaa4d mark task dispatcher as override 2017-08-30 17:28:17 -07:00
Ryan Huffman
2aa39e7da4 Fix baking library not automatically being built 2017-08-30 16:53:51 -07:00
Stephen Birarda
4e1e483e27 link DL libs with FBX SDK for baking 2017-08-30 16:50:20 -07:00
Zach Fox
913618ded5 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 16:13:50 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class. 
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
 2017-08-30 15:46:36 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Zach Fox
3f0d44990a Hook up bounding box rendering to Selection Scripting Interface 2017-08-30 14:54:23 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
Stephen Birarda
3abca67f1a remove use of auto in TextureBaker for OS X compile 2017-08-30 14:30:11 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Ryan Huffman
31345e4264 Fix ATP requests not keeping track of all mapping redirects 2017-08-30 13:15:14 -07:00
Zach Fox
271fcbf8b4 Merge pull request #11271 from davidkelly/dk/securityImageIssue 
security image shows up in every qml engine now
 2017-08-30 10:52:48 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26 Merge pull request #10625 from humbletim/21180-C++ 
CR 21180-C++ Camera app -- core changes
 2017-08-30 07:20:00 -07:00
David Kelly
72b15b4223 fix comment 2017-08-29 20:28:57 -07:00
druiz17
2a97257698 Merge pull request #11140 from ElderOrb/case6788 
6788: You can deselect your current view mode
 2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac security image shows up in every qml engine now 2017-08-29 17:06:57 -07:00
Menithal
ea79748ed3 Some adjustments 2017-08-29 23:59:36 +03:00
beholder
a0a43ebf26 show checkbox or radiobutton dependently on exclusiveGroup presence 2017-08-29 23:23:16 +03:00
Ryan Huffman
e8a57e3b35 Merge pull request #11256 from birarda/feat/auto-bake 
fail bake of partially baked FBX that references KTX
 2017-08-29 13:17:05 -07:00
Daniela
58f0601af2 Fix identation. 2017-08-29 17:19:41 +01:00
Seth Alves
7220a6998a remove unneeded bind-by-ref thing from lambdas 2017-08-28 17:08:59 -07:00
Seth Alves
b9c68f9156 give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup 2017-08-28 17:01:01 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
Stephen Birarda
ba34a0ddef fail bake of partially baked FBX that references KTX 2017-08-28 15:01:31 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Atlante45
ca62e7168c Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-28 11:41:23 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety 
Additional locking in model entities
 2017-08-28 09:22:30 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
vladest
7796946343 Merge branch 'master' into audio_devices_split 2017-08-26 20:00:00 +02:00
Anthony J. Thibault
937f400534 Bug fixes for Avatar::getEyeHeight() when no feet joints are present 2017-08-25 18:23:19 -07:00
Atlante45
065721d23f Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake 2017-08-25 16:22:14 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Anthony J. Thibault
4f830cf1dc Calculate jump speed based on canonical jump height. 2017-08-25 15:34:51 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Brad Davis
3ad32af975 Additional locking in model entities 2017-08-25 11:49:45 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00
Atlante45
859ec57ded Move Baking Status 2017-08-25 10:54:33 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -07:00
Anthony J. Thibault
e0ff7f5f40 Moved speed constants into AvatarConstants.h 2017-08-25 10:47:54 -07:00
Sam Gondelman
4e7818180b Merge branch 'master' into tabletLayer2 2017-08-24 17:56:44 -07:00
Sam Gateau
c5fbd5a2a5 Merge pull request #11131 from jherico/threaded_render_entities 
Threaded rendering of Entities
 2017-08-24 17:34:49 -07:00
beholder
cbbe03cee7 6788: You can deselect your current view mode 2017-08-25 02:33:11 +03:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Chris Collins
c0afda859f Merge pull request #11240 from kencooke/audio-gate-threshold 
More aggressive noise gate threshold
 2017-08-24 14:49:18 -07:00
Zach Fox
3c7fadb1ce Final touch 2017-08-24 14:30:42 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Ken Cooke
684b7fee5a DC filter cutoff at 0.5Hz 2017-08-24 11:20:22 -07:00
Anthony J. Thibault
246097b65e WIP support for scale within SpatiallyNestable class. 
currently disabled by the SPATIALLY_NESTABLE_SCALE_SUPPORT pre-processor symbol.
 2017-08-24 11:18:38 -07:00
Anthony J. Thibault
5042b90052 Rig: Fix for debug mode assert 2017-08-24 10:47:48 -07:00
Ken Cooke
4a253023ee float constants 2017-08-24 10:15:54 -07:00
Ken Cooke
c3ff505b73 More aggressive noise gate threshold 2017-08-24 10:06:41 -07:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
Chris Collins
93457c0e42 Merge pull request #11237 from birarda/feat/ip-check 
add sender sock addr check to DS packet filter operator
 2017-08-24 07:51:23 -07:00
Chris Collins
751440388a Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix 
Bug fix for deadlock between EntitySimulation and EntityItem locks.
 2017-08-23 20:50:41 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Zach Fox
52ef0f2037 More progress 2017-08-23 16:37:13 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
Brad Hefta-Gaub
afce8b547a Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda 
Rig: Use a registry to prevent use after free crashes/corruption
 2017-08-23 15:09:28 -07:00
Zach Fox
88c24c16d7 I finally understand - initial progress 2017-08-23 15:02:07 -07:00
Zach Fox
69364f2ecd Initial progress 2017-08-22 17:10:57 -07:00
Zach Fox
edb64b047f It compiles! 2017-08-22 16:00:44 -07:00
vladest
6f0229f450 Reworked according to designers request. Do not fall back to default audion output 2017-08-22 23:26:27 +02:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
Stephen Birarda
9dfc74de57 always write rank ID to variant when present 2017-08-22 11:24:32 -07:00
Anthony J. Thibault
cd6d2173cc Bug fix for follow rotation of CharacterController 2017-08-21 18:09:58 -07:00
Anthony J. Thibault
8e56404c40 Fixes for flying and rotation re-centering in wikiplanet 2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00
Anthony J. Thibault
80b660b258 Added userHeight accessors and preference 
Also made Avatar::getHeight thread-safe
 2017-08-21 17:42:23 -07:00
Anthony J. Thibault
d196743986 Added Avatar::getHeight() method 2017-08-21 17:42:22 -07:00
Stephen Birarda
1eb7fb5b3d always write rank ID to variant when present 2017-08-21 17:15:44 -07:00
Anthony J. Thibault
da20eac995 Bug fix for deadlock between EntitySimulation and EntityItem locks. 
This is a classic deadlock between the main thread and the OctreeProcessor network thread.
On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken.
On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken.

To work around this issue the network thread no longer takes the EntitySimulation lock when calling
PhysicalEntitySimulation::addDynamic().  Instead, a fine grained lock around the EntitySimulation's dynamic lists
is used instead.
 2017-08-21 17:14:49 -07:00
Chris Collins
72bb52c7ed Merge pull request #11046 from rickdaniels/21448 
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
 2017-08-21 15:32:22 -07:00
Ryan Huffman
b862336d17 Add PathUtils::generateTemporaryDir() 2017-08-21 13:40:51 -07:00
Ryan Huffman
8e73eae341 Update nvtt to only use a single thread 2017-08-21 13:40:50 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Chris Collins
2456126bcc Merge pull request #11157 from SamGondelman/tabletLayer 
Render non-AA overlays correctly
 2017-08-18 14:59:20 -07:00
Andrew Meadows
aee35b751e replace 'unsigned long' with uint64_t 2017-08-18 14:35:48 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Andrew Meadows
0de109e2e8 cleanup and fix typos 2017-08-18 11:29:47 -07:00
Elisa Lupin-Jimenez
762f1a9c5c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-18 10:49:51 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Sam Gateau
5ac65e8f35 Merge pull request #11184 from Zvork/fadeinvertfix 
Fade edition bug fix
 2017-08-17 15:10:50 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Artur Gomes
4f5bfcbc2b Merge remote-tracking branch 'upstream/master' 2017-08-17 14:57:31 +01:00
Olivier Prat
7910b0d8ff Switched back to full float for outline depth buffer because of precision issues 2017-08-17 15:55:59 +02:00
Olivier Prat
2d598f3428 Improved outline visual width normalization that makes it independant from resolution. It is now a ratio of the screen height 2017-08-17 15:44:02 +02:00
Olivier Prat
68753211dc Fixed bug on Mac where the outline effect would stop working once the window was resized 2017-08-17 15:25:41 +02:00
Olivier Prat
1e4cf5d797 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-17 09:46:49 +02:00
SamGondelman
ee74f6404e put back FilterLayeredItems to make samcake happy 2017-08-16 16:08:38 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
Artur Gomes
8ef8e974b6 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:00:29 +01:00
Artur Gomes
482924266c Fix brush texture stretching at start. 
Add some code refactoring.
 2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d Add hue, saturation and brightness dynamic brushes. 
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
 2017-08-16 18:35:15 +01:00
Artur Gomes
678dd5fbae Do not test! 
Add missing information to property.
 2017-08-16 18:33:43 +01:00
Artur Gomes
03b70ed492 Do not test! 
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
 2017-08-16 18:32:17 +01:00
Artur Gomes
5c40a6810e Add drawing in Desktop mode. 
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
 2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be Add new Interface (more similar to the ui used on other apps) 
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
 2017-08-16 18:28:55 +01:00
Delanir
e70303c53e Add the following items to the libraries/networking/src/udt/PacketHeaders.h and cpp files. 
add new value to the PacketVersion enum
in the versionForPacketType function, return the new version number when
packetType is EntityAdd, EntityEdit or EntityData.
 2017-08-16 18:28:50 +01:00
Delanir
0a97cfd736 Change UVMode updateGeometry Function 2017-08-16 18:25:01 +01:00
Delanir
ed5515a2d4 Add new Property to polyline to enable different uv modes. 2 2017-08-16 18:25:00 +01:00
Brad Hefta-Gaub
714027d2e2 Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues 
Fix for incorrectly sized avatar capsule collision
 2017-08-16 09:58:39 -07:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
vladest
a87a93d991 Implemented input dialog async functions 2017-08-16 15:35:51 +02:00
vladest
8326600274 Merge branch 'master' into modal_dialogs_async 2017-08-16 13:48:47 +02:00
Olivier Prat
9691c957e4 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix 2017-08-16 09:41:49 +02:00
Anthony J. Thibault
aef19c6f97 Rig: Use a registry to prevent use after free crashes/corruption 
Create a global registry to hold all the currently active Rig instances.
Use this registry and it's mutex to prevent accessing the rig after it has already been destroyed,
or is in the process of being destroyed on the main thread.
 2017-08-15 18:28:51 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
Anthony J. Thibault
e9b8e5431d Fix for incorrectly scaled bounding volumes when switching avatars 
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().

This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
 2017-08-15 17:26:51 -07:00
Stephen Birarda
a59103aad5 truncate filename for relative path URL in RR 2017-08-15 15:38:47 -07:00
Stephen Birarda
100ac65975 store relative path URL in resource request on redirect 2017-08-15 15:27:44 -07:00
Stephen Birarda
96672becc6 read redirected path info in MappingRequest 2017-08-15 15:19:20 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Anthony J. Thibault
f46198c2fd Simplified/Improved avatar capsule calculation 
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
 2017-08-15 13:48:10 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision 
Improve avatar hand vs body collision
 2017-08-15 13:43:21 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Sam Gateau
d624413c14 Merge pull request #11189 from SamGondelman/line3DFix 
Fix drawInFront overlays only rendering in left eye
 2017-08-15 09:26:18 -07:00
vladest
9aace9e67d Merge branch 'master' into modal_dialogs_async 2017-08-15 14:57:13 +02:00
vladest
757af1e2e5 Added Save, Directory and Assets async methods 2017-08-15 14:44:01 +02:00
SamGondelman
194b7d6655 warning 2017-08-14 16:08:07 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Anthony Thibault
9af6f2683a Merge pull request #11083 from Menithal/experimental-face-expressions 
Opened up setForceFaceTrackerConnected
 2017-08-14 14:19:08 -07:00
Olivier Prat
c88082301e Small changes to respect coding rules 2017-08-14 22:43:39 +02:00
rick@ghostpunch.com
8d248f5ccd Remove the attempt to determine the maximum width of a PolyLineEntity's strokes 
using the _strokeWidths[] array, as the values don't seem to correspond with
reality. Use a flat 0.075M value for the maxium half of a stroke width instead.
 2017-08-14 15:59:21 -04:00
vladest
ac7aa609f2 Open file async implemented 2017-08-14 16:23:53 +02:00
Olivier Prat
358373aeac Base gradient size edition works again on Elements enter domain event 2017-08-14 11:41:01 +02:00
Olivier Prat
92d5a0c552 Fixed non working fade invert parameter 2017-08-14 11:21:47 +02:00
vladest
b604b1bbac Async file dialogs #1 2017-08-13 11:02:29 +02:00
vladest
63e907e7b6 Merge branch 'master' into modal_dialogs_async 2017-08-12 13:04:52 +02:00
Anthony J. Thibault
cd57c0706a more warning fixes 2017-08-11 17:46:50 -07:00
Anthony J. Thibault
f72a94e195 warning fixes 2017-08-11 17:28:50 -07:00
Anthony J. Thibault
b050d2c4c7 fix case on include for linux 2017-08-11 15:15:43 -07:00
Anthony J. Thibault
9e1218b4a4 Use k-dop collision to prevent hands from entering body. 2017-08-11 14:50:00 -07:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Olivier Prat
d86c3c4f2a Outline is now drawn with framebuffer with no depth buffer attached to prevent concurrent depth clear on NVidia GPU cards 2017-08-11 11:33:46 +02:00
Olivier Prat
d61652f958 Fixed compilation errors due to merge with master 2017-08-11 10:11:19 +02:00
Olivier Prat
1763ecd4c6 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-11 09:38:00 +02:00
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
e4c954e862 merge from master 2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68 properly fix AA stenciling 2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f working on fixing non-AA overlays 2017-08-10 16:07:40 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision 
Also added debug rendering functionality.
 2017-08-10 15:52:51 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Elisa Lupin-Jimenez
af95d7f892 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-10 10:13:27 -07:00
Ken Cooke
d0e7584f0f Merge pull request #11158 from kencooke/audio-input-dummy 
Support for running Interface without a microphone
 2017-08-10 06:47:04 -07:00
Olivier Prat
f88141aa31 Removed unused color formats in render::Format 2017-08-10 11:37:07 +02:00
Olivier Prat
a397138599 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-10 10:56:51 +02:00
Olivier Prat
b410f97aef Adjusted kernel size to real pixel blur width 2017-08-10 10:54:28 +02:00
vladest
b780d4bce3 Merge branch 'master' into modal_dialogs_async 2017-08-10 10:52:35 +02:00
vladest
68e9d335cd Added async information and critical dialogs 2017-08-10 10:46:06 +02:00
Olivier Prat
189cc8efd0 Outline width is now screen aspect ratio independent 2017-08-10 10:12:10 +02:00
Ken Cooke
ee752df653 fix typo 2017-08-09 20:11:52 -07:00
Ken Cooke
bcdf13c59c Add explicit shutdown request, since null device means something else 2017-08-09 19:40:07 -07:00
Ken Cooke
ee6d4dfc14 If real input device fails to start, use dummy input 2017-08-09 17:50:20 -07:00
Ken Cooke
fc5b4be459 bugfix 2017-08-09 16:59:02 -07:00
Ken Cooke
9c6b7306c4 Re-implement callback to Use common handleAudioInput() 2017-08-09 16:58:12 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
Ken Cooke
7daa3ecff3 Handle dummy input callbacks 2017-08-09 15:54:14 -07:00
Zach Fox
b8c45b0c30 Don't always do precision picking inside mouseMoveEvent 2017-08-09 14:23:43 -07:00
Ken Cooke
6f2cc9cfeb When no input device, create dummy input to generate callbacks 2017-08-09 14:01:17 -07:00
Elisa Lupin-Jimenez
17acf0520d Download from blocks in marketplace working 2017-08-09 11:08:14 -07:00
Olivier Prat
392a99f038 Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio 2017-08-09 19:18:16 +02:00
Olivier Prat
0f2c41b009 Added outline intensity 2017-08-09 18:27:39 +02:00
Olivier Prat
57dfe10baf Fixed blur problems on screen edges 2017-08-09 18:15:05 +02:00
Olivier Prat
01a028cbb6 First alpha working version of outline 2017-08-09 18:03:52 +02:00
Olivier Prat
f36500a74c Working outline debugging view 2017-08-09 14:52:52 +02:00
vladest
556569819d 1st stage of moving to async dialogs 2017-08-09 14:00:19 +02:00
Olivier Prat
cfa23b1758 Writing out depth buffer of outlined objects to texture working 2017-08-09 12:32:32 +02:00
Olivier Prat
0fb4e42e1f Improved PickItemJob with item key filter 2017-08-09 11:52:31 +02:00
rick@ghostpunch.com
87139f5d82 Remove debug print 2017-08-09 04:46:42 -04:00
rick@ghostpunch.com
cc69853ff1 Make requested style changes to code. 2017-08-09 04:37:47 -04:00
rick@ghostpunch.com
a730da5299 Account for PloyLine stroke width when calculating the dimensions 
of the PolyLilne's bounding box.
 2017-08-09 04:23:39 -04:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Menithal
59151daecb Merge remote-tracking branch 'upstream/master' into 21484 2017-08-08 23:09:20 +03:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
Olivier Prat
44ee7c4bf1 Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete 2017-08-08 18:41:57 +02:00
Olivier Prat
27227d6bd2 Simplified pick item jobs by using inherited enabled flag in render::Job::Config 2017-08-08 17:45:17 +02:00
Olivier Prat
7de6079df8 Added PrepareOutline job to save outlined zbuffer 2017-08-08 15:28:36 +02:00
Gerard Maguire
6facc02125 Merge branch 'master' of https://github.com/highfidelity/hifi into 21466 2017-08-08 13:58:32 +01:00
Olivier Prat
add675e16c Create PickItemsJob than can be used to select a render item in front of the camera 2017-08-08 12:04:44 +02:00
Gerard Maguire
6f81dd53f2 Fixed avatar rotation upon teleportation using Pal 
Added "VisitUserFromPAL" to LookupTrigger enum
and bool "shouldMatchOrientation" to goToUser()
 2017-08-08 05:08:20 +01:00
rick@ghostpunch.com
c94d9b3810 Merge remote-tracking branch 'upstream/master' into 21448 2017-08-07 19:23:57 -04:00
Menithal
34d9e9b371 Preliminary Research Complete 
Found the part that needs updating with the AnimationProperty
 2017-08-08 00:03:24 +03:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support 
Improved support for Vive Trackers on biceps
 2017-08-07 13:11:48 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag 
Zip drag (needs review)
 2017-08-07 03:17:31 -07:00
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
Seth Alves
83a30e2f35 missed some statics 2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d avoid calling a pure virtual function from GLBackend dtor 2017-08-06 12:47:45 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Elisa Lupin-Jimenez
af432087e3 small revisions to bracketing/variable name 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Brad Davis
0e508432c4 PR comments 2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects 
Added Vive pucks as an input channel and added new puck-attach script
 2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
Chris Collins
ddb7d0f1ba Merge pull request #11112 from kencooke/audio-gate-bugfix 
Possible fix for "screeching noise" after audio input device changes
 2017-08-03 13:55:47 -07:00
vladest
a439cc1837 Make connection to tablet shown signal more consistent, eliminates missed signals 2017-08-03 20:58:44 +02:00
vladest
b049b0f415 Merge conflicts 2017-08-03 19:43:42 +02:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389 
WL21389 PR1:  Representation of collision shapes need updating (details below).
 2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
Elisa Lupin-Jimenez
310a0eeecc Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-02 12:24:14 -07:00
vladest
638eeede43 Merge conflict 2017-08-02 20:07:06 +02:00
Seth Alves
728e7fb253 Merge pull request #11099 from druiz17/bug-blank-tablet-switch 
fix blank tablet when switching between HMD and Desktop mode quickly
 2017-08-02 10:09:56 -07:00
Seth Alves
2319006868 Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash 
Fix for crash when attempting to teleport while avatar was loading
 2017-08-02 10:00:13 -07:00
Dante Ruiz
8d69cd8999 Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch 2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01 better solution to help and blank tablet issues 2017-08-02 16:35:58 +01:00
Elisa Lupin-Jimenez
eb1fb1a1e1 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-02 08:28:55 -07:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4 Merge pull request #11097 from druiz17/bug-entity-crash2 
Lock the script engine in EntityEditPacketSender
 2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Dante Ruiz
cca29e849b fix issue of tablet begin blank when switching between HMD and Desktop mode 2017-08-01 23:18:42 +01:00
Anthony J. Thibault
25b5cb4762 Switch order of precondition and setSecondaryTargets 2017-08-01 13:17:33 -07:00
Dante Ruiz
c22e08f3e8 loacked script engine in EntityEditPacketSender 2017-08-01 19:58:23 +01:00
anshuman64
97b4fd4032 Merge pull request #11071 from vladest/fix_menu_landscape 
Fix Landscape mode, when menu pushed in Create mode
 2017-08-01 11:29:15 -07:00
Olivier Prat
7322fdeb79 Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-08-01 14:46:03 +02:00
LaShonda Hopper
0b79809f54 [WL21389] PR1 Feedback: Small change missed last commit (details below). 
Until they're properly implemented, default the hedrons and polygons to
SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo.

Changes committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
 2017-07-31 17:08:30 -04:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Olivier Prat
e85bb6fd08 Fixed compilation warnings on Mac 2017-07-31 19:19:00 +02:00
Elisa Lupin-Jimenez
b2161e433c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-31 09:54:21 -07:00
Chris Collins
5bdaa4daa1 Merge pull request #11087 from jherico/crash_null_entity_element 
Fix potential nullptr access in EntityTreeElement
 2017-07-31 09:15:52 -07:00
Olivier Prat
5f1d45d4de Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines" 
This reverts commit 8a2fd01e81.
 2017-07-31 18:06:51 +02:00
vladest
e30e0b1a5f Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption 2017-07-31 16:45:21 +02:00
Olivier Prat
8a2fd01e81 Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines 2017-07-31 15:31:37 +02:00
Olivier Prat
1336582c6b Removed fade transition on model entities. 2017-07-31 15:06:24 +02:00
Olivier Prat
e7282c67e6 Removed fade transition on poly voxel entities. 2017-07-31 13:02:42 +02:00
Olivier Prat
027c82c341 Removed fade transition on polyline entities. 2017-07-31 12:44:23 +02:00
Olivier Prat
0415364c0e Removed fade transition on shape entities. Fixed broken custom shaders on shapes 2017-07-31 12:29:11 +02:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-30 16:15:34 -04:00