Brad Hefta-Gaub
|
7a3835eb33
|
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
|
2018-01-05 13:34:03 -08:00 |
|
Brad Hefta-Gaub
|
6a3609093d
|
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
|
2018-01-05 13:33:29 -08:00 |
|
Seth Alves
|
487dab641f
|
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
more stable simulation ownership
|
2018-01-05 12:27:52 -08:00 |
|
Sam Gateau
|
91eb718074
|
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
|
2018-01-05 12:26:56 -08:00 |
|
David Back
|
ac1c398b9d
|
Merge pull request #11669 from dback2/mergeAccountGlobalServices
merge AccountScriptingInterface into GlobalServicesScriptingInterface
|
2018-01-05 11:34:53 -08:00 |
|
David Back
|
76f278f899
|
Merge branch 'master' into mergeAccountGlobalServices
|
2018-01-05 10:56:12 -08:00 |
|
David Back
|
b165eac6a0
|
Merge branch 'master' into mergeAccountGlobalServices
|
2018-01-05 10:54:59 -08:00 |
|
Melissa Brown
|
933720fb10
|
Merge pull request #12012 from Delanir/Case10633
Cases 10632 and 10633 Particle Explorer UI
|
2018-01-05 10:46:41 -08:00 |
|
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 |
|
Sam Gondelman
|
5cf25a20c9
|
use correct model ptr
|
2018-01-04 21:21:58 -08:00 |
|
David Rowe
|
d6a0457ee5
|
Delete web3d overlay "resolution" property JSDoc
|
2018-01-05 16:48:37 +13:00 |
|
SamGondelman
|
a9d5dda976
|
always push default haze to current frame
|
2018-01-04 17:54:23 -08:00 |
|
David Back
|
7558b00467
|
better fix for model scale floor, remove abs
|
2018-01-04 17:49:39 -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 |
|
David Back
|
307867a91f
|
adjust to for loop
|
2018-01-04 16:53:35 -08:00 |
|
David Back
|
6b9658f8cf
|
merge
|
2018-01-04 16:41:58 -08:00 |
|
Andrew Meadows
|
01fd6dc8f6
|
add comments to make code more clear
|
2018-01-04 15:53:03 -08:00 |
|
Andrew Meadows
|
a51d83c6e4
|
rollback automatic priority promotion to RECRUIT
|
2018-01-04 15:53:03 -08:00 |
|
Andrew Meadows
|
6638b1deae
|
fix bug causing sim ownership thrash
|
2018-01-04 15:53:03 -08:00 |
|
Andrew Meadows
|
7e01f97f8f
|
more correct volunteer ownership priority promotion
|
2018-01-04 15:53:03 -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 |
|
SamGondelman
|
eb0d09360a
|
Merge remote-tracking branch 'upstream/master' into overlayFix
|
2018-01-04 15:47:20 -08:00 |
|
David Back
|
ac8b8da7b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-04 15:30:57 -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 |
|
David Back
|
81f3590954
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-04 13:17:07 -08:00 |
|
Atlante45
|
294a7ca3c6
|
Make sure the protocol signature still changes
|
2018-01-04 13:15:01 -08:00 |
|
SamGondelman
|
6a19b0e0b6
|
update render items on texture load
|
2018-01-04 13:10:46 -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 |
|
David Back
|
6c8987d75f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-03 14:44:52 -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 |
|