Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:36:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75549 commits 76 branches 59 tags 1.2 GiB
Commit graph

75549 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
0c6d3be037 Can detect device. 2019-01-23 14:05:32 -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
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
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
Shannon Romano
6cb8cf0202
Merge pull request #14750 from NissimHadar/fixAndroidBuild 
Gabriel Calero's fix (79.0/master)
 2019-01-21 17:40:58 -08:00
SamGondelman
49947d9f6d better default values 2019-01-21 16:51:08 -08:00
NissimHadar
4edd072b3b Removed whitespace 2019-01-21 16:49:54 -08:00
raveenajain
2393db5e12 collision logic 2019-01-21 16:24:32 -08:00
Roxanne Skelly
8010d86210 QML Marketplace support 
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
 2019-01-21 13:39:16 -08:00
NissimHadar
084d55a414 Gabriel Calero's fix. 2019-01-21 13:26:44 -08:00
raveenajain
3f2aa56187 feedback changes 2019-01-21 13:24:07 -08:00
NissimHadar
a693e0b6f9 Gabriel Calero's fix. 2019-01-21 13:08:37 -08:00
NissimHadar
fb09856c11 Gabriel Calero's fix. 2019-01-21 12:56:13 -08:00
SamGondelman
5b1ea24d20 glsl initializer lists are 4.2 2019-01-21 12:35:48 -08:00
Simon Walton
c3a8c71f60 Add TabletMenu to list of pages that trigger the QmlCommerce bridge 2019-01-21 12:27:14 -08:00
Shannon Romano
c9e53e067d
Merge pull request #14652 from jherico/feature/quest_move_interface 
Migrate android build location to accommodate Quest builds
 2019-01-21 11:09:51 -08:00
NissimHadar
c199654ded Gabriel Calero's hint. 2019-01-21 10:32:33 -08:00
NissimHadar
56fa467b63 Testing. 2019-01-21 10:26:19 -08:00
NissimHadar
16ef503930 Gabriel Calero's hint. 2019-01-21 09:51:06 -08:00
Wayne Chen
4d61a65bbf
wrapping request nonce and userID with conditional 2019-01-21 09:48:12 -08:00
NissimHadar
c035de63e8 Updated. 2019-01-21 09:29:04 -08:00
NissimHadar
6777748230 Updated. 2019-01-21 09:15:09 -08:00
NissimHadar
c891226161 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-21 08:41:45 -08:00