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

62951 commits

This branch
This branch
All branches
Author SHA1 Message Date
RebeccaStankus
3e8063f80a Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 12:48:09 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 10:49:32 -08:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Ryan Downe Karpf
c1b94693c5
Merge pull request #12061 from druiz17/fix-actions-not-being-deleted 
Fix deleted action not being sent over the network correctly
 2018-01-03 18:11:06 -08:00
Ryan Downe Karpf
5a589350fe
Merge pull request #12077 from ctrlaltdavid/remove-filed 
Remove erroneous "filed" Overlay property
 2018-01-03 18:10:37 -08:00
Zach Fox
eafb198fd7
Merge pull request #12084 from zfox23/commerce_fixSecurityPicChange 
Fix Security Pic Change dialog after QML security changes
 2018-01-03 13:17:55 -08:00
RebeccaStankus
9471dbeba9 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 11:39:38 -08:00
RebeccaStankus
89138c9bd8 More filter choices, search will clear 2018-01-03 11:35:46 -08:00
Zach Fox
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Sam Gateau
72503ce8ba
Merge pull request #12064 from SamGondelman/overlayFix 
Fix model overlays not disappearing on visibility change
 2018-01-03 11:08:24 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore 
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
 2018-01-03 09:34:14 -08:00
RebeccaStankus
9edb85efdc Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 09:25:38 -08:00
Zach Fox
33ae0948bb
Merge pull request #12080 from zfox23/commerce_myPurchasesLink 
Add a link to My Purchases from Wallet Home
 2018-01-02 17:33:02 -08:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
RebeccaStankus
a8435070f5 Merge branch 'log-filtering' of https://github.com/RebeccaStankus/hifi into log-filtering 2018-01-02 15:33:09 -08:00
RebeccaStankus
cf13b0d249 removed landscaping app 2018-01-02 15:33:04 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
Zach Fox
d0a3c299c9
Merge pull request #12076 from zfox23/commerce_fixMarketplacesInjectForLocal 
Fix marketplacesInject.js for local Metaverse
 2018-01-02 15:03:36 -08:00
RebeccaStankus
5f926d986a
Delete Utils.jsc 2018-01-02 14:48:41 -08:00
RebeccaStankus
dd48972e44 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc forgot to add hifi.entities to filter selections 2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5 better dropdown 2018-01-02 13:56:49 -08:00
David Rowe
7013f64714 Remove erroneous "filed" Overlay property 2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc more filter options 2018-01-02 13:28:39 -08:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable 
Stable merge back into master
 2018-01-02 13:24:03 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
RebeccaStankus
fe69498976 initial changes...ready for feedback 2018-01-02 13:04:52 -08:00
vladest
a84e585679 Merge 2018-01-02 21:49:00 +01:00
RebeccaStankus
0117750757 PR for Feedback 2018-01-02 12:28:31 -08:00
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api 
Google Poly API
 2018-01-02 10:28:17 -08:00
RebeccaStankus
94d19d5e79 Merge branch 'log-filter2' of https://github.com/RebeccaStankus/hifi into log-filter2 2018-01-02 09:02:22 -08:00
RebeccaStankus
efdba3b6e6 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2 2018-01-02 08:59:42 -08:00
RebeccaStankus
fe82d33b76 couple small changes 2018-01-01 15:29:49 -08:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9 Update Octree server stats to handle single server 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
RebeccaStankus
06def41764 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2 2017-12-29 10:03:29 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
vladest
afc3082593 Cleanup. Errors checks 2017-12-28 13:16:51 +01:00
vladest
35fee739c5 Use buttons index 2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez
84933131c4 changed api key variable name 2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez
a428eb5b75 added const to several parameters 2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez
01c1032540 fixed constant names, added another URL check 2017-12-27 10:51:58 -08:00
RebeccaStankus
296f0a323a saving for Wednesday 2017-12-26 15:56:05 -08:00
Elisa Lupin-Jimenez
03f06aadf4 keyword filters case insensitive now 2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez
e1b344e36d handles empty json object return 2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez
3e10d3b436 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-26 10:18:51 -08:00
vladest
ffcccacfa5 Selection consistency #2 2017-12-25 23:46:06 +01:00