Cain Kilgore
47038e4349
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-07 08:31:36 +00: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
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
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
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
RebeccaStankus
89138c9bd8
More filter choices, search will clear
2018-01-03 11:35:46 -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
RebeccaStankus
fe69498976
initial changes...ready for feedback
2018-01-02 13:04:52 -08:00
RebeccaStankus
0117750757
PR for Feedback
2018-01-02 12:28:31 -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
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
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
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back
...
Merge stable back into master after RC61.1
2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
RebeccaStankus
720f186bd7
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 13:47:42 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
...
Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-22 09:56:22 -08:00
RebeccaStankus
1d4dedc1a1
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 07:52:31 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
...
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-21 17:46:32 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
Andrew Meadows
c1906215ba
add comments
2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a
restore signals on LOD change
2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469
bump desktop min FPS from 20 to 30 msec
2017-12-20 17:41:08 -08:00
