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

75916 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
e14869ac71 Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid 2019-02-05 14:10:27 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector 
Case 20879: Migrate  webEngine referencing  QML into +webengine folder
 2019-02-05 12:57:38 -08:00
Ken Cooke
cfaa841746 Add output silence-detection to the noise gate processing 2019-02-05 12:34:42 -08:00
Sam Gateau
59d53bd716 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-05 12:20:39 -08:00
Roxanne Skelly
d3bc536b58 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-05 11:35:28 -08:00
raveenajain
253e3554af feedback 2019-02-05 10:18:34 -08:00
Andrew Meadows
cbd83f972c remove unsued variable 2019-02-05 10:17:10 -08:00
raveenajain
21fa1878cb spaces 2019-02-05 09:28:47 -08:00
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -08:00
raveenajain
d109c0fb1b feedback changes 2019-02-05 09:23:10 -08:00
Brad Hefta-Gaub
936837c886
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master 
[master] Fix reload mechanic for entity server scripts
 2019-02-05 09:19:56 -08:00
NissimHadar
cc3a74b7a0 Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid 2019-02-05 09:01:46 -08:00
Andrew Meadows
e50892b3d2 MyAvatar is unmovable until physics is enabled 2019-02-05 09:00:48 -08:00
Andrew Meadows
5a4960b300 add crash::doAssert() for debug purposes 2019-02-05 09:00:48 -08:00
Sam Gateau
4089f8c5b0 Adding Color filter to the tone mapper 2019-02-04 23:45:35 -08:00
Sam Gateau
99251bdd6d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-04 19:16:14 -08:00
Roxanne Skelly
364a1698fe QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions 2019-02-04 17:24:30 -08:00
Jamil Akram
35c0af0bf3
Merge pull request #14818 from wayne-chen/oculusLoginFeature 
MS20925: Oculus login button not appearing
 2019-02-04 17:20:07 -08:00
raveenajain
9fe42a0549 Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded 2019-02-04 16:49:23 -08:00
Roxanne Skelly
db9b44a71a QmlMarketplace - The QML Text object has sufficient markup to handle 
all of our needs, so use that instead of webengineview
 2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
John Conklin II
46fc19e101
Merge pull request #14840 from danteruiz/tablet-root-color 
Case 20973: Fix SendAsset.qml has wrong color
 2019-02-04 14:27:19 -08:00
Roxanne Skelly
1840f874ab Add Attributions to Qml Marketplace 2019-02-04 13:29:06 -08:00
Jamil Akram
bab411e001
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again 
Make Animation Unit Tests Pass Again
 2019-02-04 12:45:12 -08:00
Andrew Meadows
1d7265f668 trust the data in the packet, Luke 2019-02-04 09:45:06 -08:00
Sam Gateau
d0a044120a Adding the sub samples control 2019-02-03 21:31:19 -08:00
Sam Gateau
b970c31c5c Correct gamma in oculus, yeah! 2019-02-01 17:14:13 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
raveenajain
d1d8832e7a read in embedded data 2019-02-01 11:27:43 -08:00
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Sam Gateau
8671e7c499 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-01-31 17:11:35 -08:00
Sam Gateau
84db9f4729 testing the water... 2019-01-31 16:18:47 -08:00
Simon Walton
322030fccd Remove unused variable; fix use of qCDebug 2019-01-31 16:07:26 -08:00
Simon Walton
e4ffc93bc2 Revert a cherry-picked workaround accidently committed 
This reverts commit 08b21109c1.
Stupid git - I never explicitly added this to the branch!
 2019-01-31 15:19:05 -08:00
sabrina-shanman
3d1edf4d9e Make small code improvements to PrepareJointsTask 2019-01-31 15:00:50 -08:00
Simon Walton
d0fb09a3bd Assign lowest available suffix when display-names collide 2019-01-31 14:58:58 -08:00
raveenajain
f73296182c Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded 2019-01-31 14:19:58 -08:00
Jeff Clinton
1239ca086d
Merge pull request #14831 from danteruiz/the-spot 
Case 20942: Goto the spot on first launch (80.0/master)
 2019-01-31 14:15:24 -08:00
raveenajain
997660d430 review changes 2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update 2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9 embedded model geometry 2019-01-31 13:36:53 -08:00
Thijs Wenker
80f5cbc8ab also ignore picking on the material entity 2019-01-31 22:14:15 +01:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
Thijs Wenker
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +01:00
luiscuenca
5438bddc84 Fix assertion on shapeInfo when creating multisphere with empty data 2019-01-31 09:43:30 -07:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
SamGondelman
5553752d81 fall when flying not allowed 2019-01-30 18:04:44 -08:00