Roxanne Skelly
|
4fc263ff24
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
|
2018-12-27 14:13:40 -08:00 |
|
howard-stearns
|
af65e59ba3
|
Recognize data: URLs in Web entities.
|
2018-12-27 14:34:59 -05:00 |
|
Roxanne Skelly
|
da70271acf
|
Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits
|
2018-12-26 13:46:08 -08:00 |
|
Roxanne Skelly
|
3a282045ff
|
Checkpoint trait-level flow control
|
2018-12-21 15:48:58 -08:00 |
|
Thijs Wenker
|
ea901aa179
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 14:11:57 +01:00 |
|
SamGondelman
|
bb030660bd
|
Merge remote-tracking branch 'upstream/master' into NOverlays4
|
2018-12-20 13:26:23 -08:00 |
|
Thijs Wenker
|
79a9c82168
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-20 18:56:33 +01:00 |
|
David Kelly
|
2c647462b1
|
ACs don't need to call into flagtimeForConnecitonStep
|
2018-12-20 10:15:44 -07:00 |
|
SamGondelman
|
05e0fb464e
|
new improved polylines
|
2018-12-19 15:01:49 -08:00 |
|
Sam Gondelman
|
e890fc6980
|
Merge branch 'master' into NOverlays3
|
2018-12-19 11:37:10 -08:00 |
|
Adam Smith
|
828672343a
|
Merge pull request #14523 from SamGondelman/NOverlays2
Case 20131: Cleanup some Entity Properties
|
2018-12-19 11:33:24 -08:00 |
|
Ryan Huffman
|
720cd90dc7
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-18 13:17:28 -08:00 |
|
Simon Walton
|
0d14e0bcf7
|
Set minimum timeout for retransmits
|
2018-12-17 14:07:21 -08:00 |
|
SamGondelman
|
6094a2f0a0
|
add back line entities, undo polyline changes temporarily
|
2018-12-14 15:41:11 -08:00 |
|
Ryan Huffman
|
78c4c2599e
|
Add start of marketplace uploading and project file list
|
2018-12-13 13:27:31 -08:00 |
|
SamGondelman
|
b261665072
|
working on lines
|
2018-12-12 09:39:01 -08:00 |
|
SamGondelman
|
250baa9c72
|
add missing properties to text entities
|
2018-12-11 15:42:24 -08:00 |
|
SamGondelman
|
fd8245e258
|
Merge remote-tracking branch 'upstream/master' into NOverlays6
|
2018-12-11 10:46:39 -08:00 |
|
Shannon Romano
|
a3c870ed90
|
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
(case 20037) Add robust MIME type detection for loading models in ModelCache
|
2018-12-11 18:41:55 +00:00 |
|
Sam Gondelman
|
d21d764131
|
Merge branch 'master' into NOverlays4
|
2018-12-06 12:48:05 -08:00 |
|
Sam Gondelman
|
2291c7e5fb
|
Merge branch 'master' into NOverlays3
|
2018-12-06 12:37:18 -08:00 |
|
Sam Gondelman
|
533e0e0326
|
Merge branch 'master' into NOverlays2
|
2018-12-06 12:29:38 -08:00 |
|
Sam Gondelman
|
b690faeb12
|
Merge branch 'master' into NOverlays
|
2018-12-06 11:29:06 -08:00 |
|
Sam Gondelman
|
c38a6966a9
|
Merge branch 'master' into NOverlays4
|
2018-12-06 11:25:43 -08:00 |
|
Sam Gondelman
|
a7c083e97a
|
Merge branch 'master' into NOverlays2
|
2018-12-06 11:24:27 -08:00 |
|
Sam Gondelman
|
d30dd4c26c
|
Merge branch 'master' into NOverlays3
|
2018-12-06 11:23:50 -08:00 |
|
Adam Smith
|
08d6e35d4d
|
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
|
2018-12-06 11:13:46 -08:00 |
|
SamGondelman
|
305cb6d323
|
grid entities
|
2018-12-03 18:04:34 -08:00 |
|
SamGondelman
|
3ce6f7f3d6
|
real image entities
|
2018-12-03 11:50:59 -08:00 |
|
SamGondelman
|
1fd8a21f8e
|
cleanup
|
2018-12-03 11:07:54 -08:00 |
|
sabrina-shanman
|
b809eed01f
|
Merge branch 'master' into hfm_mimetype
|
2018-11-28 15:06:04 -08:00 |
|
sabrina-shanman
|
2387641cbb
|
Store the MIME type in HTTPResourceRequest::onRequestFinished()
|
2018-11-26 16:09:41 -08:00 |
|
SamGondelman
|
e282d51883
|
CR
|
2018-11-26 01:15:07 -05:00 |
|
birarda
|
23857ea8c2
|
ensure packets are added to loss list after timeout
|
2018-11-19 17:40:55 -08:00 |
|
Dante Ruiz
|
f17723c216
|
disable interstitial for master
|
2018-11-14 14:50:38 -08:00 |
|
SamGondelman
|
079d1dcbd6
|
convert clientOnly to entityHost and add local entities
|
2018-11-14 11:25:37 -08:00 |
|
Jeff Clinton
|
6c90d7ed11
|
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
|
2018-11-13 14:59:50 -08:00 |
|
Brad Hefta-Gaub
|
bb2239c0bd
|
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
|
2018-11-13 13:19:30 -08:00 |
|
Brad Hefta-Gaub
|
6e2024350d
|
Merge pull request #14282 from gcalero/android_new_login
Change Android login flow (MS case 19470)
|
2018-11-13 12:02:10 -08:00 |
|
Howard Stearns
|
ad7266062d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 10:33:27 -08:00 |
|
John Conklin II
|
85e5c1d6ef
|
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
Send avatar-joint translations at world scale
|
2018-11-13 10:04:30 -08:00 |
|
Howard Stearns
|
545b85bc9d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 09:55:54 -08:00 |
|
Howard Stearns
|
fc62700587
|
Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging
|
2018-11-13 09:55:09 -08:00 |
|
Gabriel Calero
|
3d4893aba2
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-13 10:43:36 -03:00 |
|
John Conklin II
|
ec4f2f781d
|
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
|
2018-11-12 14:07:30 -08:00 |
|
Roxanne Skelly
|
762033580d
|
And remove another url log item.
|
2018-11-12 13:48:08 -08:00 |
|
Roxanne Skelly
|
7a14cb1bbc
|
Remove additional url logging message.
|
2018-11-12 13:36:14 -08:00 |
|
Howard Stearns
|
66ae01e0c3
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-12 12:55:20 -08:00 |
|
Brad Hefta-Gaub
|
22dd958582
|
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
|
2018-11-12 09:52:02 -08:00 |
|
SamGondelman
|
b3abd97707
|
projected materials and repeat property
|
2018-11-09 10:47:07 -08:00 |
|
Zach Fox
|
5cf2041c65
|
Remove unused variable
|
2018-11-09 10:38:20 -08:00 |
|
Brad Davis
|
8c4f0ec774
|
Vcpkg migration
|
2018-11-08 12:28:06 -08:00 |
|
Zach Fox
|
811b01816b
|
CR round 3
|
2018-11-08 10:41:31 -08:00 |
|
Zach Fox
|
1ab1cb95d8
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-08 09:57:10 -08:00 |
|
Zach Fox
|
48d3450c5a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-07 14:59:23 -08:00 |
|
Sam Gateau
|
e28560a9c7
|
Merge pull request #14311 from SamGondelman/interstitial
Case 19682: Disable interstitial on android
|
2018-11-07 10:47:31 -08:00 |
|
Sam Gateau
|
5d0be31fe7
|
Merge pull request #14354 from SamGondelman/deadlock
Case 19735: Fix ResourceCache mutex issues
|
2018-11-07 09:55:41 -08:00 |
|
Simon Walton
|
f88168bdfb
|
Send avatar-joint translations at world scale
|
2018-11-06 17:29:02 -08:00 |
|
Roxanne Skelly
|
cef7000a72
|
Case 19754 - Remove logging URLs and related file locations.
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
|
2018-11-06 16:24:32 -08:00 |
|
SamGondelman
|
1444b3a186
|
resource mutex issues
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
|
2018-11-06 11:57:57 -08:00 |
|
Zach Fox
|
58dd690c0a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-06 10:29:05 -08:00 |
|
Clement
|
37c69ebe62
|
Add audio soloing feature
|
2018-11-05 19:02:26 -08:00 |
|
Alexander Ivash
|
cdfa38d4dd
|
FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp
|
2018-11-04 19:16:43 +05:30 |
|
Zach Fox
|
a87142b8b7
|
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
|
2018-11-02 16:49:20 -07:00 |
|
Zach Fox
|
d0854ca2ab
|
Use AccountManager instead of settings
|
2018-11-02 16:42:18 -07:00 |
|
Gabriel Calero
|
6a3ccbbe02
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-02 17:08:55 -03:00 |
|
Gabriel Calero
|
160e633af5
|
Implement login through oauth for steam login button
|
2018-11-02 17:08:19 -03:00 |
|
Zach Fox
|
b43ad15fa7
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-01 11:32:38 -07:00 |
|
Stephen Birarda
|
41ec026f8d
|
cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit
|
2018-10-31 13:32:27 -07:00 |
|
SamGondelman
|
8633dc0f66
|
disable interstitial on android
|
2018-10-31 12:34:20 -07:00 |
|
Zach Fox
|
d1556ae4e8
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-23 15:51:34 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
John Conklin II
|
7019439356
|
Merge pull request #14260 from SamGondelman/resourceCrash
Fix ResourceCache crash on shutdown
|
2018-10-23 15:03:55 -07:00 |
|
Stephen Birarda
|
5cbddfe0c4
|
consider all sockets in findNodeWithAddr
|
2018-10-23 13:35:07 -07:00 |
|
SamGondelman
|
78f0afd39f
|
fix crash on shutdown
|
2018-10-23 12:13:41 -07:00 |
|
Kerry Ivan Kurian
|
a2a6acd45c
|
Improve code formatting
|
2018-10-22 14:04:59 -07:00 |
|
Zach Fox
|
bccca94111
|
Prevent duplicate resources in logs. Thanks to Roxanne!
|
2018-10-22 13:59:55 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Stephen Birarda
|
3aac294a92
|
optimize sockAddrBelongsToNode and reduce connection filter usage
|
2018-10-22 13:57:30 -07:00 |
|
Zach Fox
|
1eca1bfd55
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-22 11:18:10 -07:00 |
|
Stephen Birarda
|
3c79a79487
|
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
|
2018-10-22 10:11:26 -07:00 |
|
Stephen Birarda
|
ea3bdeb26e
|
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing
Timebox packet processing
|
2018-10-22 09:43:30 -07:00 |
|
Brad Hefta-Gaub
|
219302a9b6
|
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit
Cap the number of domain-server duplicate check-ins sent upon retransmission
|
2018-10-19 16:41:09 -07:00 |
|
Brad Davis
|
2687c024eb
|
Fix light color / serialization
|
2018-10-19 14:47:02 -07:00 |
|
Zach Fox
|
2df9d28c5b
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-19 09:42:06 -07:00 |
|
John Conklin II
|
5095a4e0eb
|
Merge pull request #14196 from sethalves/interstitial-domain-full
go to error-room when failing to connect to a full domain
|
2018-10-18 17:49:35 -07:00 |
|
Zach Fox
|
2f37a2b1a1
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-18 11:12:26 -07:00 |
|
Zach Fox
|
2a9e0041b2
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-18 10:16:07 -07:00 |
|
Kerry Ivan Kurian
|
89a5da80e0
|
Do not display incomplete metadata
|
2018-10-18 01:39:20 -07:00 |
|
Kerry Ivan Kurian
|
3b15548ea3
|
Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
|
2018-10-18 01:04:47 -07:00 |
|
Sam Gondelman
|
3f117cd3e0
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:57:21 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
John Conklin II
|
e59e3720fe
|
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
|
2018-10-17 11:13:35 -07:00 |
|
Seth Alves
|
47d3c9ba27
|
go to error-room when failing to connect to a full domain
|
2018-10-12 11:28:54 -07:00 |
|
Clement
|
bcbbe884c7
|
Timebox readPendingDatagrams
|
2018-10-10 12:56:41 -07:00 |
|
Zach Fox
|
7de784ce27
|
First steps (definitely not working)
|
2018-10-10 12:32:55 -07:00 |
|
Clement
|
8a95c58f86
|
Revert packet processing split
|
2018-10-10 11:46:53 -07:00 |
|
Clement
|
3eb7c80af3
|
Fix BandwidthRecorder storage concurrent accesses
|
2018-10-08 13:45:34 -07:00 |
|