Zach Fox
ac41e8abc4
Bugfix re: population; remove user image for now
2017-01-04 14:06:51 -08:00
Zach Fox
c695878025
Clear local ignored list upon domain change
2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915
Expose dropped frames count to stats UI
2017-01-04 13:20:58 -08:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Atlante45
56a25dfdee
Check setting value changed
2017-01-04 11:56:24 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Zach Pomerantz
01cf48807c
change Render.RenderForwardTask to Render.Forward
2017-01-03 14:47:48 -05:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Zach Fox
4a21eaa33f
Cleanup before PR
2016-12-30 15:18:01 -08:00
Zach Fox
951db2e2da
Bugs fixed!
2016-12-30 15:12:17 -08:00
Zach Fox
ea40582afb
Remaining bug: Hover when sort
2016-12-30 12:55:46 -08:00
Zach Fox
f26b7c0134
Checkpoint
2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub
84eca0159e
Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
...
Conflicts:
tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
0c22fcb5c4
better handling of timers
2016-12-29 16:41:14 -08:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Zach Fox
3bd68f5e3e
Checkpoint for removing userData
2016-12-29 16:09:31 -08:00
Zach Fox
be4050aa78
One bug down!
2016-12-29 15:43:42 -08:00
Zach Fox
f96508e197
Gotta fix these bugs...
2016-12-29 14:19:40 -08:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115
I'm about to refactor this.
2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
d3700fc922
Fix merge errors
2016-12-28 15:47:28 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20
Remove HRS logging
2016-12-28 14:37:19 -08:00
Atlante45
f79c6e08f5
Track dropped frames as reported by the Oculus SDK
2016-12-28 14:18:23 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
howard-stearns
7faa689d1d
avatar body goes away when ignored, and comes back when unignored
2016-12-27 10:17:39 -08:00
howard-stearns
768b747b3a
Make avatar go away when ignored, even when pal is up. (But currently, it
...
comes back!)
2016-12-27 10:17:39 -08:00
Anthony Thibault
9128d4b140
Merge pull request #9255 from AndrewMeadows/benji-002
...
optimization of incoming avatar joint data in interface client
2016-12-26 11:34:15 -08:00
Brad Davis
5b30f5da1b
Merge pull request #9259 from zfox23/FixRunningScripts
...
Fix "Running Scripts" window being inaccessible
2016-12-23 15:37:24 -08:00
Zach Fox
72da05bb30
Merge pull request #9268 from zfox23/PalRefresh
...
Add PAL refresh button
2016-12-23 15:16:51 -08:00
David Kelly
68fb81902b
Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal
...
Working VU meters in PAL
2016-12-23 13:24:38 -08:00
Zach Pomerantz
ca1a14e5b0
add RenderFetchSortCull task
2016-12-23 15:54:22 -05:00
Zach Fox
5490dddbbf
Cool style changes!
2016-12-23 12:22:33 -08:00
David Kelly
9eed430f49
CR feedback
2016-12-22 18:09:19 -08:00
Andrew Meadows
fc4763be03
use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER
2016-12-22 15:55:17 -08:00
Andrew Meadows
a5efc08473
use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER
2016-12-22 15:32:30 -08:00
samcake
b5e964f6ec
Merge pull request #9260 from jherico/chrome_tracing
...
Working on test/trace script interface
2016-12-22 15:23:26 -08:00
David Kelly
2e897e0cc9
Working first pass
...
Seems roughly same as mic meter. Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.
I'll investigate that...
2016-12-22 14:01:03 -08:00
Brad Davis
be6b098e1b
Implement test scene loading
2016-12-22 13:12:59 -08:00
Brad Davis
e58623bcc0
Working on test/trace script interface
2016-12-22 11:46:40 -08:00
Andrew Meadows
b3be7f0f3e
restore expensive version of Avatar::updatePalms()
2016-12-22 10:42:05 -08:00
David Kelly
e67d6e347d
Merge pull request #9253 from zfox23/PAL_QML_Updates
...
PAL Visual Style Updates
2016-12-22 10:21:27 -08:00
Zach Fox
d01500a7bb
Fix the bug?
2016-12-21 17:53:30 -08:00
Zach Fox
7c51d47ae4
Better separator
2016-12-21 14:11:14 -08:00
Zach Fox
1eea3ed27d
No more semicolons; tons of improvements
2016-12-21 12:48:26 -08:00
Zach Fox
630fb8696f
Lots of progress today
2016-12-21 12:48:26 -08:00
Zach Fox
0be4db1e68
Checkboxes!
2016-12-21 12:48:26 -08:00
Zach Fox
9b65a72bb5
Popup essentially done
2016-12-21 12:48:25 -08:00
Zach Fox
5b77202c52
Popups wow!
2016-12-21 12:48:25 -08:00
Zach Fox
db2da8f06b
Great cleanup
2016-12-21 12:48:25 -08:00
Zach Fox
7999e14ecf
Kinda screwed things up by changing styles
2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833
Frequent checkpoints are good.
2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c
More progress
2016-12-21 12:46:23 -08:00
Zach Fox
deb40f67df
Steady progress
2016-12-21 12:46:23 -08:00
Zach Fox
46c787512e
Working
2016-12-21 12:46:23 -08:00
Zach Fox
5996228622
Starting off strong.
2016-12-21 12:46:23 -08:00
Brad Hefta-Gaub
e6a20102d4
debug window enhancements
2016-12-21 11:31:34 -08:00
Andrew Meadows
2209c0ebba
remove debug hook for dumping stats to logs
2016-12-21 10:55:59 -08:00
Andrew Meadows
3830649990
remove debugging and profiling
2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233
optimizations for processing avatar joint data
2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
08cfd8a40e
Merge pull request #9208 from ZappoMan/addViewFrustumToAvatarMixer
...
Optimize avatar-mixer bandwidth for out of view avatars
2016-12-21 10:22:56 -08:00
samcake
909f24c3e1
Merge pull request #9245 from AndrewMeadows/avatars-per-second
...
measure avatar processing stats in Chrome trace framework
2016-12-21 09:13:41 -08:00
Brad Hefta-Gaub
be62df2001
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-21 08:59:29 -08:00
Brad Hefta-Gaub
5e65e3991c
CR feedback
2016-12-20 21:03:10 -08:00
Ryan Huffman
8325c96c0c
Update oculus hand controller tip labels
2016-12-20 18:01:53 -08:00
Ryan Huffman
3d84ccd4f0
Update oculus hand controller help image
2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27
Update tutorial to use new trigger configuration for touch
2016-12-20 18:01:53 -08:00
David Kelly
50554e934e
Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn
2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
...
Conflicts:
assignment-client/src/avatars/AvatarMixer.h
assignment-client/src/avatars/AvatarMixerClientData.h
libraries/avatars/src/AvatarData.cpp
libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
Andrew Meadows
e43efa74de
use sampled counter
2016-12-20 16:16:31 -08:00
Andrew Meadows
fa18d548f7
use proper category for NumAvatarsPerSec trace
2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c
cleanup
2016-12-20 14:45:11 -08:00
Andrew Meadows
991a61b722
fix data collection for AvatarsPerSec
2016-12-20 14:01:03 -08:00
Andrew Meadows
1788d19260
remove some debug code
2016-12-20 14:00:25 -08:00
David Kelly
7750e86c13
Only send machine fingerprint when not logged in
...
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing. Should consider not sending MAC address too, but
we may revisit that later.
2016-12-20 13:47:58 -08:00
Andrew Meadows
03114fa610
add AvatarsPerSec trace stats
2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e
cleanup comments
2016-12-20 10:45:36 -08:00
Howard Stearns
9aad93465d
Merge pull request #9227 from howard-stearns/sessionDisplayNames
...
Session display names
2016-12-20 10:07:05 -08:00
Brad Hefta-Gaub
6a7fa63327
classify ScriptEngine errors better, and send them as signal to JS
2016-12-20 09:00:01 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
0c9ff87feb
add support for an HMD script debug log window
2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Brad Hefta-Gaub
df954cab10
remove some log spam, recatargorize script logs to allow fine grain filtering
2016-12-19 16:15:10 -08:00
Howard Stearns
891aba31a1
Merge pull request #9233 from samcake/ambient
...
Introducing a fix for the overlayered model drawn in front
2016-12-19 15:56:32 -08:00
howard-stearns
60cb7acb50
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 15:28:07 -08:00
samcake
c435afb728
Introducing a fix for the overlayered model drawn in front
2016-12-19 13:17:56 -08:00
Zach Fox
a912fec496
PR comments; need particular fix on Master for full QA
2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858
It's working! Untested on human avatars.
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd
Merge pull request #9225 from jherico/chrome_tracing
...
Additional work on tracing
2016-12-16 17:53:55 -08:00
Brad Davis
2d73588361
Fix stat tracker missing in agents
2016-12-16 17:34:00 -08:00
Ryan Huffman
217d46704d
Update req tutorial version for Oculus Touch
2016-12-16 15:41:04 -08:00
Ryan Huffman
b9598a28f3
Update to only send users to tutorial if they have Vive or Touch
2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
a1fea65aa5
Update right joystick mesh
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
cde558fb94
Update touch controller tips
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
Ryan Huffman
90e121ba47
Extend HMD scripting interface to check subdevices
2016-12-16 15:05:17 -08:00
Ryan Huffman
c953ceb58b
Add send-to-tutorial logic for Oculus Touch
2016-12-16 15:05:17 -08:00
samcake
1ded581895
Merge pull request #9217 from zzmp/feat/render-forward-bounds
...
Render bounds in Forward Render Task
2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
David Rowe
9bf8f25ed0
Update from Seth
2016-12-16 16:11:27 +13:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
David Rowe
9aaf55e6a3
Fix crash after manually closing Clara download status message box
2016-12-16 12:49:26 +13:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08:00
Howard Stearns
ba8b585368
Merge pull request #9202 from howard-stearns/pal-proto
...
People Action List prototype
2016-12-15 13:56:12 -08:00
David Rowe
b8114b29b2
Make manually closing message box code more correct
2016-12-16 09:47:11 +13:00
Zach Pomerantz
41f6990051
change render forward flag to HIFI_...
2016-12-15 14:53:51 -05:00
samcake
7a29dbe7d4
Merge pull request #9207 from zzmp/feat/render-forward-empty
...
Forward render task (empty and only used with RENDER_FORWARD set)
2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33
Merge pull request #9210 from zfox23/FB_2591
...
FB 2591: Taking simultaneous GIF snapshots crashes Interface
2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
David Rowe
16418d52d2
Scale all imported Clara models to have max dimension of exactly 1m
2016-12-15 20:11:29 +13:00
David Rowe
349765ad74
Fix Clara download status message box not auto-closing
2016-12-15 16:00:07 +13:00
howard-stearns
ae4064f445
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-14 17:04:52 -08:00
David Rowe
23b8bf7aab
Fix crashing if manually close Clara download status message box
2016-12-15 13:35:58 +13:00
Atlante45
588fdd6efa
Add steamworks to interface externals
2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072
CR - CLI text
2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03
Make Steamworks a plugin
2016-12-14 15:37:49 -08:00
David Rowe
eb293fb579
Increase resize timeout to 5 mins to improve the odds of model rezzing
...
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
2016-12-15 12:26:53 +13:00
David Rowe
c82cceccac
Rescale models if necessary to have their largest dimension be 1m
...
Models are still rescaled beforehand if thought to be in cm.
2016-12-15 12:25:56 +13:00
David Rowe
dbd00e39a8
Handle unzip failure
2016-12-15 11:52:34 +13:00
David Rowe
fa6f121ff2
Missing comment close
2016-12-15 11:51:28 +13:00
David Rowe
b55c558f96
Initial fix for detaching tablet UI
2016-12-15 11:11:40 +13:00
David Rowe
17c54a5fae
Log requested ATP mapping of model upload
2016-12-15 10:01:19 +13:00
David Rowe
5af57d7bbc
Don't make downloaded Clara.io models dynamic
2016-12-15 09:38:06 +13:00
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
David Rowe
934f48362a
Rework Clara.io download user messaging to have no user interaction
2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
Zach Pomerantz
bbb7229392
skip graphics config if not in engine
2016-12-13 20:47:28 -05:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
David Rowe
d546b69daf
Add scriptEvent message to web3d overlay event bridge
2016-12-14 14:30:02 +13:00
howard-stearns
4503855ae8
don't keep selection while things are disappearing
2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00