Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 14:23:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75610 commits 69 branches 56 tags 1.2 GiB
Commit graph

75610 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony Thibault
96f55d2571 Merge branch 'feature/hmd-avatar-alignment-type' of github.com:hyperlogic/hifi into feature/hmd-avatar-alignment-type 2019-01-23 15:53:28 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Sam Gateau
3ec9290dca
Merge pull request #14619 from SamGondelman/matTarget 
Case 20240: Better material entity targeting
 2019-01-23 15:47:22 -08:00
Jeff Clinton
49fa2dc75d
Merge pull request #14715 from ctrlaltdavid/M20052 
Case 20052: Fix tablet sometimes not working after domain change
 2019-01-23 15:29:20 -08:00
Dante Ruiz
df34d8dcc0 fix spinbox and adjusting OpenVrConfiguration spin boxes 2019-01-23 14:59:37 -08:00
Wayne Chen
512805d48f removing leftover variable 2019-01-23 14:45:41 -08:00
Adam Smith
04f33956e7
Merge pull request #14728 from SamGondelman/crash 
Case 20411: Fix crash on subsequent entitlements checks
 2019-01-23 14:42:00 -08:00
Wayne Chen
4cf90050b5 reverting old code 2019-01-23 14:39:58 -08:00
Wayne Chen
049282e2b3 fixing text alignment issues, adding some oculus user log 2019-01-23 14:38:06 -08:00
NissimHadar
12b8442e71 Can pull folder on Windows. 2019-01-23 14:32:47 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision 
Avatar Protocol: Fix for precision issues with translation
 2019-01-23 14:07:58 -08:00
NissimHadar
0c6d3be037 Can detect device. 2019-01-23 14:05:32 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Jeff Clinton
b9f9766b01
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd 
Fix security-image display in HMD
 2019-01-23 13:18:45 -08:00
Jeff Clinton
5fa033473e
Merge pull request #14760 from SimonWalton-HiFi/qmlcommerce-singleton 
Treat QmlCommerce as a singleton class
 2019-01-23 13:07:17 -08:00
NissimHadar
d4fac770ff Renamed local variable per coding standard. 2019-01-23 10:42:38 -08:00
NissimHadar
c25e493f20 Factored out Worker class. 2019-01-23 10:33:02 -08:00
Thijs Wenker
b2f1657096 grid pattern 2019-01-23 19:28:34 +01:00
Wayne Chen
e6426cb680
fixing bug with cancel button 2019-01-23 10:26:51 -08:00
NissimHadar
b7a0fae00e Added common class to simplify code. 2019-01-23 09:15:27 -08:00
NissimHadar
089c71b047 Read device button enabled after setting working folder. 2019-01-23 08:49:42 -08:00
David Back
89032698eb newline 2019-01-22 18:24:09 -08:00