Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 09:57:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48351 commits 25 branches 0 tags 1.1 GiB
Commit graph

19910 commits

Author SHA1 Message Date
Chris Collins
9846614468 Merge pull request #8879 from AndrewMeadows/show-physics-stats 
add Bullet profile info to PerformanceTimer stats
 2016-10-25 06:29:27 -07:00
sam
6b2b68e691 trying to add counters for the default FBO 2016-10-25 03:36:23 -07:00
Brad Hefta-Gaub
2c28316e39 CR feedback 2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
62f63f32a7 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 20:24:29 -07:00
Brad Hefta-Gaub
ae6022c498 actually make the RunningMarker run on a different thread 2016-10-24 18:55:25 -07:00
samcake
58b81e3b0c Adding counter for the amount of memory used in texture for Framebuffers 2016-10-24 18:34:16 -07:00
Clément Brisset
dd45500313 Merge pull request #8891 from huffman/fix/disconnected-dialog-updates 
Fix several aspects of the "disconnected" dialog
 2016-10-24 15:39:16 -07:00
Chris Collins
48215009c1 Merge pull request #8885 from jherico/qml_limit 
4k display & QML Offscreen rendering fixes
 2016-10-24 15:22:33 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired 2016-10-24 14:45:41 -07:00
Brad Davis
7900fd3e18 New texture memory scheme 2016-10-24 13:10:41 -07:00
Brad Davis
da9eb0433c Remove workaround for QML HDPI offscreen rendering bug 2016-10-24 11:51:40 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Ryan Huffman
b5881146df Merge pull request #8878 from zzmp/fix/half-sec-audio-crash 
reduce sound from crashed avatars
 2016-10-23 20:38:35 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
Brad Davis
7879bf37f2 Fix typo in comment 2016-10-22 18:12:40 -07:00
Brad Davis
b572fb2a91 Only use sparse texture memory for the memory pressure calculation (since that's all we can modify) 2016-10-22 14:49:10 -07:00
Brad Davis
62de2af944 Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub
ee1f3ac38c Merge pull request #8881 from jherico/offscreen_texture_memory_stats 
Report offscreen texture memory usage in stats
 2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92 Merge pull request #8880 from hyperlogic/feature/controller-display 
Show hand controllers in away.js
 2016-10-21 17:43:52 -07:00
Brad Davis
e9ac110072 Correct mip calculation 2016-10-21 17:05:56 -07:00
Zach Pomerantz
3bea1069f2 fix unit conversion for audio fade factor 2016-10-21 16:10:33 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 
fix some data-races in logging system
 2016-10-21 15:33:40 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures 
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
 2016-10-20 17:07:29 -07:00
Philip Rosedale
8c5dd1170e Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker 
fix flicker in system (inside the hud) hand-lasers.
 2016-10-20 16:53:57 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
Brad Davis
c27ee634ea Fix debug compile issues 2016-10-20 13:56:01 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Seth Alves
b31acc421a fix crash on startup 2016-10-20 10:36:14 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
4a6101060c Merge pull request #8862 from zzmp/fix/quick-leak 
fix leak from qml surfaces' render controls
 2016-10-20 08:23:28 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
Brad Hefta-Gaub
9bfc8502f1 Merge pull request #8863 from zzmp/fix/quick-crash 
fix intermittent crash on teleport from contextless Qt connection
 2016-10-19 22:22:51 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler 
quiet warnings in Linux build
 2016-10-19 17:41:19 -07:00
Brad Hefta-Gaub
9cb0c973de Merge pull request #8849 from zzmp/fix/shapekey-ref 
fix invalid ShapeKey ref
 2016-10-19 17:39:06 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Zach Pomerantz
02b4c43cff delete _renderControl after use 2016-10-19 17:09:29 -07:00
Zach Pomerantz
df51646307 add ctx to qml surface cxs 2016-10-19 16:56:13 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Ryan Huffman
9dee1b85fe Merge pull request #8855 from birarda/blank-asset-delete 
force valid file path for asset file mapping operations
 2016-10-19 14:22:26 -07:00
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -07:00
Brad Hefta-Gaub
aa50f460c3 Merge pull request #8851 from jherico/qml_limit 
Rate limit QML web surfaces
 2016-10-19 12:04:47 -07:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Brad Hefta-Gaub
6bd193cdd8 hacking 2016-10-18 21:33:37 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e Rate limit QML web surfaces 2016-10-18 19:29:11 -07:00
Zach Pomerantz
cf82cc3f50 fix invalid ShapeKey ref 2016-10-18 17:59:30 -07:00
Seth Alves
b936252609 quiet compiler 2016-10-18 17:56:57 -07:00
Seth Alves
2e73330e8e quiet warnings in Linux build 2016-10-18 17:47:47 -07:00
Seth Alves
a801f27c7c Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1 2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 17:33:57 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor 
move HF access token to authorization header
 2016-10-18 17:24:58 -07:00
Stephen Birarda
22e0e649b1 add a comment for ack count calculations 2016-10-18 16:16:09 -07:00
Stephen Birarda
5bd6cc9fac fix comparison for reno slow start 2016-10-18 16:01:35 -07:00
Seth Alves
af5be8d1d9 reduce data-races in logging 2016-10-18 15:59:00 -07:00
Stephen Birarda
ddce913095 cleanup math for leftover ACKs 2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91 break slow start on vegas timeout loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0 add some additional comments to reno congestion avoidance 2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519 cleanup initialization of min RTT member variables 2016-10-18 15:54:25 -07:00
Stephen Birarda
b817e72976 comment clarity and readability improvements 2016-10-18 15:54:25 -07:00
Stephen Birarda
d5a450ad30 add comment about Jacobson's formula for RTT estimation 2016-10-18 15:54:25 -07:00
Stephen Birarda
1041443796 use __FUNCTION__ and clearup zero us RTT comment 2016-10-18 15:54:25 -07:00
Stephen Birarda
13c38760b3 switch to wireSize, use time only, remove double public 2016-10-18 15:54:25 -07:00
Stephen Birarda
7567cff590 fix comment for ACK interval of 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
41d48b12bd add a comment clearing up onACK return 2016-10-18 15:54:25 -07:00
Stephen Birarda
7480d1e45d switch default hifi address back to welcome 2016-10-18 15:54:25 -07:00
Stephen Birarda
9407efbbc5 protect against an overflow in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
7ef596a9f0 use ova-welcome for default hifi address 2016-10-18 15:54:25 -07:00
Stephen Birarda
ef660722cd force duplicated sends to use highest RTT, not lowest 2016-10-18 15:54:25 -07:00
Stephen Birarda
d15cb6171d fix bubble up of duplicated packet info 2016-10-18 15:54:25 -07:00
Stephen Birarda
0a7d799abf don't double set _lastACK in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
fdcface8cb use enum in PacketHeaders, coding standard fixes in Connection 2016-10-18 15:54:25 -07:00
Stephen Birarda
e7c0ed035f remove SendQueue fast re-transmit debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71 push version for asset packets to mismatch for TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
af969231e7 remove some extra lines 2016-10-18 15:54:25 -07:00
Stephen Birarda
54b28e646a remove congestion window halving on reno dupe loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
ec51f01c59 remove debugs from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
a075bb6b1c slow down new UDT debug for asset-server tests 2016-10-18 15:54:25 -07:00
Stephen Birarda
b03bb6b73f halve the congestion window on 3rd duplicate ACK 2016-10-18 15:54:25 -07:00
Stephen Birarda
b74a967c95 fix an additional reference to preAIWindowSize 2016-10-18 15:54:25 -07:00
Stephen Birarda
d05e3e1dd6 drop CWS to 2 if reno fast re-transmit is hit 2016-10-18 15:54:25 -07:00
Stephen Birarda
64a0239248 add reno fallback for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
0b2e0a4167 initial re-implementation of reno cong avoid 2016-10-18 15:54:25 -07:00
Stephen Birarda
dbbdda3468 keep track of num RTT and debug reno fallback 2016-10-18 15:54:25 -07:00
Atlante45
2c026d7b0f Disable packet probes 2016-10-18 15:54:25 -07:00
Atlante45
202641a349 Debug tweaks 2016-10-18 15:54:25 -07:00
Stephen Birarda
5174891b66 move receive time of packet higher in Socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
afc59eea19 grab earliest possible receive time in socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
6a3dd15887 emit packetSent signal immediately after send 2016-10-18 15:54:25 -07:00
Stephen Birarda
b0192df04f allow congestion control to disable ACK2 2016-10-18 15:54:25 -07:00
Atlante45
3d0f449afb Ignore ack syn when using vegas 2016-10-18 15:54:25 -07:00
Stephen Birarda
9760fdc906 use MAX_PACKETS_IN_FLIGHT as receiver max flow window 2016-10-18 15:54:25 -07:00
Stephen Birarda
5ffbd2d11e start num ACKs since FRT to 3 2016-10-18 15:54:25 -07:00
Stephen Birarda
456bcbca67 use max and not min for CW clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
c0219d9ddf remove numRTT from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
995f383edb default EWMA RTT and variance to first value 2016-10-18 15:54:25 -07:00
Atlante45
f0dcc54a18 Start in slow start 2016-10-18 15:54:25 -07:00
Atlante45
f143e9bf3f Register SequenceNumber and time_point 2016-10-18 15:54:25 -07:00
Stephen Birarda
7731b407bd only attempt SQ sleep with > 0 PSP 2016-10-18 15:54:25 -07:00
Stephen Birarda
3ecfd6af67 added debug for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
c794c4af1a adjust EWMA RTT start values in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
96ef1fa483 add FRT debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
7cc1f3261e use last adjustment time to adjust every RTT 2016-10-18 15:54:25 -07:00
Stephen Birarda
0d2e83e0fc cleanup according to Vegas paper, add fast retransmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
ecbba3d4cd send time point with packet sent signal 2016-10-18 15:54:25 -07:00
Atlante45
75d4b156f1 Added shouldNAK to CC class 2016-10-18 15:54:25 -07:00
Atlante45
eee617e39c Remove congestion window size clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
0954d5bf93 cleanup sent packet time hash after RTT calc 2016-10-18 15:54:25 -07:00
Stephen Birarda
8e05a2893a change congestion window size to an int 2016-10-18 15:54:25 -07:00
Stephen Birarda
5e637c31de rename congestion window size var in TCPRenoCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
b232a44c8d don't send sync ACK when interval is == 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
69ca0d2675 point TCPVegasCC at correct TCPRenoCC base 2016-10-18 15:54:25 -07:00
Stephen Birarda
8c9b46c1e0 fix method signatures, adjust ssthresh increases 2016-10-18 15:54:25 -07:00
Stephen Birarda
eb180b15d8 only raise ssthresh if not reducing cwnd 2016-10-18 15:54:25 -07:00
Stephen Birarda
8304bb81d1 create the base of the TCPVegasCC class 2016-10-18 15:54:25 -07:00
Atlante45
59bcd724ea More Reno work 2016-10-18 15:54:25 -07:00
Atlante45
bad96d54ea TCP congestion control first draft 2016-10-18 15:54:25 -07:00
Seth Alves
150c9b4bf8 Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-0 2016-10-18 14:41:40 -07:00
Seth Alves
21ccc58e04 don't pass statsObject by reference 2016-10-18 14:41:33 -07:00
Zach Pomerantz
fc7a1c31ec Revert "start MinMaxAvg at default, not numeric limit" 
This reverts commit 96e9399b89.
 2016-10-18 14:11:53 -07:00
Seth Alves
ceadc8005f Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 13:55:56 -07:00
Seth Alves
e79642396d Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-18 13:43:20 -07:00
Seth Alves
0c6dedff45 avoid various data-races related to stats collection and delivery 2016-10-18 13:05:53 -07:00
Stephen Birarda
f8e0d7ad88 move QWebEngine classes to ui library 2016-10-18 12:53:32 -07:00
Ryan Huffman
73a0266edb Fix case in Script.include where urls is empty 2016-10-18 11:41:15 -07:00
Seth Alves
0cda01f105 send stats to domain-server with networking thread 2016-10-18 10:29:35 -07:00
Stephen Birarda
81cb33574d check for HTTPS scheme in bearer add in XMLHttpRequest 2016-10-18 10:04:43 -07:00
Brad Hefta-Gaub
0d48eb55b9 Merge pull request #8835 from zzmp/fix/entity-del-deadlock 
fix deadlock when removing tablet
 2016-10-18 01:21:55 -07:00
Brad Hefta-Gaub
13e5c31d0d Merge pull request #8829 from jherico/gpu_leak 
Fix GPU buffer leak in geometry cache / overlays
 2016-10-18 01:12:44 -07:00
Brad Hefta-Gaub
c8fa2e3c9a Merge pull request #8831 from hyperlogic/bug-fix/fbxreader-crash-fix 
Speculative fix for crash in FBXReader.cpp
 2016-10-18 01:08:29 -07:00
Brad Hefta-Gaub
478c0856f3 Merge pull request #8837 from sethalves/fix-avatar-entities-delete 
fix crash when deleting avatar-entities
 2016-10-17 21:20:27 -07:00
Chris Collins
b43301cd8c Merge pull request #8824 from huffman/fix/batch-load-crash 
Fix race condition in BatchLoader
 2016-10-17 20:55:38 -07:00
Seth Alves
5d085798cb Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entities-delete 2016-10-17 17:42:17 -07:00
Seth Alves
9b7086b1fb added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
Zach Pomerantz
301f3ced98 fix typoed threaded call 2016-10-17 15:30:49 -07:00
Atlante45
3955c6c4c6 Don't override place name path with index path 2016-10-17 14:41:05 -07:00
Anthony J. Thibault
1c6fbc08bf Speculative fix for crash in FBXReader.cpp 
I could not reproduce the issue, however looking at the stack trace shows that
the crash is due to indexing past the end of the FBXNode::properties QVariantList.
Guard against this from happening by checking the property length first.
 2016-10-17 13:22:17 -07:00
Chris Collins
f1b2dd8b1a Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory 
check for empty snapshot dir, and default to temp
 2016-10-17 13:21:58 -07:00
Chris Collins
1c30d98cf9 Merge pull request #8823 from ZappoMan/shutdownSandbox 
Auto-shutdown of sandbox if it was launched by interface
 2016-10-17 13:20:15 -07:00
Ryan Huffman
9ef6aee3d1 Fix race condition in BatchLoader 2016-10-17 13:10:19 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Stephen Birarda
08dc9e0c4d use HTTP header for access token added for XMLHttpRequest 2016-10-17 11:34:37 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Brad Hefta-Gaub
aec76cd542 Merge pull request #8799 from ctrlaltdavid/21070 
HMD keyboard polishing
 2016-10-16 01:00:48 -07:00
Brad Hefta-Gaub
3874f173b6 Merge pull request #8818 from jherico/amd_crash 
Fix AMD crash caused by missing glFlush
 2016-10-15 18:47:25 -07:00
Brad Davis
612a1b17ff Magic number removal 2016-10-15 17:59:27 -07:00
Brad Davis
0be1f82bbc Fix AMD crash caused by missing glFlush 2016-10-15 15:28:28 -07:00
Stephen Birarda
d1cd99e035 remove a useless two dots 2016-10-14 18:24:39 -07:00
David Rowe
eff8502f67 Merge branch 'master' into 21070 2016-10-15 11:20:30 +13:00
Stephen Birarda
9184a500a0 move faked handshake logic to Socket for handshake req flag 2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9 only emit client connection reset on requested handshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55 fix magic numbers and hide sendFakedHandshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2 fix for dual alias in LimitedNodeList std::bind 2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c remove define of UDT connection debug 2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f make faked handshake request usable in dev/PR 2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1 bubble up receiver handshake from udt::Connection 2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479 add forced kill of AS for test 2016-10-14 14:46:58 -07:00
Stephen Birarda
5704335b66 add quick fails for no active socket to other AssetClient calls 2016-10-14 14:46:58 -07:00
Stephen Birarda
055df48e8d make the asset server a solo node type 2016-10-14 14:46:58 -07:00
Stephen Birarda
7fd25ae450 fix returns for missing active socket in LNL 2016-10-14 14:46:58 -07:00
Stephen Birarda
3c70a25a40 immediately error in AssetClient if no active socket for AS 2016-10-14 14:46:58 -07:00
Stephen Birarda
ca94fbc219 refuse to send packets if connection should not be created 2016-10-14 14:46:58 -07:00
Stephen Birarda
f41188b0e8 default last receiver response in send queue to queue creation time 2016-10-14 14:46:58 -07:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Brad Hefta-Gaub
fb47b42ea5 Merge pull request #8807 from sethalves/fix-import-with-tmp-rez 
fix entity-import with only tmp-rez rights
 2016-10-13 22:32:02 -07:00
David Rowe
0e3cb3eabf Merge branch 'master' into 21070 2016-10-14 13:29:38 +13:00
Brad Davis
46326ed27c Fix crash in switching to plugin that uses the composite framebuffer in customizeContext 2016-10-13 16:46:02 -07:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -07:00
Chris Collins
90b283f83b Merge pull request #8806 from huffman/fix/atp-script-cache 
Update ScriptCache to clear ATP assets when disconnected from a domain
 2016-10-13 16:30:29 -07:00
Ryan Huffman
6cf4802cc2 Change default hifi address from dev-welcome to welcome 2016-10-13 16:06:07 -07:00
Ryan Huffman
7626f49ddc Replace qDebug with qCDebug in ScriptCache 2016-10-13 15:43:28 -07:00
Seth Alves
01c1cb328f don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP 2016-10-13 15:05:13 -07:00
Ryan Huffman
decb94b719 Update ScriptCache to clear ATP assets when disconnected from a domain 2016-10-13 14:05:53 -07:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries 
Update ds path queries to be reliable
 2016-10-13 09:21:44 -07:00
David Rowe
2343e02454 Fix a couple of QML errors 2016-10-13 18:16:21 +13:00
David Rowe
a75925d1e3 Add numeric shift 2016-10-13 14:18:21 +13:00
David Rowe
a359626316 Merge branch 'master' into 21070 2016-10-13 09:54:59 +13:00
David Rowe
e269a84d0e Add placeholder "FIXME"s for making Web entity keyboard HMD-only 2016-10-13 09:35:39 +13:00
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Brad Davis
4e0fffb8b7 Merge pull request #8779 from gcalero/shaders_gl_es 
Adapt shader for GL ES support
 2016-10-12 08:32:50 -07:00
Brad Hefta-Gaub
0f1e61e240 Merge pull request #8781 from ZappoMan/tweakGrabPoint 
adjust grab indicators
 2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub
8e8eba5e0c Merge pull request #8770 from jherico/textures_tweak 
Fix GPU texture counter, better logging for memory pressure
 2016-10-11 21:36:03 -07:00
Brad Hefta-Gaub
cded9c03f9 Merge pull request #8767 from ZappoMan/viveControllerFixes 
fix 'any endpoints' for axis style inputs
 2016-10-11 20:33:35 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Stephen Birarda
33e426bfd2 Merge pull request #8778 from Atlante45/asset-client 
Fix crash in AssetClient handleProgressCallback
 2016-10-11 18:36:23 -07:00
Brad Davis
8f42e564b4 Disable 'min free GPU memory', bump max texture memory 65% 2016-10-11 16:34:54 -07:00
Brad Davis
1e7dd7db64 Fix GPU texture counter, better logging for memory pressure 2016-10-11 16:28:16 -07:00
samcake
3ebab3b017 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-10-11 15:45:10 -07:00
Brad Hefta-Gaub
95c1237f66 Merge pull request #8776 from samcake/color 
Add check for bad texture resource slot
 2016-10-11 14:50:56 -07:00
samcake
7ea790aa4f adding a comment to explain what we are doing 2016-10-11 14:43:41 -07:00
Stephen Birarda
a8568ac821 Merge pull request #8775 from birarda/master 
remove AssetResourceRequest timeout, output occasional progress to log
 2016-10-11 14:31:51 -07:00
Brad Hefta-Gaub
c1763da9b1 Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash 
Fix crash when switching to desktop mode from oculus HMD mode
 2016-10-11 14:29:28 -07:00
Stephen Birarda
504e92607a change format of debug message 2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98 change QLoggingCategory include casing 2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5 set the initial last progress debug 5s back 2016-10-11 13:21:15 -07:00
samcake
7af3aa53ac Fixing the key light pass with ambient map 2016-10-11 13:20:32 -07:00
Stephen Birarda
a0c27e2130 remove timer forced timeouts in ARR, occasionally ouput DL progress 2016-10-11 13:17:57 -07:00
Atlante45
e7e9c71625 Fix AssetClient crash 
Do not access message data until message is complete
 2016-10-11 13:05:57 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Anthony J. Thibault
350977f03e Speculative fix for crash in AudioClient 2016-10-11 10:49:43 -07:00
Stephen Birarda
826c2f1a9f push the AssetResourceRequest timeout to 15s 2016-10-11 09:55:16 -07:00
Stephen Birarda
ec5850b82b emit ReceivedMessage progress signals more frequently for new timeout 2016-10-11 09:55:05 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
samcake
0951ca6bbe Add check for bad texture resource slot 2016-10-10 18:43:24 -07:00
Brad Hefta-Gaub
798a5cfc9d Merge pull request #8768 from ZappoMan/nestedSkyboxes 
fix skybox changing when going between zones
 2016-10-10 15:13:33 -07:00
Anthony J. Thibault
e76a7fc577 Crash fix for RenderableWebEntityItem::buildWebSurface 
Gracefully handle the absence of a gl context.  We will continue to retry every render call.
 2016-10-10 13:57:54 -07:00
Brad Hefta-Gaub
735a6ca994 Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes 
openvr deadlock and crash on exit fixes
 2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
db5edb530a fix skybox changing when going between zones 2016-10-09 15:22:35 -07:00
Brad Hefta-Gaub
8da9fccb5d fix 'any endpoints' for axis style inputs 2016-10-08 20:24:52 -07:00
Anthony J. Thibault
ec801cb9d8 Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
Brad Hefta-Gaub
7e3d63c4e2 Merge pull request #8747 from jherico/buffer_page_fix 
Fix page size usage in gpu buffers
 2016-10-07 16:57:25 -07:00
Ryan Huffman
8a4cfd4735 Remove unreachable code in PluginUtils 2016-10-07 13:37:52 -07:00
Anthony J. Thibault
a4c7e832b5 Reset threadID logging to false 2016-10-07 11:42:34 -07:00
Ryan Huffman
408cc1cd04 Update default hifi address to dev-welcome 2016-10-07 10:30:18 -07:00
Ryan Huffman
e6314a2701 Add changes to isHMDAvailable to specify hmd 2016-10-07 10:30:18 -07:00
Ryan Huffman
a062e6ab9a Revert change to make tutorial only work for Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c6eae36a7 Update tutorial progress keys 2016-10-07 10:30:18 -07:00
Ryan Huffman
f426f1cd4f Update isHandController to temporarily only return true for Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
e24a01d1fe Add path parameter to goToSandbox 2016-10-07 10:30:18 -07:00
Ryan Huffman
03c01bb9b0 Add exception handling to callEntityMethod calls 2016-10-07 10:30:18 -07:00
Ryan Huffman
4efeb928e2 Add user activity logging to tutorial 2016-10-07 10:30:18 -07:00
Howard Stearns
a170436c8c Merge pull request #8754 from howard-stearns/init-script-update-time 
init the accumulator for script elapsed time
 2016-10-07 10:10:16 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
howard-stearns
6cae62f584 init the accumulator for script elapsed time 2016-10-07 09:38:30 -07:00
David Kelly
ab6ccac631 Merge pull request #8741 from howard-stearns/kill-agents 
kill agents in avatar mixer when they stop being avatars
 2016-10-07 09:16:49 -07:00
Seth Alves
f1f8f6323a Merge pull request #8674 from ctrlaltdavid/21055 
HMD keyboard
 2016-10-07 06:21:36 -07:00
Brad Hefta-Gaub
b1cd553074 Merge pull request #8752 from huffman/fix/script-resolve 
Fix script paths not resolving correctly
 2016-10-06 18:55:57 -07:00
David Rowe
a1458a26fd Merge branch 'master' into 21055 
Conflicts:
	libraries/gl/src/gl/OffscreenQmlSurface.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-07 14:44:23 +13:00
Brad Hefta-Gaub
b0c2bda898 Merge pull request #8743 from jherico/qml_threading 
Remove QML threaded rendering
 2016-10-06 17:46:12 -07:00
Ryan Huffman
bbd7174d06 Fix script paths not resolving correctly 2016-10-06 17:37:47 -07:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00
Chris Collins
8310a9fe8a Merge pull request #8730 from huffman/feat/script-req-retry 
Add retrying of script requests
 2016-10-06 16:09:04 -07:00
Anthony J. Thibault
3158439cba Prevent deadlock when rapidly switching between openvr and desktop mode 2016-10-06 15:44:24 -07:00
Seth Alves
a5de9cc106 Merge pull request #8742 from sethalves/ac-client 
AC test client
 2016-10-06 15:35:54 -07:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
Chris Collins
aecf71a0d0 Merge pull request #8729 from huffman/feat/atp-set-mapping 
Add setMapping to ATP scripting interface and fix threading bug
 2016-10-06 11:46:19 -07:00
Chris Collins
14f8fb7c90 Merge pull request #8664 from huffman/fix/script-resolve-path 
Fix ScriptEngine not properly resolving paths
 2016-10-06 10:13:44 -07:00
Chris Collins
583332d502 Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities 
Update entity scripting interface to allow modifications to unknown e…
 2016-10-06 09:51:35 -07:00
Seth Alves
7b5106afd8 Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client 2016-10-05 19:36:59 -07:00
Ryan Huffman
4171fdd2e1 Remove extraneous log line from AssetRequest 2016-10-05 19:27:24 -07:00
Ryan Huffman
4901f386ca Remove unused property in ScriptCache 2016-10-05 19:25:41 -07:00
Ryan Huffman
17a1f9b5ae Make timer child of QObject instead of attaching to destroyed 2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
Ryan Huffman
42b0d8230c Move extract/encode enitty functions in ScriptEngine 2016-10-05 19:14:42 -07:00
Brad Davis
48092978e9 Fix page size usage in gpu buffers 2016-10-05 17:05:01 -07:00
Clément Brisset
808419d988 Merge pull request #8740 from AndrewMeadows/fix-physics-unit-tests 
fix CMAKE warning about un-unit-testable CPP file in physics unit tests
 2016-10-05 16:22:26 -07:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap 
fix intermittent channel swapping
 2016-10-05 15:54:25 -07:00
Ryan Huffman
df09254437 Fix EntityItemID not being converted to string in ScriptEngine 2016-10-05 15:45:54 -07:00
Andrew Meadows
e46c15401a take care for division by zero when normalizing 2016-10-05 15:00:22 -07:00
Brad Davis
6afe5360fe Fixing header 2016-10-05 14:36:26 -07:00
Brad Davis
caf7d87841 Restore GL context information to the QML context 2016-10-05 14:01:20 -07:00
Brad Davis
afbbd398dc Remove QML threaded rendering 2016-10-05 13:48:16 -07:00
Clément Brisset
476ccadb38 Merge pull request #8732 from huffman/feat/category-in-logs 
Add category to log lines
 2016-10-05 13:29:41 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
howard-stearns
dc7a9f253c kill agents in avatar mixer when they stop being avatars 2016-10-05 13:06:11 -07:00
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Zach Pomerantz
5af95c6062 store channels on audio stream 2016-10-05 12:04:24 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07:00
Brad Hefta-Gaub
6f86ce8d3b Merge pull request #8683 from jherico/oglplus_b_gone2 
Remove all usage of oglplus
 2016-10-05 09:59:42 -07:00
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check 
Domain check
 2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2 
Support external GL textures with proper fencing
 2016-10-05 05:13:06 -07:00
Ryan Huffman
16d535c495 Move EntityTree RayArgs back to header 2016-10-04 20:20:48 -07:00
Ryan Huffman
ee50469213 Add collidableOnly arg to findRayIntersection 2016-10-04 20:19:54 -07:00
Ryan Huffman
da6afb605b Fix default findRayIntersection surfaceNormal to be in world space 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Zach Pomerantz
05aded5c9d differentiate smaples/frames from dropped audio 2016-10-04 18:45:03 -07:00
Zach Pomerantz
00fabb77b4 use proper audio frame naming 2016-10-04 18:27:56 -07:00
Zach Pomerantz
972a611d03 retain stereo on dead audio resampling 2016-10-04 17:54:20 -07:00
Ryan Huffman
2bb2aca2be Remove commented line in LogHandler 2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5 Add category to log lines 2016-10-04 16:49:24 -07:00
Ryan Huffman
82aa1bafad Update BatchLoader to use ScriptCache 2016-10-04 16:43:13 -07:00
Ryan Huffman
ca4022814e Add extra logging to asset client 2016-10-04 16:43:13 -07:00
Ryan Huffman
c6485cc50c Fix scriptcache only serving empty strings 2016-10-04 16:43:12 -07:00
Ryan Huffman
3c374e8ee2 Add retry logic to ScriptCache 2016-10-04 16:43:12 -07:00
Ryan Huffman
1fff480b73 Add timeout to AssetResourceRequest 2016-10-04 16:43:12 -07:00