jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147
...
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
2019-05-15 12:17:12 -07:00
Shannon Romano
b3b3c2f721
Merge pull request #14945 from kencooke/audio-stats-loss-underflow
...
Case 19748: Audio loss statistic occasionally displays a huge number
2019-05-15 11:06:53 -07:00
Roxanne Skelly
fad7fa4c07
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 16:25:10 -07:00
David Rowe
997dc963d3
Merge branch 'master' into M22147
2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1
Doc review
2019-05-15 07:56:55 +12:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData
...
New Entity Property: Private User Data
2019-05-14 10:24:39 -07:00
Roxanne Skelly
68fb43ec7f
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 10:11:02 -07:00
Howard Stearns
aeff5d93d8
try a longer timeout before we removeSilentNodes
2019-05-13 16:57:38 -07:00
Roxanne Skelly
0319e8cc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5
Debugging code to monitor the queue depth for a few critical threads
2019-05-13 15:56:55 -07:00
Zach Fox
e87381f431
Merge branch 'master' of github.com:highfidelity/hifi into privateUserData
2019-05-13 14:13:34 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
...
Clear any reliable connection state upon Node ID change
2019-05-13 13:11:05 -07:00
Simon Walton
4b51d81b42
Clear any reliable connection state upon Node ID change
2019-05-10 12:06:38 -07:00
Clement
07372f102c
Add logging on silent node removal
2019-05-09 17:19:10 -07:00
Clement
c691ee496e
CR
2019-05-09 13:58:50 -07:00
Clement
5c42838261
Change timeouts to try to prevent ICE disconnects
2019-05-08 18:38:35 -07:00
Clement
b3d0705e39
Extend ICE logging + make it more searchable
2019-05-08 18:38:00 -07:00
David Rowe
414f27208d
Merge branch 'master' into M22147
...
# Conflicts:
# interface/src/scripting/DesktopScriptingInterface.h
# interface/src/ui/InteractiveWindow.h
2019-05-09 08:43:05 +12:00
Shannon Romano
5a603c20aa
Merge pull request #15495 from Atlante45/fix/deadlock
...
Case 22433: master: Query shape type outside lock
2019-05-06 14:12:56 -07:00
Zach Fox
2046fcfd09
Merge branch 'master' of github.com:highfidelity/hifi into privateUserData
2019-05-06 11:08:36 -07:00
Zach Fox
a68da2bca7
Finish out the feature, i think
2019-05-06 11:08:23 -07:00
Zach Fox
d0e5087b20
Add permission
2019-05-06 10:19:58 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
...
Avatar verification
2019-05-06 08:04:06 -07:00
David Rowe
9c12a39368
Merge branch 'master' into M22147
2019-05-06 11:28:22 +12:00
Angus Antley
1911301005
changed to match type of _mss in compare. also changed float to double for correct return type
2019-05-02 18:21:08 -07:00
Angus Antley
ced5f52971
fixed possible divide by zero error in setpacketsendperiod in CongestionControl.cpp
2019-05-02 14:22:52 -07:00
Revofire
47af406440
merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
...
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04:00
Zach Fox
fb77928652
Private user data is accessible to all right now
2019-05-01 15:29:04 -07:00
Clement
ecc38a8287
Push protocol version
2019-05-01 14:32:04 -07:00
Clement
d0fc5c7713
Push protocol version
2019-04-30 18:29:00 -07:00
David Rowe
9df873cff5
location JSDoc update
2019-05-01 08:17:43 +12:00
Simon Walton
a100345416
Ensure banner entity is local entity
2019-04-26 19:21:40 -07:00
Simon Walton
60389017a4
Merge from master, including avatar protocol change
...
Tony had added HandController version-type.
2019-04-26 18:51:41 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing
...
Case 22255: Add size checks for trait packets parsing
2019-04-26 13:29:50 -07:00
Shannon Romano
4947f14eb7
Merge pull request #15394 from ctrlaltdavid/M22223
...
Case 22223: Messages JSDoc update
2019-04-26 10:40:10 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
...
Avatar network bandwidth optimization
2019-04-26 10:16:30 -07:00
Clement
d36fd6eaa3
Ensure we don't read past the end of packet buffers
2019-04-25 16:22:01 -07:00
Simon Walton
f3efee56c0
Merge remote-tracking branch 'upstream/master' into avatar-verification
2019-04-25 13:40:27 -07:00
Atlante45
329a76d4d6
Fix unix warning
2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560
Patch interface redirect code
2019-04-23 14:54:12 -07:00
Simon Walton
c03839e49f
Fix threaded issues; add verify failed flag to avatar identity packet
...
Bump packet version
2019-04-23 09:26:17 -07:00
Anthony Thibault
0c0b847666
First version of faux joint optimizations
...
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.
Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
2019-04-22 11:02:13 -07:00
John Conklin II
4d4db257e4
Merge pull request #15382 from Atlante45/fix/asset-server-baking
...
Case 22209: Fix asset server auto-baking
2019-04-19 13:40:59 -07:00
Simon Walton
c7f270a9ba
Combine PR15375 & PR15376 for RC82 branch
2019-04-17 13:47:39 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error
...
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
2019-04-17 11:43:12 -07:00
Shannon Romano
7de56092f8
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks
...
Clear delayed Node-adds upon restart
2019-04-16 11:27:15 -07:00
David Rowe
7af55de43d
Messages JSDoc update
2019-04-16 14:20:40 +12:00
Atlante45
c5b7bdc802
Fix unix warning
2019-04-12 17:51:03 -07:00
Atlante45
794cedaa60
Patch interface redirect code
2019-04-12 15:49:34 -07:00
Simon Walton
7180d8b99b
Clear delayed Node-adds upon restart
2019-04-11 17:56:27 -07:00
Simon Walton
a5e94eea75
Increase ping interval for unconnected Nodes
2019-04-11 17:36:09 -07:00
Shannon Romano
1b72a514d3
Merge pull request #15328 from Atlante45/fix/injectors
...
Case 21925: Warn mixer about stopped injectors
2019-04-05 16:09:41 -07:00
David Rowe
28dfac64ba
Merge branch 'master' into M21460
...
# Conflicts:
# libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd
Updates per doc review
2019-04-05 17:10:52 +13:00
Seth Alves
cbc51b75f9
fix asan reported error when returning QString reference to refreshGroupsCache
2019-04-04 19:55:13 -07:00
Clement
5102702910
Warn mixer about stopped injectors
2019-04-04 18:55:35 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes
...
Case 21859: Particle Entity emitter shapes, including model
2019-04-03 11:03:33 -07:00
Anthony J. Thibault
782b8f5da6
Case 22010: Bump protocol number to fix joint order mismatch
...
The joint order change was introduced in PR #15178 , to fix an FBX Serializer bug.
2019-04-02 13:26:50 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes
2019-04-01 22:20:13 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates
...
Case 21899: New Audio Mute States
2019-04-01 15:27:03 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master
...
Case 21993: Globally disallow use of the camera or microphone by hosted web content
2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates
2019-04-01 12:24:46 -07:00
Brad Davis
7d4e59bfe3
Force packet version change
2019-03-31 16:44:23 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign
...
case 21982: Allow logging-in with an email that contains a '+' sign
2019-03-29 13:04:11 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node
...
When adding new Node clear any dangling Connection objects
2019-03-29 10:46:22 -07:00
Oren Hurvitz
3d5035886c
Allow logging-in with an email that contains a '+' sign.
...
Previously, attempts to login using an email such as "my+name@example.com" didn't work because the username wasn't
URL-encoded when it was sent to the server, so on the server the '+' was changed to a space.
2019-03-28 10:45:55 +01:00
David Rowe
f933872620
Address review comments.
2019-03-28 14:21:51 +13:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates
2019-03-27 15:49:39 -07:00
David Rowe
9a1bb27034
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-03-26 13:58:43 +13:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control
2019-03-23 16:15:29 -07:00
Ken Cooke
cbeb4b0b20
Persist the audio-mixer settings across domain changes and server resets
2019-03-23 06:48:37 -07:00
Wayne Chen
d382893e75
staging avatar inputs for ignore radius
2019-03-22 14:16:28 -07:00
Simon Walton
8947d4d133
When adding new Node clear any dangling Connection objects to its address
2019-03-20 15:45:06 -07:00
SamGondelman
432a3f1610
uniform sampling of ellipsoid points
2019-03-19 12:59:03 -07:00
Ken Cooke
ca0379f6de
Send InjectorGainSet packet to the audio-mixer
2019-03-15 17:24:50 -07:00
Ken Cooke
a5a305f181
Handle InjectorGainSet packet at the audio-mixer
2019-03-15 12:05:51 -07:00
Howard Stearns
9b3b109d22
make placename consistent with hostname after domain reset
2019-03-13 17:09:54 -07:00
Howard Stearns
97bfa538ff
unlimited certified copies in a domain
2019-03-07 09:51:20 -08:00
Roxanne Skelly
cca36e4a89
Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8'
2019-03-05 15:09:56 -08:00
Roxanne Skelly
d0ecc6d792
Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b'
2019-03-05 15:09:20 -08:00
Roxanne Skelly
38981a5f25
Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36'
2019-03-05 15:08:39 -08:00
Roxanne Skelly
3ef02085ff
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
2019-03-05 15:07:49 -08:00
Shannon Romano
29d5574d93
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread
...
Connection class should run in NodeList thread
2019-03-04 12:30:24 -08:00
SamGondelman
884a64bfa6
fix resource crash
2019-03-01 15:50:50 -08:00
Roxanne Skelly
16eb3444c1
Code Review Fixes
2019-03-01 11:31:01 -08:00
Clement
135c7b667e
Reduce size of _nodeMutex critical sections
2019-03-01 11:23:46 -08:00
Clement
a804d3532e
Set default limit for other nodes to size_t max
2019-02-28 15:30:57 -08:00
Clement
9ea41f7122
CR
2019-02-28 15:22:07 -08:00
Atlante45
9fe7a3350c
Fix windows compile error
2019-02-28 15:06:26 -08:00
Roxanne Skelly
c721d68ec3
Remove unneeded cruft
2019-02-28 14:35:29 -08:00
Roxanne Skelly
c7b04865ce
Remove debugging code, some thread safety changes
2019-02-28 13:58:33 -08:00
danteruiz
f715dbe243
fix tablet scaling
2019-02-28 13:32:12 -08:00
Roxanne Skelly
1e1437aab7
Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress
2019-02-28 12:13:17 -08:00
Clement
8032063512
Move to LimitedNodeList
2019-02-27 19:14:36 -08:00
Clement
717c12fe16
Add new connection rate limitting
...
Limit rate of connection for new Agents
2019-02-27 18:22:49 -08:00
Simon Walton
db8bd661ce
Max domain check-ins was 5, not 4, dammit
2019-02-27 16:50:07 -08:00
Roxanne Skelly
03326cd471
Build fix
2019-02-27 15:58:49 -08:00
Simon Walton
59b9831c1d
Revert max check-ins to 4
2019-02-27 15:56:01 -08:00
Roxanne Skelly
e2e1edc8b0
Add test logging, stats, and force domain pings to timer thread
...
Test code for load testing only.
2019-02-27 14:13:33 -08:00
Simon Walton
08d6a2ce7f
Avatar Hero debugging & logging
2019-02-26 16:40:16 -08:00
John Conklin II
2449693d8b
Merge pull request #15006 from Atlante45/fix/shared-connection-master
...
Case 21407: Delete old nodes with identical socket
2019-02-26 16:24:03 -08:00
Simon Walton
4c071be2bf
Merge remote-tracking branch 'upstream/v0.79.HERO-rc' into hero-avatar-zone-79
2019-02-26 15:21:00 -08:00
Simon Walton
7039ee471d
Move newly-created Connection to NodeList thread
2019-02-26 13:49:55 -08:00
Simon Walton
0b080471ff
Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing
2019-02-26 10:57:35 -08:00
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726
...
Guard against accidentally calling wrong api/v1/places endpoint
2019-02-25 17:16:33 -08:00
Clement
50035a1983
Delete old nodes with identical socket
2019-02-25 09:48:21 -08:00
Clement
d040803391
Delete old nodes with identical socket
2019-02-22 18:38:31 -08:00
SamGondelman
544f54e69a
fix model scale
2019-02-21 14:10:36 -08:00
David Kelly
2202b69575
Guard against accidentally calling wrong api/v1/places endpoint
...
spaces
2019-02-20 13:09:29 -07:00
Simon Walton
8033e93eda
Add avatar-priority boolean to zone entities
...
RC-79 version
2019-02-19 17:38:37 -08:00
SamGondelman
44e70db4cd
WE DID IT FOLKS
2019-02-19 15:02:36 -08:00
Ken Cooke
0b472a9f02
Protect against lost counter underflow in networking stats
2019-02-16 11:19:18 -08:00
sabrina-shanman
bb123cfe3b
Fix GLTF materials
2019-02-15 14:51:29 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode
...
Case 20962: Billboard mode improvements
2019-02-14 17:44:48 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
dd0d7f0118
merge with master
2019-02-14 09:57:13 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal
...
Case 21147, Case 20944: Fix setTextures (pal, etc.)
2019-02-13 17:50:08 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
9e002c59d4
fix pal
2019-02-13 15:24:55 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132
...
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
2019-02-13 10:35:00 -08:00
SamGondelman
189ccfde4a
clement's comments from PR14858
2019-02-12 09:51:11 -08:00
SamGondelman
61346437da
working on material mapping
2019-02-12 09:22:31 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
SamGondelman
4202685a4b
Merge remote-tracking branch 'upstream/master' into fst
2019-02-11 16:07:36 -08:00
David Rowe
5428bb19dc
Add "Avatar Script" JSDoc API classification
2019-02-12 11:49:49 +13:00
SamGondelman
d988de4a17
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-11 10:27:12 -08:00
SamGondelman
4f03157f39
working on fst material mapping
2019-02-11 10:20:55 -08:00
Roxanne Skelly
e6b2c890d0
Case21085 - Changing domains with scripting APIs not working
...
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.' Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
2019-02-07 22:21:05 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
9193704173
trying to get hashes working
2019-02-06 11:47:38 -08:00
SamGondelman
3ee448a89a
fix scattering and working on resource cache bug
2019-02-05 17:32:15 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
SamGondelman
0955512a80
add billboard mode to web entities and fix picking/culling
2019-01-31 15:45:10 -08:00
Dante Ruiz
9082a3f4e5
to the spot on first launch
2019-01-31 10:58:20 -08:00
Dante Ruiz
778ddad9ac
to the spot on first launch
2019-01-31 10:52:48 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
SamGondelman
13cb70a6a5
Merge remote-tracking branch 'upstream/master' into NOverlays12
2019-01-28 11:37:15 -08:00
Roxanne Skelly
d3cffa50d6
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 11:11:28 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11
...
Case 20700: Add missing pulse properties to certain Entity types
2019-01-28 10:51:00 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -08:00
SamGondelman
a10f52c66d
merge with master
2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 14:06:44 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Roxanne Skelly
cfaf01b22a
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d
QML Marketplace
...
Checkpoint full functionality
2019-01-24 17:20:42 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103
ring gizmo entities
2019-01-23 17:46:04 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
...
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
...
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Anthony Thibault
286f23d512
Updated protocol version and fixed bugs
2019-01-17 15:19:54 -08:00
Wayne Chen
ef63213d28
fixing linking account problems on oculus/steam, changing callback
2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8
removing oculus userID to server - no need
2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b
linking oculus acct creation to spinner
2019-01-16 17:05:59 -08:00
Wayne Chen
2d16e71e74
adding sending oculus ID including username
2019-01-16 17:05:52 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6
staging
2019-01-16 17:05:48 -08:00
SamGondelman
611998f799
add pulse group properties to shapes, particles, text, web, image, and grid
2019-01-16 13:34:10 -08:00
Simon Walton
024cb70fce
Change member-initializer order to fix warnings
2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d
Pass udt::Socket pointer in initializer-list for udt::Connection
2019-01-16 12:08:02 -08:00
Clement
6bd6c45b60
Remove dead IdentityRequest code
2019-01-15 11:40:08 -08:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities
...
case 20020: faster avatar entities
2019-01-11 14:13:05 -08:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap
...
cap the number of considered message channels in PacketQueue
2019-01-09 17:43:36 -08:00
Andrew Meadows
9b253690db
bump packet version number
2019-01-09 17:28:00 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377
...
Trait-level flow control
2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout
...
Set minimum timeout for retransmits within reliable network service
2019-01-09 15:35:40 -08:00
birarda
3c6b7e3bd0
add a cap to cycled message channels in SendQueue
2019-01-09 13:06:30 -08:00
SamGondelman
10068cc42c
merge with master
2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677
working on primitiveMode and groupCulled
2019-01-08 10:02:03 -08:00
Roxanne Skelly
d54fec4476
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11
fix crash
2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda
merge with master
2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b
renderLayer
2019-01-07 15:43:35 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix
2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8
...
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
2019-01-07 14:53:27 -08:00
Simon Walton
c88af5c4be
Merge branch 'master' into reliable-service-min-timeout
2019-01-07 13:28:13 -08:00
Roxanne Skelly
37d4846722
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 11:56:48 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats
...
Only keep aggregated thread stats for Avatar Mixer
2019-01-07 10:17:26 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
Roxanne Skelly
6d791a80c2
Bump protocol version for BulkAvatarTraits and add some guard code
...
around packet parsing.
2019-01-04 19:04:01 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager
...
MS19925: Avatar Packager
2019-01-04 16:22:06 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Thijs Wenker
94146ab997
CR fixes
2019-01-04 23:59:22 +01:00
Clement
cfbb4e29d1
Only keep aggregated thread stats
2019-01-04 14:51:58 -08:00
SamGondelman
1452d237e2
trying to fix avatar entity issue
2019-01-04 14:34:46 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity
...
data url for web entity
2019-01-04 14:21:55 -08:00
Roxanne Skelly
4f9cce1ea9
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-04 13:46:45 -08:00
Thijs Wenker
b105607cb2
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 21:13:29 +01:00
Thijs Wenker
a3f72a7a08
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-04 21:10:35 +01:00
Seth Alves
b9217e2767
Merge pull request #14655 from danteruiz/unknown-steamvr-headsets
...
omit unknown device names from clear-story data
2019-01-04 10:09:20 -08:00
Ryan Huffman
c2ceeb3d76
Apply AvatarPackager code review cleanup
2019-01-04 09:41:31 -08:00
Thijs Wenker
8625037285
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats
...
Fix network stats to use low-level values
2019-01-03 16:54:03 -08:00
Sam Gondelman
0e6eecc64b
Update PacketHeaders.h
2019-01-03 15:20:55 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8
2019-01-03 15:11:48 -08:00
Dante Ruiz
f5de217b4c
removing debug statment
2019-01-03 13:40:44 -08:00
Roxanne Skelly
2b1547b9fa
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-03 13:39:19 -08:00
Thijs Wenker
c95da0a595
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/src/Application.cpp
2019-01-03 22:17:54 +01:00
SamGondelman
4cd1cd6606
merge with master
2019-01-03 12:56:41 -08:00
Dante Ruiz
fe1a8a6b76
omit unknown device names from clear story
2019-01-03 11:46:03 -08:00
Clement
a0ede77e4f
Fix typo
2019-01-03 10:04:38 -08:00
Clement
9475a31f1b
Record ACK data in stats
2019-01-03 10:04:38 -08:00
Clement
f163bbc0d5
Sample connections stats every seconds
2019-01-03 10:04:38 -08:00
Clement
c5b60594b6
Record more detailed stats on Retransmit/duplicate
2019-01-03 10:04:38 -08:00
Seth Alves
ad1235ce94
also bump entity protocol version
2019-01-03 08:19:13 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
Thijs Wenker
725a14ce80
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 11:06:19 +01:00
SamGondelman
ea11497a67
Merge remote-tracking branch 'upstream/master' into NOverlays7
2019-01-02 18:09:19 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6
...
Case 20281: Add missing Text Entity properties
2019-01-02 18:07:37 -08:00
Thijs Wenker
cb91a4bc6d
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207
...
ACs don't need to call into flagtimeForConnecitonStep
2019-01-02 13:41:30 -08:00
Roxanne Skelly
9dfb07c827
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-02 09:22:27 -08:00
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