Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 08:33:12 +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
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
David Back
ea5705907b fix shape type and compound shape URL properties/tooltips 2019-01-22 18:22:13 -08:00
Simon Walton
77293150b7 Const declarations to enforce singleton capability 2019-01-22 18:05:47 -08:00
NissimHadar
0728794e38 Can select temporary folder. 2019-01-22 17:14:48 -08:00
Simon Walton
3a5d550fa5 Treat QmlCommerce as a singleton class 2019-01-22 17:13:36 -08:00
David Back
a9895a90e5 add rules for unity version and bone count limit 2019-01-22 17:03:09 -08:00
Clement
61be5a3cc4 Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
David Back
08344d5510 add bone rule errors/warnings, add versioning 2019-01-22 16:28:52 -08:00
NissimHadar
5cffdafd22 Adding buttons to Run on Mobile tab. 2019-01-22 15:49:34 -08:00
NissimHadar
28c9b7e1e6 Updated README to include ADB installation. 2019-01-22 15:48:45 -08:00
NissimHadar
9e3220737c Merge error. 2019-01-22 14:14:27 -08:00
NissimHadar
a51e446b77 Added TestRunnerMobile. 2019-01-22 14:08:31 -08:00
NissimHadar
7800a0bddc Renamed TestRunner class to TestRunnerDesktop. 2019-01-22 13:37:45 -08:00
NissimHadar
4099fe333b Added tab for Mobile testing. 2019-01-22 13:26:46 -08:00
NissimHadar
a734135462 Update version to 2.0.0 2019-01-22 13:20:07 -08:00
Gabriel Calero
618b27c952 Add missing json 2019-01-22 18:04:54 -03:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats 
cases 20709 and 20715: wear and see mexico hats
 2019-01-22 12:58:56 -08:00
NissimHadar
44265b61d6 Merge branch '20550-installOnMac' of github.com:NissimHadar/hifi into 20550-installOnMac 2019-01-22 12:53:50 -08:00
John Conklin II
4050e4d998
Merge pull request #14740 from AndrewMeadows/fix-case-20731 
Case 20731: send updates when grabbing AvatarEntities
 2019-01-22 12:33:25 -08:00
Sam Gateau
8a1bec420e
Merge pull request #14748 from SamGondelman/procedural 
Case 20774: Possible fix for procedurals on mac
 2019-01-22 11:45:30 -08:00
Gabriel Calero
fd185f2fb7 Merge branch 'display_name_and_avatar' of https://github.com/gcalero/hifi into display_name_and_avatar 2019-01-22 16:19:19 -03:00
Gabriel Calero
455d27aeb3 Fix merge 2019-01-22 16:18:00 -03:00
Wayne Chen
1ae2ddd926 dont setup another oculus session 2019-01-22 11:08:15 -08:00
raveenajain
d3e0998a7f update with master 
Merge branch 'master' of https://github.com/highfidelity/hifi into collideWithOtherAvatars_scale
 2019-01-22 10:55:26 -08:00
Anthony Thibault
5146f3dfae Bug fix for avatars that have mesh/joint name duplicates 
This change has two parts.  First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
 2019-01-22 10:47:01 -08:00
Brad Davis
6fb869126e GPU state cleanup 2019-01-22 10:37:08 -08:00
Gabriel Calero
f67d98f296 Merge remote-tracking branch 'upstream/master' into display_name_and_avatar 2019-01-22 14:17:52 -03:00
Gabriel Calero
7c067ba0cf Merge remote-tracking branch 'upstream/master' into display_name_and_avatar 2019-01-22 12:23:42 -03:00
Gabriel Calero
6c431996c7 Allow to set a display name and choose an avatar 2019-01-22 12:21:06 -03:00