Melissa Brown
|
eb83c68d46
|
Merge pull request #12094 from ctrlaltdavid/resolution-removed
Delete web3d overlay "resolution" property JSDoc
|
2018-01-05 10:38:07 -08:00 |
|
Seth Alves
|
2071d42d25
|
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
|
2018-01-05 10:07:36 -08:00 |
|
Andrew Meadows
|
c33c637f07
|
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
|
2018-01-05 09:07:54 -08:00 |
|
Ryan Downe Karpf
|
a3245aec57
|
Merge pull request #12079 from RebeccaStankus/log-filtering
Log filtering
|
2018-01-05 08:40:41 -08:00 |
|
Seth Alves
|
fd8b521c50
|
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
|
2018-01-05 08:15:48 -08:00 |
|
David Rowe
|
d6a0457ee5
|
Delete web3d overlay "resolution" property JSDoc
|
2018-01-05 16:48:37 +13:00 |
|
NissimHadar
|
43bc8bb948
|
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
defang accidental disable of MyAvatar's default motor
|
2018-01-04 17:44:22 -08:00 |
|
Seth Alves
|
9e8e15d620
|
Merge pull request #12074 from AndrewMeadows/simulation-ownership
fix bug preventing simulation ownership on localhost domain
|
2018-01-04 15:48:54 -08:00 |
|
Andrew Meadows
|
fbe2dd8a41
|
remove unnecessary 'virtual' keyword
|
2018-01-04 14:46:16 -08:00 |
|
Andrew Meadows
|
13538006ec
|
fix bug preventing sim owenrship on local domain
|
2018-01-04 14:46:16 -08:00 |
|
Stephen Birarda
|
22ced025cd
|
Merge pull request #12089 from Atlante45/fix/ice-servers
Add Unused packet type back for ICE servers
|
2018-01-04 15:15:27 -07:00 |
|
Atlante45
|
294a7ca3c6
|
Make sure the protocol signature still changes
|
2018-01-04 13:15:01 -08:00 |
|
Atlante45
|
d4a239731c
|
Add Unused packet type back for ICE servers
|
2018-01-04 13:07:02 -08:00 |
|
RebeccaStankus
|
9ba324b85f
|
"Clear Filter" button instead of "Show All"
|
2018-01-04 12:51:11 -08:00 |
|
RebeccaStankus
|
3e8063f80a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
|
2018-01-04 12:48:09 -08:00 |
|
Alexander Ivash
|
7ab7a46530
|
11008 GoTo app does not focus on address bar when opened
|
2018-01-04 23:38:10 +03: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 |
|