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

24117 commits

Author SHA1 Message Date
Seth Alves
9f2be4db8f Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 15:04:38 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
Seth Alves
e583d3d104
Merge pull request #26 from druiz17/serverless-domains 
Serverless domains
 2018-03-07 13:40:55 -08:00
Dante Ruiz
1a1e9cf628 adding simple json 2018-03-07 13:34:02 -08:00
Dante Ruiz
291c8674db removing files 2018-03-07 13:01:24 -08:00
Dante Ruiz
8382d842e1 changing to resources path 2018-03-07 12:51:26 -08:00
Seth Alves
8a08039efe Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 11:44:48 -08:00
Brad Hefta-Gaub
9595049e01
Merge pull request #12582 from thoys/fix/JSDOCtypo 
fix JSDOC typo rule -> role
 2018-03-07 07:50:07 -08:00
Thijs Wenker
866bec0b34 rule -> role 2018-03-07 02:36:07 +01:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
Seth Alves
79aa450332 some code-review induced changes 2018-03-06 13:11:09 -08:00
Alexander Ivash
53e1a0cae5 forward 'maybeEnableHmdPreview' if control is not visible 2018-03-06 22:25:35 +03:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -08:00
Seth Alves
a6c3bcd8d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-05 08:51:12 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
Seth Alves
606face7c0 gather together the url scheme constants, name them consistently 2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-02 19:27:53 -08:00
Seth Alves
7a61119d11 remove unneeded call to clearDomainOctreeDetails 2018-03-02 19:27:45 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Seth Alves
746769cbe9 don't crash 2018-03-02 13:52:18 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Dante Ruiz
7ce13a3ce7 adding comment 2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
Seth Alves
bdd926f89e cleanups 2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b fix placename in title-bar, fix domain-spawning-point 2018-03-02 09:54:54 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Seth Alves
9ee65ab474 don't use clipboard when loading serverless domains 2018-03-01 13:31:43 -08:00
Seth Alves
2d374583b4 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
Dante Ruiz
4b572eda6b changing Name 2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d adding stereo checkbox to audio settings 2018-03-01 11:03:18 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
9e5ed7b905 Add more timing stats in explanded mode 2018-02-28 10:48:35 -08:00
samcake
e290f2fc3c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-02-27 14:54:11 -08:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings 
Add content archives to domain server web interface
 2018-02-27 13:30:53 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
Howard Stearns
1fb0f898b4
Merge pull request #12505 from howard-stearns/wallet-help 
new wallet help
 2018-02-27 13:18:36 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
howard-stearns
30896c264b reduced text 2018-02-27 12:04:41 -08:00
howard-stearns
53b976b400 fix typo in bank href 2018-02-27 11:46:06 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00