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

76069 commits

This branch
This branch
All branches
Author SHA1 Message Date
amerhifi
944f4c96ae
New build file for Quest 
new build file specific to the quest device
 2019-02-05 11:14:52 -08:00
Simon Walton
e62f67a847 Don't remove unselected component in Win installer 2019-02-05 10:31:59 -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
SamGondelman
934abb3d52 fix keyboard focus and image overlays 2019-02-04 13:33:03 -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
SamGondelman
31cf623252 fix keyboard focus 2019-02-04 12:44:04 -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
SamGondelman
4b406bf41c fix getEntityObject and tablet highlighting (Overlays.findOverlays) 2019-02-01 16:23:06 -08:00
SamGondelman
391cca787f fix keyboard textures and text display 2019-02-01 15:33:53 -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
SamGondelman
c6080d0795 fix edit selection + log problem 2019-02-01 14:37:42 -08:00
SamGondelman
ba8320f561 fix 2d overlay deletion 2019-02-01 14:31:26 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
SamGondelman
50bfe84aa7 fix keyboard intersection, laser alpha 2019-02-01 12:11:00 -08:00
amer cerkic
7a4401276c moving qt shutdown and resetting qtactivity to onstop 2019-02-01 11:38:34 -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
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -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