Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75645 commits 25 branches 0 tags 1.1 GiB
Commit graph

75645 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
70053d3bba
Merge pull request #14664 from NissimHadar/20526-updateReadme 
Case 20526 - update readme
 2019-01-25 09:15:42 -08:00
Andrew Meadows
c9ef439a7f fix more grab bugs 2019-01-25 08:46:24 -08:00
David Kelly
05d56a5fe9 Transmit octree string parameters as utf-8 strings 2019-01-25 08:43:56 -07:00
Thijs Wenker
e2dc86261e add missing Material Entity tooltips 2019-01-25 05:16:04 +01:00
Thijs Wenker
992ce9f875 ignore scripted key events from the JSON Editors 2019-01-25 04:41:36 +01:00
Thijs Wenker
85e26e949b fix issue where empty values are always on bottom on default ascending columns 2019-01-25 04:02:19 +01:00
Thijs Wenker
ae2e85d802 entity list, default column sort orders, when in default order always move empty values to bottom 2019-01-25 03:22:27 +01:00
Dante Ruiz
2c22fb82b1 keep log window on top option 2019-01-24 18:16:07 -08:00
NissimHadar
e77e2b9583 Merge mess... 2019-01-24 16:35:13 -08:00
NissimHadar
e39012de6e Merge mess... 2019-01-24 16:32:30 -08:00
NissimHadar
c2ee8f7795 Merge mess... 2019-01-24 16:30:21 -08:00
NissimHadar
684172bf6b Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller 2019-01-24 16:23:08 -08:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix 
Shape type and compound shape property fixes
 2019-01-24 16:18:34 -08:00
NissimHadar
61a3bb667d Fixed gcc warnings. 2019-01-24 16:16:24 -08:00
Clement
95714b7eb3 Add failed backup as corrupted during creation 2019-01-24 16:11:38 -08:00
Wayne Chen
4880c7081e adding blurred images 2019-01-24 16:00:24 -08:00
Wayne Chen
5c55761e4d adding fill mode for aspect/crop 2019-01-24 15:57:04 -08:00
Wayne Chen
9da7465698 readding render session, adding newlines for oculus failure 2019-01-24 15:33:50 -08:00
SamGondelman
24b62ca87c Merge remote-tracking branch 'upstream/master' into NOverlays10 2019-01-24 15:00:37 -08:00
Andrew Meadows
09fe9735fa plug grab leak, more correct names 2019-01-24 14:57:54 -08:00
NissimHadar
6de5527f20 Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller 2019-01-24 14:46:29 -08:00
sabrina-shanman
5993aab174 Fix linker error and build warnings 2019-01-24 14:43:43 -08:00
Andrew Meadows
ee3fde9df1 unravel spaghetti, prefer std over Qt containers 2019-01-24 14:39:00 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00
Anthony Thibault
77fb20801f Bug fixes for avatarData protocol 
Two issues were recently discovered after they were introduced by PR #14733

1) The Avatar Mixer would sometimes have incorrect translation scale when splitting BulkAvatarData across multiple MTUs
2) Old avatar recordings would no longer work properly.

This PR should fix both of these issues.
 2019-01-24 14:24:11 -08:00
Gabriel Calero
4a345a5559 Change default avatar name to Wooden Mannequin 2019-01-24 18:53:15 -03:00
sabrina-shanman
64ef8b6919 Do not pass in whole hfm::Model by reference to tangent calculation prep steps 2019-01-24 13:03:51 -08:00
sabrina-shanman
fe60b8e69b Remove now redundant tangent generation code 2019-01-24 13:03:51 -08:00
sabrina-shanman
9bb7e4dced Create normal/tangent calculation tasks for meshes/blendshapes 2019-01-24 13:03:44 -08:00
Brad Davis
4b805105c7 Fix hash 2019-01-24 13:00:19 -08:00
Brad Davis
219c159a25 Switch to nvtt with no openmp dependency 2019-01-24 12:44:05 -08:00
NissimHadar
f949b9d5b4 Initial tab set (back) to 0. 2019-01-24 12:16:12 -08:00
NissimHadar
817d132604 renamed ...Button... to ...pushButton... for consistency. 2019-01-24 12:13:35 -08:00
NissimHadar
64843b5ed2 Added "Download APK" push-button. 2019-01-24 12:01:00 -08:00
Gabriel Calero
68feea23cb Add the wooden mannequin as an eligible avatar 2019-01-24 16:21:38 -03:00
NissimHadar
e87d5abbd7 Merge branch 'master' of github.com:highfidelity/hifi into 20778-pullFolderFromAndroid 2019-01-24 08:55:30 -08:00
Andrew Meadows
aff1244e09 make method protected because we can 2019-01-23 23:19:48 -08:00
Andrew Meadows
b73187aed9 fix typo in comment 2019-01-23 23:19:33 -08:00
Andrew Meadows
fd457a9c0e remove cruft and fix a resource leak 2019-01-23 23:19:20 -08:00
Andrew Meadows
160bef8f23 cleanup and minor optimizations 2019-01-23 23:18:52 -08:00
Andrew Meadows
d948168727 computeMotionType() returns KINEMATIC for things with grab 2019-01-23 21:30:15 -08:00
Andrew Meadows
965d0ccf60 reduced priority for AvatarEntities 2019-01-23 21:29:49 -08:00
Andrew Meadows
de68f6ca49 use Hold action 
use Hold action for any non-dynamic Entity with Body in phys simulation
also set DIRTY_MOTION_TYPE bit, add to changed list on add/remove grab
 2019-01-23 21:26:57 -08:00
Andrew Meadows
1bdcf8f0cb MyAvatar bids for ownerhsip on grab 2019-01-23 21:26:10 -08:00
Simon Walton
cc6caa61a7
Change common warning to debug 2019-01-23 21:02:52 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
Simon Walton
74748b15fd Add a filter functor to the plugin manager and use it in AudioMixer 2019-01-23 17:28:18 -08:00
luiscuenca
7a0f3ea7ef Fix error 2019-01-23 18:04:13 -07:00
luiscuenca
a947c894c2 Suggested changes 2019-01-23 17:23:36 -07:00